diff --git a/.vscode/tasks.json b/.vscode/tasks.json index d612999..d6f6362 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,9 +6,9 @@ { "label": "New Template", "type": "shell", - "command": "${workspaceRoot}/repo.sh", + "command": "${workspaceRoot}${/}repo.sh", "windows": { - "command": "${workspaceRoot}/repo.bat" + "command": "${workspaceRoot}${/}repo.bat" }, "args": [ "template", @@ -23,9 +23,9 @@ { "label": "Build", "type": "shell", - "command": "${workspaceRoot}/repo.sh", + "command": "${workspaceRoot}${/}repo.sh", "windows": { - "command": "${workspaceRoot}/repo.bat" + "command": "${workspaceRoot}${/}repo.bat" }, "args": [ "build" @@ -43,9 +43,9 @@ { "label": "Launch", "type": "shell", - "command": "${workspaceRoot}/repo.sh", + "command": "${workspaceRoot}${/}repo.sh", "windows": { - "command": "${workspaceRoot}/repo.bat" + "command": "${workspaceRoot}${/}repo.bat" }, "args": [ "launch" @@ -59,9 +59,9 @@ { "label": "Launch (Developer Mode)", "type": "shell", - "command": "${workspaceRoot}/repo.sh", + "command": "${workspaceRoot}${/}repo.sh", "windows": { - "command": "${workspaceRoot}/repo.bat" + "command": "${workspaceRoot}${/}repo.bat" }, "args": [ "launch", @@ -76,9 +76,9 @@ { "label": "Run Unit Tests", "type": "shell", - "command": "${workspaceRoot}/repo.sh", + "command": "${workspaceRoot}${/}repo.sh", "windows": { - "command": "${workspaceRoot}/repo.bat" + "command": "${workspaceRoot}${/}repo.bat" }, "args": [ "test", @@ -92,9 +92,9 @@ { "label": "Package", "type": "shell", - "command": "${workspaceRoot}/repo.sh", + "command": "${workspaceRoot}${/}repo.sh", "windows": { - "command": "${workspaceRoot}/repo.bat" + "command": "${workspaceRoot}${/}repo.bat" }, "args": [ "package" diff --git a/CHANGELOG.md b/CHANGELOG.md index f967cca..a2823a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,36 +2,39 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [106.3.0] - 2024-11-04 -## [106.2.0] - 2024-10-30 - -### Fixed -- Updated file permissions on all Linux shell scripts to make them executable - - -## [106.2.0] - 2024-10-24 - -### Fixed -- Updated file permissions on tools/packman/python.sh to make it executable - +### Added +- Built app containers support `NVDA_KIT_ARGS` and `NVDA_KIT_NUCLEUS` environment variables + - `NVDA_KIT_ARGS` is passed directly into the kit executable + - `NVDA_KIT_NUCLEUS` if set causes the container entrypoint to create an omniverse.toml configuration file with a single entry pointing at the provided nucleus server. This will also set the kit arg --/ovc/nucleus/server with the envvar value. + - `repo launch --container` maps in these variables from the local environment as well +- Added `omni.kit.menu.common` to Kit Base Editor, USD Composer, and USD Explorer template Kit files to enable Toggle Viewport Fullscreen and UI overlay with F7 and F11 -## [106.2.0] - 2024-10-21 +### Changed +- Updated to `Kit 106.3.0` + - [Kit 106.3 Early Access Release Notes](https://docs.omniverse.nvidia.com/dev-guide/latest/release-notes/106_3.html) + - [Kit 106.3 Early Access Release Highlights](https://docs.omniverse.nvidia.com/dev-guide/latest/release-notes/106_3_highlights.html) +- Updated build process to support autodetection or user-specified host versions of `MSVC` and `WinSDK`, providing flexibility for Windows C++ developers to leverage their existing installations. [Windows C++ Developer Configuration](readme-assets/additional-docs/windows_developer_configuration.md) +- Updated `omni.kit.usd_explorer.main.menubar` to version 1.0.38 so that it works correctly with `omni.kit.menu.common` -### Fixed -- Updated Extension Registry location to prod/106/shared when launching Developer Bundle +### Removed +- Removed Services dependencies from USD Composer Template that caused a firewall popup on first launch -## [106.2.0] - 2024-10-08 +## [106.2.0] - 2024-10-03 ### Changed -- Updated to Kit 106.2.0 +- Updated to `Kit 106.2.0` + - [Kit 106.2 Early Access Release Notes](https://docs.omniverse.nvidia.com/dev-guide/latest/release-notes/106_2.html) + - [Kit 106.2 Early Access Release Highlights](https://docs.omniverse.nvidia.com/dev-guide/latest/release-notes/106_2_highlights.html) - Refactored Viewer Template default tests to avoid unnecessary dependencies ### Removed - Unused `simulation` menu item from USD Composer Template -## [106.1.0] - 2024-09-17 +## [106.1.0] - 2024-09-18 ### Added - Support for containerization of streaming applications and services via `repo package --container` @@ -41,6 +44,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Support for USD Viewer Template to send scene loading state to client via messaging ### Changed +- Updated to `Kit 106.1.0` + - [Kit 106.1 Early Access Release Notes](https://docs.omniverse.nvidia.com/dev-guide/latest/release-notes/106_1.html) + - [Kit 106.1 Early Access Release Highlights](https://docs.omniverse.nvidia.com/dev-guide/latest/release-notes/106_1_highlights.html) - Aligned default testing for applications and extensions - Update and align code formatting/style across templates @@ -50,12 +56,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fixed default manipulator pivot back to "bounding box base" in USD Explorer Template +## [106.0.3] - 2024-09-18 + +### Changed +- Updated to `Kit 106.0.3` + - [Kit 106.0.3 Release Notes](https://docs.omniverse.nvidia.com/dev-guide/latest/release-notes/106_0_3.html) + + ## [106.0.2] - 2024-07-29 ### Added - Support for local streaming configurations for UI based Applications - Support for multiple setup extensions per application -- Ability to pass arguments to Kit via the 'repo launch` tool. +- Ability to pass arguments to Kit via the 'repo launch` tool - USD Composer Application Template and Documentation - USD Viewer Application Template and Documentation - USD Composer Setup Extension and Documentation @@ -67,6 +80,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Support for automatic launch if only single `.kit` file is present in `source/apps` ### Changed +- Updated to `Kit 106.0.2` + - [Kit 106.0.2 Release Notes](https://docs.omniverse.nvidia.com/dev-guide/latest/release-notes/106_0_2.html) + - [Kit 106.0.1 Release Notes](https://docs.omniverse.nvidia.com/dev-guide/latest/release-notes/106_0_1.html) - Updated all relevant application templates READMEs to reflect the addition of local streaming configurations - Updated .gitattributes to ensure LFS is used for all relevant file types - Updated .gitignore to exclude streaming app event traces @@ -102,6 +118,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - repo_tools.toml to configure local repo tools ### Changed +- Updated to `Kit 106.0.0` + - [Kit 106.0 Beta Release Notes](https://docs.omniverse.nvidia.com/dev-guide/latest/release-notes/106_0.html) + - [Kit 106.0 Release Highlights](https://docs.omniverse.nvidia.com/dev-guide/latest/release-notes/106_0_highlights.html) - Updated repo_kit_template tooling to support Applications and Extensions - Updated repo_kit_template tooling to allow for application setup extensions - Updated top level README.md to reflect updated tooling and templates diff --git a/README.md b/README.md index 9c77cb3..6a30ec1 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,8 @@ ## :warning: EA Release Information -**This branch is based on Omniverse Kit 106.2 EA. It includes EA versions of the Kit SDK, associated development tools, and templates. For the latest stable release, see the `106.0` branch.** +**This branch is based on Omniverse Kit 106.3 EA. It includes EA versions of the Kit SDK, associated development tools, and templates. For the latest stable release, see the `106.0` branch.** + ## Overview @@ -73,7 +74,9 @@ Ensure your system is set up with the following to work with Omniverse Applicati - [**Git LFS**](https://git-lfs.com/): For managing large files within the repository -- **(Windows) Microsoft Visual C++ Redistributable**: Many Windows systems will already have this, but if not, it can be obtained from [latest-supported-vc-redist](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#latest-microsoft-visual-c-redistributable-version) +- **(Windows - C++ Only) Microsoft Visual Studio (2019 or 2022)**: You can install the latest version from [Visual Studio Downloads](https://visualstudio.microsoft.com/downloads/). Ensure that the **Desktop development with C++** workload is selected. [Additional information on Windows development configuration](readme-assets/additional-docs/windows_developer_configuration.md) + +- **(Windows - C++ Only) Windows SDK**: Install this alongside MSVC. You can find it as part of the Visual Studio Installer. [Additional information on Windows development configuration](readme-assets/additional-docs/windows_developer_configuration.md) - **(Linux) build-essentials**: A package that includes `make` and other essential tools for building applications. For Ubuntu, install with `sudo apt-get install build-essential` @@ -234,6 +237,8 @@ Enhance Omniverse capabilities with extension templates: - **[Basic C++](./templates/extensions/basic_cpp)**: The minimal definition of an Omniverse C++ Extension. + **Note for Windows C++ Developers** : This template requires `"platform:windows-x86_64".enabled` within the `repo.toml` file be set to `true`. For additional C++ configuration information [see here](readme-assets/additional-docs/windows_developer_configuration.md). + - **[Python UI](./templates/extensions/python_ui)**: An extension that provides an easily extendable Python-based user interface. ## Tools diff --git a/premake5.lua b/premake5.lua index 7f81f94..ec57f48 100644 --- a/premake5.lua +++ b/premake5.lua @@ -4,8 +4,16 @@ repo_build = require("omni/repo/build") -- Repo root root = repo_build.get_abs_path(".") --- Execute the kit template premake configuration, which creates the solution, finds extensions, etc. -dofile("_repo/deps/repo_kit_tools/kit-template/premake5.lua") +-- Pull in new Premake options from repo_build-1.0.0 +repo_build.setup_options() +-- Set variables so repo_kit_tools does not set default values for MSVC and WINSDK +MSVC_VERSION = _OPTIONS["visual-cxx-version"] +WINSDK_VERSION = _OPTIONS["winsdk-version"] + +-- Run repo_kit_tools premake5-kit that includes a bunch of Kit-friendly tooling configuration. +kit = require("_repo/deps/repo_kit_tools/kit-template/premake5-kit") +kit.setup_all() + -- Registries config for testing repo_build.prebuild_copy { diff --git a/readme-assets/additional-docs/developer_bundle_extensions.md b/readme-assets/additional-docs/developer_bundle_extensions.md index e541ee5..191dae8 100644 --- a/readme-assets/additional-docs/developer_bundle_extensions.md +++ b/readme-assets/additional-docs/developer_bundle_extensions.md @@ -27,6 +27,9 @@ The `launch` tool will prompt for a selection of a `.kit` file to launch. Select Developer Utilities are designed to assist developers in various aspects of application development, from debugging to extension management. These utilities offer insight into the internal workings of an application and its extensions. - **[Developer > Extensions] omni.kit.window.extensions**: The most popular utility, this tool manages available extensions. It provides quick access to the extension registry and local extensions, simplifying the process of adding dependencies for developer extensions and applications. + - **omni.kit.widget.ext_win.create_extension**: A widget to add the ability to create an extension within the extension window. + - **omni.kit.widget.ext_win.dependency_graph**: Exposes the dependency graph capabilities for the extension window. + - **[Developer > Commands] omni.kit.window.commands**: Captures the command history within a running application. It is particularly useful for developers who interact with the UI, allowing them to capture the commands used to execute specific functionalities. diff --git a/readme-assets/additional-docs/windows_developer_configuration.md b/readme-assets/additional-docs/windows_developer_configuration.md new file mode 100644 index 0000000..7c5355e --- /dev/null +++ b/readme-assets/additional-docs/windows_developer_configuration.md @@ -0,0 +1,127 @@ +# Windows C++ Developer Configuration + +## Introduction + +This document guides you through setting up this repository for C++ development on Windows using Microsoft Visual Studio and the Windows SDK. + +**For New Users:** If you are new to Windows C++ development, this guide provides a step-by-step installation of Visual Studio 2022 Community and the Windows SDK, ensuring you have all the components required for standard development tasks. + +**For Advanced Configurations:** If you already have Visual Studio and the Windows SDK installed but wish to specify exact versions, this guide will help you configure your environment using the `[repo_build.msbuild]` configuration within `repo.toml` at the project root. + +## Configuration + +To enable the Windows C++ build process: + +- Set the `"platform:windows-x86_64".enabled` flag to `true` in your `repo.toml` file: + + ```toml + [repo_build.build] + "platform:windows-x86_64".enabled = true + ``` + +- Set the `link_host_toolchain` flag to `true` in your `repo.toml` file: + + ```toml + [repo_build.msbuild] + link_host_toolchain = true + ``` + +**Note:** If you already have Visual Studio and the Windows SDK installed, this might be the only change needed. The tooling will auto-detect installed components. + +## Microsoft Visual Studio and Windows SDK Setup + +### Basic Installation + +#### Installing Visual Studio 2022 Community + +1. **Download Visual Studio Installer** + + ![VS Download](../vs_download.png) + - Visit the [Visual Studio Downloads](https://visualstudio.microsoft.com/downloads/). + - Click "Free download" under "Community". + +2. **Run the Installer** + - Open the downloaded installer. + - Select "Community" edition and click "Install". + +3. **Select Workloads** + + ![VS Workloads](../vs_workloads.png) + - Check "Desktop development with C++". + - This includes tools like the MSVC compiler and C++ libraries. + +4. **Additional Components** + ![VS Additional](../vs_additional.png) + - If you need specific components, go to "Individual components". + - Select additional tools as needed. + +5. **Complete the Installation** + - Proceed with the installation to download and set up all files. + +#### Installing Windows SDK (as needed) + +Usually, the Windows SDK is included with the "Desktop development with C++" workload. To verify or install it separately: + +1. **Launch Visual Studio Installer** + - Open the installer if it's not already running. + +2. **Modify Installation** + + ![VS Modify](../vs_modify.png) + - Click "Modify" on your Visual Studio installation. + +3. **Verify Windows SDK** + + ![VS WinSDK Verify](../vs_winsdk_verify.png) + - Ensure "Windows SDK" is selected under "Optional" sections or "Individual components". + +4. **Apply Changes** + - Click "Modify" to install or update the SDK. + +### Configuring an Existing Installation + +#### Default Installation Paths + +If Visual Studio and the Windows SDK are installed in default locations, the build tooling will auto-detect them without additional configuration. + +- Default Windows SDK: `C:\Program Files (x86)\Windows Kits` +- Default Visual Studio 2019: `C:\Program Files (x86)\Microsoft Visual Studio` +- Default Visual Studio 2022: `C:\Program Files\Microsoft Visual Studio` + +#### Non-Default Installation Paths + +For installations at non-standard paths, specify them in `repo.toml`: + +```toml +[repo_build.msbuild] +vs_path = "D:\\CustomPath\\Visual Studio\\2022\\Community" +winsdk_path = "D:\\CustomPath\\Windows Kits\\10\\bin\\10.0.19041.0" +``` + +Adjust and save the paths as needed. + +#### Multiple Installations + +For multiple Visual Studio or Windows SDK installations, the latest version is used by default. If unspecified, default edition preference is "Enterprise", "Professional", "Community". To specify preferred versions, editions, or paths: + +##### Visual Studio + +```toml +[repo_build.msbuild] +vs_version = "vs2022" +vs_edition = "Community" +vs_path = "D:\\AnotherPath\\Visual Studio\\2022\\Enterprise\\" +``` + +##### Windows SDK + +```toml +[repo_build.msbuild] +winsdk_version = "10.0.19041.0" +winsdk_path = "D:\\CustomSDKPath\\Windows Kits\\10\\bin\\10.0.19041.0" +``` + +With these configurations, you control which versions the build system uses, ensuring consistency in environments with multiple installations. + +## Additional Resources +- [Repo Build Documentation](https://docs.omniverse.nvidia.com/kit/docs/repo_build/1.0.0/) \ No newline at end of file diff --git a/readme-assets/vs_additional.png b/readme-assets/vs_additional.png new file mode 100644 index 0000000..4a78ccc --- /dev/null +++ b/readme-assets/vs_additional.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efc5984dbeaa68c2474a10934f1795f81b71331b94a770f794a8713a69f5ee56 +size 45920 diff --git a/readme-assets/vs_download.png b/readme-assets/vs_download.png new file mode 100644 index 0000000..0ce2a25 --- /dev/null +++ b/readme-assets/vs_download.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72d8194ba099532db706fb95b9ad0c992f0be8b588dea0c7f832a72041f155c0 +size 217607 diff --git a/readme-assets/vs_modify.png b/readme-assets/vs_modify.png new file mode 100644 index 0000000..bf05b9f --- /dev/null +++ b/readme-assets/vs_modify.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:822040e437b2ab7c0da8d5341555def09c8cc0d93482a4a1f68ed109a27b28b0 +size 17533 diff --git a/readme-assets/vs_winsdk_verify.png b/readme-assets/vs_winsdk_verify.png new file mode 100644 index 0000000..f558ef2 --- /dev/null +++ b/readme-assets/vs_winsdk_verify.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb99ae3ddafd665efefc4499168243a287d2f4f111d05d5dfcaf00bfde23ae8f +size 23712 diff --git a/readme-assets/vs_workloads.png b/readme-assets/vs_workloads.png new file mode 100644 index 0000000..9ce2022 --- /dev/null +++ b/readme-assets/vs_workloads.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:685697bbcc3cb75ca56f3fc685be9608b4d2405b81dc9bd2fc072096cb934883 +size 35114 diff --git a/repo.toml b/repo.toml index 75d17c2..690127b 100644 --- a/repo.toml +++ b/repo.toml @@ -20,10 +20,41 @@ fetch."platform:linux-x86_64".before_pull_commands = [ ["mkdir", "--parents", "${root}/source/apps"], ] +# Mute this command, don't emit to console. fetch."platform:windows-x86_64".before_pull_commands = [ ["powershell", "-Command", "New-Item -ItemType Directory -Path ${root}/source/apps -ErrorAction SilentlyContinue", ";", "Write-Host 'Done'"], ] +[repo_build.build] +enabled = true +"platform:windows-x86_64".enabled = false + +[repo_build.msbuild] +# If set to true will attempt to link to host's Visual Studio and Windows SDK installations. +# This is needed if C++ compilation is needed on Windows, and repo_build.build.enabled is set to true. +link_host_toolchain = false + +# Filter on Visual Studio version e.g.: Visual Studio 2022. Empty string will match all years and prioritize the newest. +vs_version = "vs2022" + +# Visual Studio path; This will be used if the user would like to point to a specific VS installation rather than rely on heuristic locating. +# vs_path = "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\" + +# Filter specifically to "Enterprise", "Professional", or "Community" editions of Visual Studio +# vs_edition = "Community" + +# Filter by Visual Studio installations that have installed this version of the MSVC compiler. +# msvc_version = "v142" + +# Filter by Visual Studio installations that ship with MSBuild of this major version. +# msbuild_version = "17" + +# Windows SDK version +# winsdk_version = "10.0.17763.0" + +# Windows SDK path; This will prevent needing to dynamically locate an installation by guesswork. +# winsdk_path = "C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.17763.0" + # Disable linbuild until we have a public image available. [repo_build.docker] enabled = false diff --git a/templates/apps/kit_base_editor/README.md b/templates/apps/kit_base_editor/README.md index e275726..9b063a1 100644 --- a/templates/apps/kit_base_editor/README.md +++ b/templates/apps/kit_base_editor/README.md @@ -2,7 +2,6 @@ ![Kit Base Editor Image](../../../readme-assets/kit_base_editor.png) -**Based On:** `Omniverse Kit SDK 106.0` ## Overview @@ -221,7 +220,7 @@ To package your application as a container image, use the `--container` flag: ./repo.sh package --container ``` -You will be prompted to select a `.kit` file to serve as the application to launch via the container entrypoint script. This will dictate the behavior of your containerized application. +You will be prompted to select a `.kit` file to serve as the application to launch via the container entrypoint script. This will dictate the behavior of your containerized application. For example, if you are containerizing an application for streaming, select the `{your-app-name}_streaming.kit` file to ensure the correct application configuration is launched within the container. @@ -238,7 +237,7 @@ Applications packaged as container images can be launched using the `launch` com **Linux:** ```bash -./repo.sh launch --container +./repo.sh launch --container ``` If only a single container image exists, it will launch automatically. If multiple container images exist, you will be prompted to select the desired container image to launch. @@ -298,7 +297,7 @@ When streaming a containerized application, ensure that the containerized applic **Linux:** ```bash -./repo.sh launch --container +./repo.sh launch --container ``` If only a single container image exists, it will launch automatically. If multiple container images exist, you will be prompted to select the desired container image to launch. diff --git a/templates/apps/kit_base_editor/kit_base_editor.kit b/templates/apps/kit_base_editor/kit_base_editor.kit index 4e9d696..614194a 100644 --- a/templates/apps/kit_base_editor/kit_base_editor.kit +++ b/templates/apps/kit_base_editor/kit_base_editor.kit @@ -32,6 +32,7 @@ template_name = "kit_base_editor" "omni.kit.manipulator.prim" = {} # Load the prim-manipulator (translate, rotate, scale) "omni.kit.manipulator.selection" = {} # Load the selection-manipulator (selectable prims) "omni.kit.material.library" = {} # Create and assign materials. +"omni.kit.menu.common" = { order = 1000 } # Common menu library. Loads last so omni.kit.activity.ui can be available. "omni.kit.menu.create" = {} # Create menu "omni.kit.menu.edit" = {} # Edit menu "omni.kit.menu.file" = {} # File menu @@ -102,13 +103,6 @@ fillViewport = true # default to fill viewport enableAnonymousData = true enableAnonymousAppName = true -[settings.exts."omni.kit.registry.nucleus"] -registries = [ - { name = "kit/default", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/106/shared" }, - { name = "kit/sdk", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/sdk/${kit_version_short}/${kit_git_hash}" }, - { name = "kit/community", url = "https://dw290v42wisod.cloudfront.net/exts/kit/community" }, -] - [[test]] args = [ diff --git a/templates/apps/kit_service/README.md b/templates/apps/kit_service/README.md index 3c738a0..96fa013 100644 --- a/templates/apps/kit_service/README.md +++ b/templates/apps/kit_service/README.md @@ -2,7 +2,6 @@ ![Kit Service Image](../../../readme-assets/kit_service.png) -**Based On:** `Omniverse Kit SDK 106.0` ## Overview @@ -213,7 +212,7 @@ To package your application as a container image, use the `--container` flag: ./repo.sh package --container ``` -You will be prompted to select a `.kit` file to serve as the application to launch via the container entrypoint script. This will dictate the behavior of your containerized application. +You will be prompted to select a `.kit` file to serve as the application to launch via the container entrypoint script. This will dictate the behavior of your containerized application. For example, if you are containerizing a headless Kit Service, select the `{your-service-name}.kit` file to ensure the correct application configuration is launched within the container. @@ -230,7 +229,7 @@ Applications packaged as container images can be launched using the `launch` com **Linux:** ```bash -./repo.sh launch --container +./repo.sh launch --container ``` If only a single container image exists, it will launch automatically. If multiple container images exist, you will be prompted to select the desired container image to launch. diff --git a/templates/apps/kit_service/kit_service.kit b/templates/apps/kit_service/kit_service.kit index 1ffe939..0644b4f 100644 --- a/templates/apps/kit_service/kit_service.kit +++ b/templates/apps/kit_service/kit_service.kit @@ -36,10 +36,3 @@ folders.'++' = [ # Search paths for extensions. # Anonymous Kit application usage telemetry enableAnonymousData = true enableAnonymousAppName = true - -[settings.exts."omni.kit.registry.nucleus"] -registries = [ - { name = "kit/default", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/106/shared" }, - { name = "kit/sdk", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/sdk/${kit_version_short}/${kit_git_hash}" }, - { name = "kit/community", url = "https://dw290v42wisod.cloudfront.net/exts/kit/community" }, -] diff --git a/templates/apps/usd_composer/README.md b/templates/apps/usd_composer/README.md index 23f31e0..dda193a 100644 --- a/templates/apps/usd_composer/README.md +++ b/templates/apps/usd_composer/README.md @@ -2,7 +2,6 @@ ![USD Composer Hero Image](../../../readme-assets/usd_composer.jpg) -**Based On:** `Omniverse Kit SDK 106.0` ## Overview @@ -238,7 +237,7 @@ To package your application as a container image, use the `--container` flag: ./repo.sh package --container ``` -You will be prompted to select a `.kit` file to serve as the application to launch via the container entrypoint script. This will dictate the behavior of your containerized application. +You will be prompted to select a `.kit` file to serve as the application to launch via the container entrypoint script. This will dictate the behavior of your containerized application. For example, if you are containerizing an application for streaming, select the `{your-app-name}_streaming.kit` file to ensure the correct application configuration is launched within the container. @@ -255,7 +254,7 @@ Applications packaged as container images can be launched using the `launch` com **Linux:** ```bash -./repo.sh launch --container +./repo.sh launch --container ``` If only a single container image exists, it will launch automatically. If multiple container images exist, you will be prompted to select the desired container image to launch. @@ -315,7 +314,7 @@ When streaming a containerized application, ensure that the containerized applic **Linux:** ```bash -./repo.sh launch --container +./repo.sh launch --container ``` If only a single container image exists, it will launch automatically. If multiple container images exist, you will be prompted to select the desired container image to launch. diff --git a/templates/apps/usd_composer/omni.usd_composer.kit b/templates/apps/usd_composer/omni.usd_composer.kit index 53619f1..643f633 100644 --- a/templates/apps/usd_composer/omni.usd_composer.kit +++ b/templates/apps/usd_composer/omni.usd_composer.kit @@ -58,6 +58,7 @@ template_name = "omni.usd_composer" "omni.kit.manipulator.viewport" = {} "omni.kit.material.library" = {} "omni.kit.menu.aov" = {} +"omni.kit.menu.common" = { order = 1000 } "omni.kit.menu.create" = {} "omni.kit.menu.edit" = {} "omni.kit.menu.file" = {} @@ -131,6 +132,7 @@ template_name = "omni.usd_composer" "omni.kit.window.title" = {} "omni.kit.window.toolbar" = {} "omni.kit.window.usd_paths" = {} +"omni.light_rigs" = {} "omni.mdl.usd_converter" = {} "omni.no_code_ui.authoring" = {} "omni.physx.stageupdate" = {} @@ -138,9 +140,6 @@ template_name = "omni.usd_composer" "omni.rtx.settings.core" = {} # this is the new Render Settings 2.0 "omni.scene.optimizer.bundle" = {} "omni.scene.visualization.bundle" = {} -"omni.services.starfleet.auth" = {} -"omni.services.transport.server.http" = {} -"omni.services.usd" = {} "omni.stats" = {} "omni.usd.fileformat.sbsar" = {} "omni.usd.metrics.assembler.ui" = {} @@ -237,6 +236,7 @@ experience = "{{ application_display_name }}" "omni.kit.widget.layers".useNewFilePicker = true "omni.kit.window.file".useNewFilePicker = true "omni.kit.window.material".load_after_startup = true +"omni.light_rigs".setup_extension_name = "{{ setup_extension_name }}" "omni.services.transport.server.http".port = 8111 "omni.ui".raster.default_rasterpolicy_enabled = true "omni.usd".enableUsdMaterialWatcherForFsd = true @@ -342,10 +342,3 @@ structuredLog.enable = true # Anonymous Kit application usage telemetry enableAnonymousAppName = true enableAnonymousData = true - -[settings.exts."omni.kit.registry.nucleus"] -registries = [ - { name = "kit/default", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/106/shared" }, - { name = "kit/sdk", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/sdk/${kit_version_short}/${kit_git_hash}" }, - { name = "kit/community", url = "https://dw290v42wisod.cloudfront.net/exts/kit/community" }, -] diff --git a/templates/apps/usd_explorer/README.md b/templates/apps/usd_explorer/README.md index ae4ae2c..9aebc71 100644 --- a/templates/apps/usd_explorer/README.md +++ b/templates/apps/usd_explorer/README.md @@ -2,7 +2,6 @@ ![USD Explorer Hero Image](../../../readme-assets/usd_explorer.jpg) -**Based On:** `Omniverse Kit SDK 106.0` ## Overview @@ -240,7 +239,7 @@ To package your application as a container image, use the `--container` flag: ./repo.sh package --container ``` -You will be prompted to select a `.kit` file to serve as the application to launch via the container entrypoint script. This will dictate the behavior of your containerized application. +You will be prompted to select a `.kit` file to serve as the application to launch via the container entrypoint script. This will dictate the behavior of your containerized application. For example, if you are containerizing an application for streaming, select the `{your-app-name}_streaming.kit` file to ensure the correct application configuration is launched within the container. @@ -257,7 +256,7 @@ Applications packaged as container images can be launched using the `launch` com **Linux:** ```bash -./repo.sh launch --container +./repo.sh launch --container ``` If only a single container image exists, it will launch automatically. If multiple container images exist, you will be prompted to select the desired container image to launch. @@ -317,7 +316,7 @@ When streaming a containerized application, ensure that the containerized applic **Linux:** ```bash -./repo.sh launch --container +./repo.sh launch --container ``` If only a single container image exists, it will launch automatically. If multiple container images exist, you will be prompted to select the desired container image to launch. diff --git a/templates/apps/usd_explorer/omni.usd_explorer.kit b/templates/apps/usd_explorer/omni.usd_explorer.kit index c33a894..5f80e3c 100644 --- a/templates/apps/usd_explorer/omni.usd_explorer.kit +++ b/templates/apps/usd_explorer/omni.usd_explorer.kit @@ -36,6 +36,7 @@ template_name = "omni.usd_explorer" "omni.kit.manipulator.selection" = {} "omni.kit.manipulator.transform" = {} "omni.kit.manipulator.viewport" = {} +"omni.kit.menu.common" = { order = 1000 } "omni.kit.menu.edit" = {} "omni.kit.menu.file" = {} "omni.kit.property.bundle" = {} @@ -89,6 +90,7 @@ template_name = "omni.usd_explorer" "omni.kit.window.status_bar" = {} "omni.kit.window.title" = {} "omni.kit.window.toolbar" = {} +"omni.light_rigs" = {} "omni.resourcemonitor" = {} # Needed for Fabric delegate "omni.rtx.settings.core" = {} # This is the Render Settings 2.0 "omni.scene.optimizer.bundle" = {} @@ -269,7 +271,7 @@ x = -1 y = -1 [settings.crashreporter.data] -experience = "USD Explorer" +experience = "{{ application_display_name }}" [settings.ext."omni.kit.widget.viewport".sceneView.singleCameraModel] enabled = true # Enable single Viewport camera model (setting w/ typo in current Kit) @@ -503,6 +505,9 @@ visible = false startup.windowName = "Viewport" hud.hostMemory.perProcess = true +[settings.exts."omni.light_rigs"] +setup_extension_name="{{ setup_extension_name }}" + [settings.exts."omni.services.transport.server.http"] port = 8311 # Setting the port for the embedded http server, using custom port for your application make sure not to collide with other apps @@ -630,12 +635,6 @@ enable = true enableAnonymousData = true enableAnonymousAppName = true -[settings.exts."omni.kit.registry.nucleus"] -registries = [ - { name = "kit/default", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/106/shared" }, - { name = "kit/sdk", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/sdk/${kit_version_short}/${kit_git_hash}" }, - { name = "kit/community", url = "https://dw290v42wisod.cloudfront.net/exts/kit/community" }, -] [[test]] samplingFactor = 1.0 # No test sampling for these tests diff --git a/templates/apps/usd_viewer/README.md b/templates/apps/usd_viewer/README.md index 75678ec..6fd357b 100644 --- a/templates/apps/usd_viewer/README.md +++ b/templates/apps/usd_viewer/README.md @@ -2,7 +2,6 @@ ![USD Viewer Hero Image](../../../readme-assets/usd_viewer.jpg) -**Based On:** `Omniverse Kit SDK 106.0` ## Overview @@ -110,12 +109,12 @@ To display content in the desktop application, you can pass an argument to the ` **Linux:** ```bash -./repo.sh launch -- --/app/auto_load_usd={replace-with-full-path-to-kit-app-template}/source/extensions/{replace-with-setup-extension-name}/samples/stage01.usd +./repo.sh launch -- --/app/auto_load_usd={replace-with-full-path-to-kit-app-template}/_build/linux-x86_64/release/samples/stage01.usd ``` **Windows:** ```powershell -.\repo.bat launch -- --/app/auto_load_usd={replace-with-full-path-to-kit-app-template}\source\extensions\{replace-with-setup-extension-name}\samples\stage01.usd +.\repo.bat launch -- --/app/auto_load_usd={replace-with-full-path-to-kit-app-template}\_build\windows-x86_64\release\samples\stage01.usd ``` ![USD Viewer Asset Launch](../../../readme-assets/usd_viewer_load_asset_desktop.png) @@ -224,7 +223,7 @@ To package your application as a container image, use the `--container` flag: ./repo.sh package --container ``` -You will be prompted to select a `.kit` file to serve as the application to launch via the container entrypoint script. This will dictate the behavior of your containerized application. +You will be prompted to select a `.kit` file to serve as the application to launch via the container entrypoint script. This will dictate the behavior of your containerized application. For example, if you are containerizing an application for streaming, select the `{your-app-name}_streaming.kit` file to ensure the correct application configuration is launched within the container. @@ -241,7 +240,7 @@ Applications packaged as container images can be launched using the `launch` com **Linux:** ```bash -./repo.sh launch --container +./repo.sh launch --container ``` If only a single container image exists, it will launch automatically. If multiple container images exist, you will be prompted to select the desired container image to launch. @@ -283,7 +282,7 @@ When streaming a containerized application, ensure that the containerized applic **Linux:** ```bash -./repo.sh launch --container +./repo.sh launch --container ``` If only a single container image exists, it will launch automatically. If multiple container images exist, you will be prompted to select the desired container image to launch. diff --git a/templates/apps/usd_viewer/omni.usd_viewer.kit b/templates/apps/usd_viewer/omni.usd_viewer.kit index 1f21d87..6919008 100644 --- a/templates/apps/usd_viewer/omni.usd_viewer.kit +++ b/templates/apps/usd_viewer/omni.usd_viewer.kit @@ -33,6 +33,7 @@ template_name = "omni.usd_viewer" "omni.kit.viewport.window" = {} "omni.no_code_ui.bundle" = {} "omni.ujitso.client" = {} +"omni.usd_viewer.samples" = {} "usdrt.scenegraph" = {} "{{ setup_extension_name }}" = { order = 1000 } @@ -100,6 +101,9 @@ height = 1080 x = -1 y = -1 +[settings.crashreporter.data] +experience = "{{ application_display_name }}" + [settings.exts] "omni.kit.renderer.core".present.enabled = true # Enable the present thread "omni.kit.renderer.core".present.presentAfterRendering = true # Ensure the present thread waits for the rendering to complete @@ -133,12 +137,6 @@ materials = true datastore.localCachePath="" # The absolute path to the root directory containing cached assets. readCacheWithAssetRoot="" # The absolute path to the root directory containing the original non-cached assets. -[settings.exts."omni.kit.registry.nucleus"] -registries = [ - { name = "kit/default", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/106/shared" }, - { name = "kit/sdk", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/sdk/${kit_version_short}/${kit_git_hash}" }, - { name = "kit/community", url = "https://dw290v42wisod.cloudfront.net/exts/kit/community" }, -] # Tests diff --git a/templates/extensions/basic_cpp/README.md b/templates/extensions/basic_cpp/README.md index 2e1211b..4d4996e 100644 --- a/templates/extensions/basic_cpp/README.md +++ b/templates/extensions/basic_cpp/README.md @@ -4,12 +4,12 @@

-**Based On:** `Omniverse Kit SDK 106.0` - ## Overview The Basic C++ Extension Template is a starting point for developers looking to build C++ based extensions within the NVIDIA Omniverse ecosystem. This template offers a best practices foundation and structure to easily integrate with the broader capabilities of the Omniverse Kit SDK. +**Note for Windows C++ Developers** : This template requires that Visual Studio is installed on the host. Additionally, `"platform:windows-x86_64".enabled` and `link_host_toolchain` within the `repo.toml` file be set to `true`. For additional C++ configuration information [see here](../../../readme-assets/additional-docs/windows_developer_configuration.md). + ### Use Cases This template is ideal for developers looking to build: diff --git a/templates/extensions/basic_python/README.md b/templates/extensions/basic_python/README.md index 39724d0..8efd302 100644 --- a/templates/extensions/basic_python/README.md +++ b/templates/extensions/basic_python/README.md @@ -4,8 +4,6 @@

-**Based On:** `Omniverse Kit SDK 106.0` - ## Overview The Basic Python Extension Template is a starting point for developers looking to build Python-based extensions within the NVIDIA Omniverse ecosystem. This template offers a best practices foundation and structure to easily integrate with the broader capabilities of the Omniverse Kit SDK. diff --git a/templates/extensions/python_ui/README.md b/templates/extensions/python_ui/README.md index 43dc5d1..f094e18 100644 --- a/templates/extensions/python_ui/README.md +++ b/templates/extensions/python_ui/README.md @@ -4,8 +4,6 @@

-**Based On:** `Omniverse Kit SDK 106.0` - ## Overview The Python UI Extension Template offers a simple starting point for developers looking to build Python-based extensions with performant User Interfaces. This template offers a best practices foundation and structure to easily integrate with the broader capabilities of the Omniverse Kit SDK. diff --git a/templates/extensions/service.setup/README.md b/templates/extensions/service.setup/README.md index fb84d2b..0eb495e 100644 --- a/templates/extensions/service.setup/README.md +++ b/templates/extensions/service.setup/README.md @@ -2,7 +2,6 @@ ![Kit Service Image](../../../readme-assets/kit_service.png) -**Based On:** `Omniverse Kit SDK 106.0` ## Overview diff --git a/templates/extensions/usd_composer.setup/README.md b/templates/extensions/usd_composer.setup/README.md index 5bfea87..9f18156 100644 --- a/templates/extensions/usd_composer.setup/README.md +++ b/templates/extensions/usd_composer.setup/README.md @@ -2,7 +2,6 @@ ![USD Composer Hero Image](../../../readme-assets/usd_composer.jpg) -**Based On:** `Omniverse Kit SDK 106.0` ## Overview diff --git a/templates/extensions/usd_composer.setup/template/data/light_rigs/Colored_Lights.usd b/templates/extensions/usd_composer.setup/template/data/light_rigs/Colored_Lights.usd deleted file mode 100644 index 04ddfc0..0000000 --- a/templates/extensions/usd_composer.setup/template/data/light_rigs/Colored_Lights.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c43d3990faa65d4b46e82e3e30c76e18a47c3fdd16dbf668a283671a19af8859 -size 1466 diff --git a/templates/extensions/usd_composer.setup/template/data/light_rigs/Default.usd b/templates/extensions/usd_composer.setup/template/data/light_rigs/Default.usd deleted file mode 100644 index 6388238..0000000 --- a/templates/extensions/usd_composer.setup/template/data/light_rigs/Default.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b69450539a1bc16cd21dd0c1738d9eb73515d2bc2b45968eb6367b6eb26604a3 -size 1835 diff --git a/templates/extensions/usd_composer.setup/template/data/light_rigs/Grey_Studio.usd b/templates/extensions/usd_composer.setup/template/data/light_rigs/Grey_Studio.usd deleted file mode 100644 index c214738..0000000 --- a/templates/extensions/usd_composer.setup/template/data/light_rigs/Grey_Studio.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6ea522e0d592ff895a88594ff844af2d364f9e1066d53522afda4c3ccd476ad -size 1982 diff --git a/templates/extensions/usd_composer.setup/template/data/light_rigs/HDR/CarLight_512x256.hdr b/templates/extensions/usd_composer.setup/template/data/light_rigs/HDR/CarLight_512x256.hdr deleted file mode 100644 index fa200b5..0000000 --- a/templates/extensions/usd_composer.setup/template/data/light_rigs/HDR/CarLight_512x256.hdr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af32629a02722215b5e7af44fd7483d646ed1e5cf6dadc530e62faa1372eac41 -size 351326 diff --git a/templates/extensions/usd_composer.setup/template/data/light_rigs/HDR/Env_Gradient_001.png b/templates/extensions/usd_composer.setup/template/data/light_rigs/HDR/Env_Gradient_001.png deleted file mode 100644 index fb4131b..0000000 --- a/templates/extensions/usd_composer.setup/template/data/light_rigs/HDR/Env_Gradient_001.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33330793f716327b2db05a309d7c3245857dba5644d1d089111f5ebf5931550d -size 111222 diff --git a/templates/extensions/usd_composer.setup/template/data/light_rigs/HDR/partly_cloudy.hdr b/templates/extensions/usd_composer.setup/template/data/light_rigs/HDR/partly_cloudy.hdr deleted file mode 100644 index 57ca0e0..0000000 --- a/templates/extensions/usd_composer.setup/template/data/light_rigs/HDR/partly_cloudy.hdr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b8796ad48172c1064d4b8606dce4fd258f1e96a7ba43dcfb020af6668a5ac89 -size 3959287 diff --git a/templates/extensions/usd_composer.setup/template/data/light_rigs/Sunny_Sky.usd b/templates/extensions/usd_composer.setup/template/data/light_rigs/Sunny_Sky.usd deleted file mode 100644 index 9a68a29..0000000 --- a/templates/extensions/usd_composer.setup/template/data/light_rigs/Sunny_Sky.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43990977c9c0dff06d245ac46cf3caa23d2e649fd6e71bbd693e511ea089d46f -size 1576 diff --git a/templates/extensions/usd_explorer.setup/README.md b/templates/extensions/usd_explorer.setup/README.md index d8bfc4a..44907f8 100644 --- a/templates/extensions/usd_explorer.setup/README.md +++ b/templates/extensions/usd_explorer.setup/README.md @@ -2,7 +2,6 @@ ![USD Explorer Hero Image](../../../readme-assets/usd_explorer.jpg) -**Based On:** `Omniverse Kit SDK 106.0` ## Overview diff --git a/templates/extensions/usd_explorer.setup/template/data/light_rigs/Blue_Sky.usd b/templates/extensions/usd_explorer.setup/template/data/light_rigs/Blue_Sky.usd deleted file mode 100644 index cf85a7c..0000000 --- a/templates/extensions/usd_explorer.setup/template/data/light_rigs/Blue_Sky.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:018d759a7fc6941a7d4f267f9f28e54d1307213e2e0900ab1d15f23d64d888dc -size 10079 diff --git a/templates/extensions/usd_explorer.setup/template/data/light_rigs/Grey_Sky.usd b/templates/extensions/usd_explorer.setup/template/data/light_rigs/Grey_Sky.usd deleted file mode 100644 index c214738..0000000 --- a/templates/extensions/usd_explorer.setup/template/data/light_rigs/Grey_Sky.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6ea522e0d592ff895a88594ff844af2d364f9e1066d53522afda4c3ccd476ad -size 1982 diff --git a/templates/extensions/usd_explorer.setup/template/data/light_rigs/HDR/CarLight_512x256.hdr b/templates/extensions/usd_explorer.setup/template/data/light_rigs/HDR/CarLight_512x256.hdr deleted file mode 100644 index fa200b5..0000000 --- a/templates/extensions/usd_explorer.setup/template/data/light_rigs/HDR/CarLight_512x256.hdr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af32629a02722215b5e7af44fd7483d646ed1e5cf6dadc530e62faa1372eac41 -size 351326 diff --git a/templates/extensions/usd_explorer.setup/template/data/light_rigs/HDR/Env_Gradient_001.png b/templates/extensions/usd_explorer.setup/template/data/light_rigs/HDR/Env_Gradient_001.png deleted file mode 100644 index fb4131b..0000000 --- a/templates/extensions/usd_explorer.setup/template/data/light_rigs/HDR/Env_Gradient_001.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33330793f716327b2db05a309d7c3245857dba5644d1d089111f5ebf5931550d -size 111222 diff --git a/templates/extensions/usd_explorer.setup/template/data/light_rigs/HDR/partly_cloudy.hdr b/templates/extensions/usd_explorer.setup/template/data/light_rigs/HDR/partly_cloudy.hdr deleted file mode 100644 index 57ca0e0..0000000 --- a/templates/extensions/usd_explorer.setup/template/data/light_rigs/HDR/partly_cloudy.hdr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b8796ad48172c1064d4b8606dce4fd258f1e96a7ba43dcfb020af6668a5ac89 -size 3959287 diff --git a/templates/extensions/usd_explorer.setup/template/data/light_rigs/High_Contrast.usd b/templates/extensions/usd_explorer.setup/template/data/light_rigs/High_Contrast.usd deleted file mode 100644 index 4b7bca2..0000000 --- a/templates/extensions/usd_explorer.setup/template/data/light_rigs/High_Contrast.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f3bb1ee096b900c9563ffa548146a5e28181e99fa156cc82248676aba810d3b -size 7822 diff --git a/templates/extensions/usd_explorer.setup/template/data/light_rigs/Neutral_Lighting.usd b/templates/extensions/usd_explorer.setup/template/data/light_rigs/Neutral_Lighting.usd deleted file mode 100644 index ba5ff22..0000000 --- a/templates/extensions/usd_explorer.setup/template/data/light_rigs/Neutral_Lighting.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d9d93fb9dcf835ec7cfb2f229a083741b73de28afadb902c32c41f05d1a8c74 -size 10593 diff --git a/templates/extensions/usd_explorer.setup/template/data/light_rigs/Sunny_Sky.usd b/templates/extensions/usd_explorer.setup/template/data/light_rigs/Sunny_Sky.usd deleted file mode 100644 index 6535ee8..0000000 --- a/templates/extensions/usd_explorer.setup/template/data/light_rigs/Sunny_Sky.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fb13699a538d5cf9843fc3f254796da1b6658173efa06924630e13038d70fa2 -size 7826 diff --git a/templates/extensions/usd_explorer.setup/template/data/light_rigs/subusds/CarLight_512x256.hdr b/templates/extensions/usd_explorer.setup/template/data/light_rigs/subusds/CarLight_512x256.hdr deleted file mode 100644 index fa200b5..0000000 --- a/templates/extensions/usd_explorer.setup/template/data/light_rigs/subusds/CarLight_512x256.hdr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af32629a02722215b5e7af44fd7483d646ed1e5cf6dadc530e62faa1372eac41 -size 351326 diff --git a/templates/extensions/usd_explorer.setup/template/data/light_rigs/subusds/Gradient_Backdrop.exr b/templates/extensions/usd_explorer.setup/template/data/light_rigs/subusds/Gradient_Backdrop.exr deleted file mode 100644 index 2dd0c3b..0000000 --- a/templates/extensions/usd_explorer.setup/template/data/light_rigs/subusds/Gradient_Backdrop.exr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ffe20c037a9f8184c2ade6b3e7e430ba9f79ec424e8f9225428528a217dd437 -size 6731039 diff --git a/templates/extensions/usd_explorer.setup/template/data/light_rigs/subusds/partly_cloudy.hdr b/templates/extensions/usd_explorer.setup/template/data/light_rigs/subusds/partly_cloudy.hdr deleted file mode 100644 index 57ca0e0..0000000 --- a/templates/extensions/usd_explorer.setup/template/data/light_rigs/subusds/partly_cloudy.hdr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b8796ad48172c1064d4b8606dce4fd258f1e96a7ba43dcfb020af6668a5ac89 -size 3959287 diff --git a/templates/extensions/usd_viewer.messaging/README.md b/templates/extensions/usd_viewer.messaging/README.md index 8377dce..d486648 100644 --- a/templates/extensions/usd_viewer.messaging/README.md +++ b/templates/extensions/usd_viewer.messaging/README.md @@ -2,7 +2,6 @@ ![USD Viewer Hero Image](../../../readme-assets/usd_viewer.jpg) -**Based On:** `Omniverse Kit SDK 106.0` ## Overview diff --git a/templates/extensions/usd_viewer.setup/README.md b/templates/extensions/usd_viewer.setup/README.md index d315fa5..7c5519e 100644 --- a/templates/extensions/usd_viewer.setup/README.md +++ b/templates/extensions/usd_viewer.setup/README.md @@ -2,7 +2,6 @@ ![USD Viewer Hero Image](../../../readme-assets/usd_viewer.jpg) -**Based On:** `Omniverse Kit SDK 106.0` ## Overview diff --git a/templates/extensions/usd_viewer.setup/template/premake5.lua b/templates/extensions/usd_viewer.setup/template/premake5.lua index b482369..0001c26 100644 --- a/templates/extensions/usd_viewer.setup/template/premake5.lua +++ b/templates/extensions/usd_viewer.setup/template/premake5.lua @@ -8,6 +8,5 @@ repo_build.prebuild_link { { "data", ext.target_dir.."/data" }, { "docs", ext.target_dir.."/docs" }, { "layouts", ext.target_dir.."/layouts" }, - { "samples", ext.target_dir.."/../../samples" }, { "{{ python_module_toplevel }}", ext.target_dir.."/{{ python_module_toplevel }}" }, } diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBike/Textures/AbstractBike_Metal_A.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBike/Textures/AbstractBike_Metal_A.png deleted file mode 100644 index f61b847..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBike/Textures/AbstractBike_Metal_A.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:078c8238a1b3828562eaa1757b5deb9a443b8cb3aeb1390997f1ac3cc161ffeb -size 5382574 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBike/Textures/AbstractBike_Metal_M.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBike/Textures/AbstractBike_Metal_M.png deleted file mode 100644 index c0b625b..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBike/Textures/AbstractBike_Metal_M.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c68f3dd0079d8dfd2a42a886b55d3ecc6019d68133785d3e167195bb675f7679 -size 1736356 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBike/Textures/AbstractBike_Metal_N.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBike/Textures/AbstractBike_Metal_N.png deleted file mode 100644 index f1b6018..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBike/Textures/AbstractBike_Metal_N.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3456df21f5be2dc5bf66ab6c318d729199e38cd59dc3aa8398cfe64e4e4d0a97 -size 4299277 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBike/Textures/AbstractBike_Metal_R.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBike/Textures/AbstractBike_Metal_R.png deleted file mode 100644 index 1e11b7a..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBike/Textures/AbstractBike_Metal_R.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8fa32d43560abf624ee11f881d7722ee7ab8d9d1dd775884feff5abb4b46c115 -size 1820498 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBird/Textures/WoodenAbstractAnimalsBird_Wood_A.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBird/Textures/WoodenAbstractAnimalsBird_Wood_A.png deleted file mode 100644 index 99e4a33..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBird/Textures/WoodenAbstractAnimalsBird_Wood_A.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30f3446af065d4b885e1cd364f594d112f23932c4019554d9225dc00e7a965ca -size 6556488 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBird/Textures/WoodenAbstractAnimalsBird_Wood_N.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBird/Textures/WoodenAbstractAnimalsBird_Wood_N.png deleted file mode 100644 index 6bc2f3a..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBird/Textures/WoodenAbstractAnimalsBird_Wood_N.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2bd222fce3db08d20bcf3f592601fcebd3d186ecdf01bd96fcb9a99ae8839007 -size 16912 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBird/Textures/WoodenAbstractAnimalsBird_Wood_R.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBird/Textures/WoodenAbstractAnimalsBird_Wood_R.png deleted file mode 100644 index 8e83243..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractBird/Textures/WoodenAbstractAnimalsBird_Wood_R.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be19789603ebac647e3f0dd076bc6eccd6a905e8fd2def686bdd63721a4f674e -size 2097532 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractElephant/Textures/WoodenAbstractAnimalsElephant_Wood_A.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractElephant/Textures/WoodenAbstractAnimalsElephant_Wood_A.png deleted file mode 100644 index 9016f91..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractElephant/Textures/WoodenAbstractAnimalsElephant_Wood_A.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7cad170844ca6281d0a7ba1603d7fc77b5f52c7ea326de25f949b8a9aaa20df -size 5541934 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractElephant/Textures/WoodenAbstractAnimalsElephant_Wood_N.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractElephant/Textures/WoodenAbstractAnimalsElephant_Wood_N.png deleted file mode 100644 index 6bc2f3a..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractElephant/Textures/WoodenAbstractAnimalsElephant_Wood_N.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2bd222fce3db08d20bcf3f592601fcebd3d186ecdf01bd96fcb9a99ae8839007 -size 16912 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractElephant/Textures/WoodenAbstractAnimalsElephant_Wood_SG.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractElephant/Textures/WoodenAbstractAnimalsElephant_Wood_SG.png deleted file mode 100644 index 490a553..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_AbstractElephant/Textures/WoodenAbstractAnimalsElephant_Wood_SG.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d27a1ff74818956e58ea0e9dc85f22612e6d1336e117142cf6eeee7b15be6ee -size 8534 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_TikiGods/Textures/TikiGardenGods_Wood_A.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_TikiGods/Textures/TikiGardenGods_Wood_A.png deleted file mode 100644 index 8f389e7..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_TikiGods/Textures/TikiGardenGods_Wood_A.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ff785e39c2fd7ae9c00b2e72cdc8c4270962ef34f6b41f0e53c1d75062ed3d8 -size 3894807 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_TikiGods/Textures/TikiGardenGods_Wood_N.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_TikiGods/Textures/TikiGardenGods_Wood_N.png deleted file mode 100644 index a524ef9..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_TikiGods/Textures/TikiGardenGods_Wood_N.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76dc699a98ce7afce798e3ef10e30b0abcdc757d5626a7604cff790d511d128a -size 4819914 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_TikiGods/Textures/TikiGardenGods_Wood_R.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_TikiGods/Textures/TikiGardenGods_Wood_R.png deleted file mode 100644 index d9f5a8b..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Collected_TikiGods/Textures/TikiGardenGods_Wood_R.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7f889e29a31ce42006642e772cdea4818d0e55edfebcdcccd409e6a3658e8a8 -size 1804671 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/Cube_Concrete_Base_001_a.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/Cube_Concrete_Base_001_a.png deleted file mode 100644 index e20a53f..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/Cube_Concrete_Base_001_a.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff91e6eec86b7dea57a5f836611e891911d2738e62778f20e3de49516035563d -size 22161073 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/Cube_Concrete_Base_001_r.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/Cube_Concrete_Base_001_r.png deleted file mode 100644 index 8a70baf..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/Cube_Concrete_Base_001_r.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4721c6713366ed8fdce4f72cd1ab9b9df4d3229456e102b4ac3e5d88e706180 -size 14098534 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/NV_Tray_Exported.usd b/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/NV_Tray_Exported.usd deleted file mode 100644 index 563f570..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/NV_Tray_Exported.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc210f0f77f9b6bf32ba169bd89c7ede3549bfa45a600d8aef6cd16ade1390b3 -size 388272 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/Nvidia_3D_Logo.usd b/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/Nvidia_3D_Logo.usd deleted file mode 100644 index a742fe0..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/Nvidia_3D_Logo.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf9ef7fe3340dd8c1aabc053b9b76161ec65f04ad7756a30a10388edc5d60bf5 -size 45929 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/materials/EffectLayerMT.mdl b/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/materials/EffectLayerMT.mdl deleted file mode 100644 index 059d567..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/SubUSDs/materials/EffectLayerMT.mdl +++ /dev/null @@ -1,146 +0,0 @@ -mdl 1.8; - - -import ::base::*; -import ::state::*; -import ::math::*; -import ::scene::*; -// import ::anno::*; -// import ::tex::*; -// import ::df::*; - -import ::nvidia::core_definitions::add_emission; -import ::OmniPBR::OmniPBR; - -float linstep(float a, float b, float x){ - return math::saturate((x-a)/(b-a)); -} - -float3 GridSingle(float3 p,float lod=0,float3 edgewidth=1){ - float3 pos=p*math::exp2(lod); - return float3(1)-math::smoothstep(float3(0),edgewidth*math::exp2(lod),math::abs(math::frac(pos+float3(0.5))*2-float3(1))); -} - -float3 GridLOD(float3 p,float lod=0,float3 edgewidth=1){ - return math::lerp( - GridSingle(p,math::floor(lod)+0.0,edgewidth), - GridSingle(p,math::floor(lod)+1.0,edgewidth), - math::frac(lod) - ); -} - -float DrawGrid( - float LodBias = 0 , - float Thickness = 0.01, - int ProjectionType = 0 , - - float3 Translate = float3(0,0,0) , - - float ScaleExp = 0 -) -{ - - float grid=0; - base::texture_coordinate_info uvw = base::coordinate_source(base::texture_coordinate_object,0); - base::texture_coordinate_info uvw_world = base::coordinate_source(base::texture_coordinate_world,0); - // float worldsize=math::length(state::transform_vector(state::coordinate_world,state::coordinate_object,float3(1,1,1))); - // float3 normal_world=math::normalize(state::transform_vector(state::coordinate_internal,state::coordinate_world,state::normal())); - // float3 p=uvw_world.position-Translate+normal_world*ShaperA*ShaperB.x; - float3 p=(ProjectionType==0?uvw_world.position:uvw.position)-Translate; - p*=math::exp2(ScaleExp); - - - p*=math::length(state::transform_vector(state::coordinate_object, state::coordinate_world,float3(1,1,1))); - - grid=math::length(float3(GridLOD(p,LodBias,Thickness*float3(1,1,1)))); - - // float wd=sigma_float(ShaperB.y*0.1); - - - - return grid; -} - -float DrawSwipe(float Fader=0,float3 dir=float3(1,1,1),float width=0.25){ - base::texture_coordinate_info uvw_obj = base::coordinate_source(base::texture_coordinate_object,0); - float3 p=math::normalize(uvw_obj.position); - p+=state::normal()*0.5; - float3 rd=math::normalize(p); - float3 sd=math::normalize(dir); - float dp=math::dot(rd,sd); - float chi=math::acos(dp)/math::PI; - float wd=width; - float mask=linstep(wd,-wd,chi/(1+wd*2)+wd-(Fader)*(1+wd*1)); - return mask; -} -float FresnelFactor(uniform float3 CameraPosition=float3(0,0,10000)){ - float3 wp=state::transform_point(state::coordinate_internal, state::coordinate_world,state::position()); - float3 ViewVector=math::normalize(wp-CameraPosition); - float dp=math::dot(ViewVector,state::normal()); - return dp; -} -export material EffectLayer( - material input_material = OmniPBR::OmniPBR(), - - uniform float Fader=-100.0, - uniform float AnimationStart=99999.0, - uniform float AnimationDuration=1.0, - - float FaderGridGlow=50.0, - float FaderFresnelGlow=50.0, - - float FresnelGlow=0.0, - float GridGlow=0.0, - - color GridColor=color(0.0959, 0.6535, 0.8760), - uniform float3 CameraPosition=float3(0,0,10000) - - ) - - = let{ - - float ft0=( (state::animation_time()-AnimationStart)/(AnimationDuration!=0.0?AnimationDuration:0.00001) ); - float ft=AnimationDuration<0?math::saturate(ft0+1):math::saturate(ft0); - // float ft=(state::animation_time()-AnimationStart)/AnimationDuration; - // float f=Fader>-10?Fader:math::saturate(ft); - float f=Fader>-10?Fader:ft; - float dp=FresnelFactor(CameraPosition); - float swipe=(1.0-math::abs(DrawSwipe(Fader)*2.0-1.0)); - float glow=math::pow(1.0-math::abs(dp),4.0); - float t=state::animation_time()*math::PI; - float glow_pulse=math::exp2(math::sin(t)); - - float sgridlod=-4.0+3*swipe; - float sgrid=DrawGrid( - - LodBias: sgridlod, - - Thickness: 4*0.200000003f, - ProjectionType: 1, - // Translate: float3(0.f), - Translate: float3(0.f), - ScaleExp: 0.f - )*math::smoothstep(0,1,8.0+sgridlod); - - - - - - - - } in ::nvidia::core_definitions::add_emission( - base: input_material, - tint: color(0,0,0) - +sgrid*100*GridColor*GridGlow - +sgrid*100*GridColor*FaderGridGlow*f*glow_pulse - +glow*2000*GridColor*FresnelGlow - +glow*2000*GridColor*FaderFresnelGlow*f*glow_pulse - +swipe*GridColor*5000 - // +glow*3000*GridColor*FaderFresnelGlow*f*glow_pulse - - +GridColor*1000*glow*math::smoothstep(0,0.5,f)*math::smoothstep(0,0.5,1.0-f) - +input_material.surface.emission.intensity - , - - intensity: 1.f, - unit_scale: 1.f); diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Textures/BiggestTableEver_02052024_Profiled_LensCorrected_Masked_small.exr b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Textures/BiggestTableEver_02052024_Profiled_LensCorrected_Masked_small.exr deleted file mode 100644 index 0652813..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Textures/BiggestTableEver_02052024_Profiled_LensCorrected_Masked_small.exr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd1a334cbb31ff768edf69d04d16c5dec656cde95e8e86ac80c02048d2216660 -size 25472964 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Textures/FlakeNoise.jpg b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Textures/FlakeNoise.jpg deleted file mode 100644 index 800533b..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Textures/FlakeNoise.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bba6361ef2e368b99301e03a97701a8a6ca305c6ecf0fcf936abc14782d05a1 -size 231557 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Textures/RTX_Square_01_Alpha.png b/templates/extensions/usd_viewer.setup/template/samples/assets/source/Textures/RTX_Square_01_Alpha.png deleted file mode 100644 index 248443d..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/Textures/RTX_Square_01_Alpha.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4fb6b7c80c80e616c63bc4f81259af42166196336fd25934373ca2ced7537ba4 -size 14559 diff --git a/templates/extensions/usd_viewer.setup/template/samples/assets/source/backdrop.usd b/templates/extensions/usd_viewer.setup/template/samples/assets/source/backdrop.usd deleted file mode 100644 index fc57705..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/assets/source/backdrop.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c674abfcc2e77eda5288af1bbafdb1193709541662aaf6ff111fb4fec1e7a40e -size 27335 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_leather_macro_01/leather_blend_mask_04.jpg b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_leather_macro_01/leather_blend_mask_04.jpg deleted file mode 100644 index 13e8921..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_leather_macro_01/leather_blend_mask_04.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07fc8942fcfdd405e477d4aa7a0756333da6f80a99c25cc4e8902ba30c9587da -size 10447835 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_plastic_pattern_03/ov_plastic_pattern_03_basecolor.jpg b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_plastic_pattern_03/ov_plastic_pattern_03_basecolor.jpg deleted file mode 100644 index 18b293e..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_plastic_pattern_03/ov_plastic_pattern_03_basecolor.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4f3d24011f6d499d72e05f26222510a232c1deca516aded8006c30460c3bd88 -size 613703 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_plastic_pattern_03/ov_plastic_pattern_03_normal.jpg b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_plastic_pattern_03/ov_plastic_pattern_03_normal.jpg deleted file mode 100644 index b8297b6..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_plastic_pattern_03/ov_plastic_pattern_03_normal.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c8e30193c8bf8374fbd2d543d4e59d918b7cc33adbe93ca18df646adcb00092 -size 1035808 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_plastic_pattern_03/ov_plastic_pattern_03_orm.jpg b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_plastic_pattern_03/ov_plastic_pattern_03_orm.jpg deleted file mode 100644 index 5422a28..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_plastic_pattern_03/ov_plastic_pattern_03_orm.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05d09732604b37a3ad37f52b1ffd4953beab6fa325f44136493740fa290ae065 -size 1440927 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_wood_grain_d_01/ov_wood_grain_d_01_basecolor.jpg b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_wood_grain_d_01/ov_wood_grain_d_01_basecolor.jpg deleted file mode 100644 index 16a2b81..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_wood_grain_d_01/ov_wood_grain_d_01_basecolor.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0843b20f739932e4dd5f268f147f3fa5588e230323935b6e3f473e0993a1f0e -size 1358853 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_wood_grain_d_01/ov_wood_grain_d_01_orm.jpg b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_wood_grain_d_01/ov_wood_grain_d_01_orm.jpg deleted file mode 100644 index 09ebfaf..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_wood_grain_d_01/ov_wood_grain_d_01_orm.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08066e99b82ae735d9acf8f784a858ea77c9cd4f6883bcd5e84e8a94b9ef8321 -size 3856253 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Masonry/Concrete_Rough.mdl b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Masonry/Concrete_Rough.mdl deleted file mode 100644 index 4fccea5..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Masonry/Concrete_Rough.mdl +++ /dev/null @@ -1,54 +0,0 @@ -mdl 1.4; - -import ::OmniPBR::OmniPBR; -import ::anno::author; -import ::anno::description; -import ::anno::display_name; -import ::anno::key_words; -import ::anno::version; -import ::tex::gamma_mode; -import ::state::normal; - -export material Concrete_Rough(*) -[[ - ::anno::display_name("Omni PBR "), - ::anno::description("Omni PBR, supports ORM textures"), - ::anno::version(1, 0, 0, ""), - ::anno::author("NVIDIA CORPORATION"), - ::anno::key_words(string[]("omni", "PBR", "omniverse", "generic")) -]] - = ::OmniPBR::OmniPBR( - diffuse_color_constant: color(0.200000003f, 0.200000003f, 0.200000003f), - diffuse_texture: texture_2d("./Concrete_Rough/Concrete_Rough_BaseColor.png" /* tag 2988, version 2814873019 */, ::tex::gamma_srgb), - albedo_desaturation: 0.f, - albedo_add: 0.f, - albedo_brightness: 1.f, - diffuse_tint: color(1.f, 1.f, 1.f), - reflection_roughness_constant: 0.5f, - reflection_roughness_texture_influence: 1.f, - reflectionroughness_texture: texture_2d(), - metallic_constant: 0.f, - metallic_texture_influence: 0.f, - metallic_texture: texture_2d(), - specular_level: 0.5f, - enable_ORM_texture: true, - ORM_texture: texture_2d("./Concrete_Rough/Concrete_Rough_ORM.png" /* tag 2992, version 3755373197 */, ::tex::gamma_linear), - ao_to_diffuse: 0.f, - ao_texture: texture_2d(), - enable_emission: false, - emissive_color: color(1.f, 0.100000001f, 0.100000001f), - emissive_mask_texture: texture_2d(), - emissive_intensity: 40.f, - bump_factor: 1.f, - normalmap_texture: texture_2d("./Concrete_Rough/Concrete_Rough_N.png" /* tag 2990, version 2835026711 */, ::tex::gamma_linear), - detail_bump_factor: 0.300000012f, - detail_normalmap_texture: texture_2d(), - project_uvw: false, - world_or_object: false, - uv_space_index: 0, - texture_translate: float2(0.f), - texture_rotate: 0.f, - texture_scale: float2(1.f), - detail_texture_translate: float2(0.f), - detail_texture_rotate: 0.f, - detail_texture_scale: float2(1.f)); diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Masonry/Concrete_Rough/Concrete_Rough_BaseColor.png b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Masonry/Concrete_Rough/Concrete_Rough_BaseColor.png deleted file mode 100644 index a5037d8..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Masonry/Concrete_Rough/Concrete_Rough_BaseColor.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e83fc20c30175cba17c6ec83621616336d7aaf849782b0856241b23e8dab9465 -size 11107648 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Masonry/Concrete_Rough/Concrete_Rough_N.png b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Masonry/Concrete_Rough/Concrete_Rough_N.png deleted file mode 100644 index a757ad6..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Masonry/Concrete_Rough/Concrete_Rough_N.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7f51a3c4b3365615a245366c60d06024006b91699e895cd753521648b187454 -size 10292151 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Masonry/Concrete_Rough/Concrete_Rough_ORM.png b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Masonry/Concrete_Rough/Concrete_Rough_ORM.png deleted file mode 100644 index e4d98e4..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Masonry/Concrete_Rough/Concrete_Rough_ORM.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbecf423a50da64449e0032705547d2ab0bd28b757d04d4beb13b05f6a45e0cc -size 7987670 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Aluminum_Polished.mdl b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Aluminum_Polished.mdl deleted file mode 100644 index 504021c..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Aluminum_Polished.mdl +++ /dev/null @@ -1,42 +0,0 @@ -mdl 1.4; - -using ::OmniPBR import OmniPBR; -import ::tex::gamma_mode; -import ::state::normal; - -export material Aluminum_Polished(*) - = OmniPBR( - diffuse_color_constant: color(0.500000, 0.500000, 0.500000), - diffuse_texture: texture_2d("./Aluminum_Polished/Aluminum_Polished_BaseColor.png", ::tex::gamma_srgb), - albedo_desaturation: 0.f, - albedo_add: 0.f, - albedo_brightness: 1.f, - diffuse_tint: color(1.f, 1.f, 1.f), - reflection_roughness_constant: 0.000000, - reflection_roughness_texture_influence: 1.f, - reflectionroughness_texture: texture_2d(), - metallic_constant: 0.000000, - metallic_texture_influence: 1.f, - metallic_texture: texture_2d(), - specular_level: 0.5f, - enable_ORM_texture: true, - ORM_texture: texture_2d("./Aluminum_Polished/Aluminum_Polished_ORM.png", ::tex::gamma_linear), - ao_to_diffuse: 0.f, - ao_texture: texture_2d(), - enable_emission: false, - emissive_color: color(1.000000, 1.000000, 1.000000), - emissive_mask_texture: texture_2d(), - emissive_intensity: 0.000000, - bump_factor: 1.f, - normalmap_texture: texture_2d("./Aluminum_Polished/Aluminum_Polished_Normal.png", ::tex::gamma_linear), - detail_bump_factor: 0.300000012f, - detail_normalmap_texture: texture_2d(), - project_uvw: false, - world_or_object: false, - uv_space_index: 0, - texture_translate: float2(0.f), - texture_rotate: 0.f, - texture_scale: float2(1.f), - detail_texture_translate: float2(0.f), - detail_texture_rotate: 0.f, - detail_texture_scale: float2(1.f)); diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Aluminum_Polished/Aluminum_Polished_BaseColor.png b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Aluminum_Polished/Aluminum_Polished_BaseColor.png deleted file mode 100644 index c00f298..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Aluminum_Polished/Aluminum_Polished_BaseColor.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1d042502d7d94bca13cee10c63ab5b3801fb0a46e26d79169e13f5b9c7b5a31 -size 16903 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Aluminum_Polished/Aluminum_Polished_Normal.png b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Aluminum_Polished/Aluminum_Polished_Normal.png deleted file mode 100644 index 0516db7..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Aluminum_Polished/Aluminum_Polished_Normal.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8221595d4a575d1e95f059288ce11f1bd0bc7c107ad77bbe482ae7c717816c65 -size 2272406 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Aluminum_Polished/Aluminum_Polished_ORM.png b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Aluminum_Polished/Aluminum_Polished_ORM.png deleted file mode 100644 index fe1845f..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Aluminum_Polished/Aluminum_Polished_ORM.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27a1ffae09aca47be92ea6d9df39d365c58fb7e4d6a28ed3d14563a696b5dad4 -size 643206 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Gold.mdl b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Gold.mdl deleted file mode 100644 index cd70941..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Gold.mdl +++ /dev/null @@ -1,54 +0,0 @@ -mdl 1.4; - -import ::OmniPBR::OmniPBR; -import ::anno::author; -import ::anno::description; -import ::anno::display_name; -import ::anno::key_words; -import ::anno::version; -import ::tex::gamma_mode; -import ::state::normal; - -export material Gold(*) -[[ - ::anno::display_name("Omni PBR "), - ::anno::description("Omni PBR, supports ORM textures"), - ::anno::version(1, 0, 0, ""), - ::anno::author("NVIDIA CORPORATION"), - ::anno::key_words(string[]("omni", "PBR", "omniverse", "generic")) -]] - = ::OmniPBR::OmniPBR( - diffuse_color_constant: color(0.200000003f, 0.200000003f, 0.200000003f), - diffuse_texture: texture_2d("./Gold/Gold_BaseColor.png" /* tag 2798, version 4095654520 */, ::tex::gamma_srgb), - albedo_desaturation: 0.f, - albedo_add: 0.f, - albedo_brightness: 1.f, - diffuse_tint: color(1.f, 1.f, 1.f), - reflection_roughness_constant: 0.5f, - reflection_roughness_texture_influence: 1.f, - reflectionroughness_texture: texture_2d(), - metallic_constant: 0.5f, - metallic_texture_influence: 1.f, - metallic_texture: texture_2d(), - specular_level: 0.5f, - enable_ORM_texture: true, - ORM_texture: texture_2d("./Gold/Gold_ORM.png" /* tag 2800, version 1033957151 */, ::tex::gamma_linear), - ao_to_diffuse: 0.f, - ao_texture: texture_2d(), - enable_emission: false, - emissive_color: color(1.f, 0.100000001f, 0.100000001f), - emissive_mask_texture: texture_2d(), - emissive_intensity: 40.f, - bump_factor: 1.f, - normalmap_texture: texture_2d("./Gold/Gold_N.png" /* tag 2802, version 1181343238 */, ::tex::gamma_linear), - detail_bump_factor: 0.300000012f, - detail_normalmap_texture: texture_2d(), - project_uvw: false, - world_or_object: false, - uv_space_index: 0, - texture_translate: float2(0.f), - texture_rotate: 0.f, - texture_scale: float2(1.f), - detail_texture_translate: float2(0.f), - detail_texture_rotate: 0.f, - detail_texture_scale: float2(1.f)); diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Gold/Gold_BaseColor.png b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Gold/Gold_BaseColor.png deleted file mode 100644 index dc041d1..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Gold/Gold_BaseColor.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c92535d2421153cdd1a2c0b9f01330a771096338f44ddbc09e7a7ea60d0fa3a1 -size 1521894 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Gold/Gold_N.png b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Gold/Gold_N.png deleted file mode 100644 index 76af5e1..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Gold/Gold_N.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4cb69837c50feaeb67669f27fb78adcc177b4e69cd9323575823d99a87ef5672 -size 5514068 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Gold/Gold_ORM.png b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Gold/Gold_ORM.png deleted file mode 100644 index 96d0800..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Gold/Gold_ORM.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:645b2b7e30fceebfa313bf28aac11cb66fc885032b7c8847ecb0841b636d67e8 -size 3353490 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Steel_Stainless.mdl b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Steel_Stainless.mdl deleted file mode 100644 index 5c3bd7e..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Steel_Stainless.mdl +++ /dev/null @@ -1,54 +0,0 @@ -mdl 1.4; - -import ::OmniPBR::OmniPBR; -import ::anno::author; -import ::anno::description; -import ::anno::display_name; -import ::anno::key_words; -import ::anno::version; -import ::tex::gamma_mode; -import ::state::normal; - -export material Steel_Stainless(*) -[[ - ::anno::display_name("Omni PBR "), - ::anno::description("Omni PBR, supports ORM textures"), - ::anno::version(1, 0, 0, ""), - ::anno::author("NVIDIA CORPORATION"), - ::anno::key_words(string[]("omni", "PBR", "omniverse", "generic")) -]] - = ::OmniPBR::OmniPBR( - diffuse_color_constant: color(0.200000003f, 0.200000003f, 0.200000003f), - diffuse_texture: texture_2d("./Steel_Stainless/Steel_Stainless_BaseColor.png" /* tag 3107, version 2706352012 */, ::tex::gamma_srgb), - albedo_desaturation: 0.f, - albedo_add: 0.f, - albedo_brightness: 1.f, - diffuse_tint: color(1.f, 1.f, 1.f), - reflection_roughness_constant: 0.5f, - reflection_roughness_texture_influence: 1.f, - reflectionroughness_texture: texture_2d(), - metallic_constant: 0.f, - metallic_texture_influence: 1.f, - metallic_texture: texture_2d(), - specular_level: 0.5f, - enable_ORM_texture: true, - ORM_texture: texture_2d("./Steel_Stainless/Steel_Stainless_ORM.png" /* tag 3109, version 880241343 */, ::tex::gamma_linear), - ao_to_diffuse: 0.f, - ao_texture: texture_2d(), - enable_emission: false, - emissive_color: color(1.f, 0.100000001f, 0.100000001f), - emissive_mask_texture: texture_2d(), - emissive_intensity: 40.f, - bump_factor: 1.f, - normalmap_texture: texture_2d("./Steel_Stainless/Steel_Stainless_N.png" /* tag 3111, version 1659240673 */, ::tex::gamma_linear), - detail_bump_factor: 0.300000012f, - detail_normalmap_texture: texture_2d(), - project_uvw: false, - world_or_object: false, - uv_space_index: 0, - texture_translate: float2(0.f), - texture_rotate: 0.f, - texture_scale: float2(1.f), - detail_texture_translate: float2(0.f), - detail_texture_rotate: 0.f, - detail_texture_scale: float2(1.f)); diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Steel_Stainless/Steel_Stainless_BaseColor.png b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Steel_Stainless/Steel_Stainless_BaseColor.png deleted file mode 100644 index 6a489bb..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Steel_Stainless/Steel_Stainless_BaseColor.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f8b3b576ce734630625a64faf6266faf411714a59c42c7af395dc0826e52151 -size 16902 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Steel_Stainless/Steel_Stainless_N.png b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Steel_Stainless/Steel_Stainless_N.png deleted file mode 100644 index 0516db7..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Steel_Stainless/Steel_Stainless_N.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8221595d4a575d1e95f059288ce11f1bd0bc7c107ad77bbe482ae7c717816c65 -size 2272406 diff --git a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Steel_Stainless/Steel_Stainless_ORM.png b/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Steel_Stainless/Steel_Stainless_ORM.png deleted file mode 100644 index 26ff4ea..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Metals/Steel_Stainless/Steel_Stainless_ORM.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a300aae59deb440b90e73f4ab9e6f0fc2da41ba405442ff988e681df921f2a4e -size 779615 diff --git a/templates/extensions/usd_viewer.setup/template/samples/stage01.usd b/templates/extensions/usd_viewer.setup/template/samples/stage01.usd deleted file mode 100644 index c9ea7bc..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/stage01.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93ebf6c82c4e4a452e134b9bca0fabbca5cf41e6bfb320a33ea0d79e145c15d6 -size 125255 diff --git a/templates/extensions/usd_viewer.setup/template/samples/stage02.usd b/templates/extensions/usd_viewer.setup/template/samples/stage02.usd deleted file mode 100644 index 17794dd..0000000 --- a/templates/extensions/usd_viewer.setup/template/samples/stage02.usd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:473cad5c462244b386194d517544f38ab3beb147152897e8392d40fa22b16fea -size 37890254 diff --git a/templates/templates.toml b/templates/templates.toml index 4b9f73d..585f889 100644 --- a/templates/templates.toml +++ b/templates/templates.toml @@ -1,18 +1,4 @@ # -- Application templates -- -[templates."kit_service"] -class = "ApplicationTemplate" -name = "Kit Service" -url = "." -subpath = "apps/kit_service/kit_service.kit" -variables.application_name = "my_company.my_service" -variables.application_display_name = "My Service" -variables.version = "0.1.0" - -[[templates."kit_service".extensions]] -template = "kit_service_setup" -type = "setup" - - [templates."kit_base_editor"] class = "ApplicationTemplate" name = "Kit Base Editor" @@ -89,6 +75,19 @@ type = "gdn" template = "omni_default_streaming" type = "streaming" +[templates."kit_service"] +class = "ApplicationTemplate" +name = "Kit Service" +url = "." +subpath = "apps/kit_service/kit_service.kit" +variables.application_name = "my_company.my_service" +variables.application_display_name = "My Service" +variables.version = "0.1.0" + +[[templates."kit_service".extensions]] +template = "kit_service_setup" +type = "setup" + # -- Application Layer templates -- [templates."omni_default_streaming"] diff --git a/tools/VERSION.md b/tools/VERSION.md index 180a6f7..b04f2c1 100644 --- a/tools/VERSION.md +++ b/tools/VERSION.md @@ -1 +1 @@ -106.2 \ No newline at end of file +106.3 \ No newline at end of file diff --git a/tools/containers/Dockerfile.j2 b/tools/containers/Dockerfile.j2 index 40c491e..e0ecb4c 100644 --- a/tools/containers/Dockerfile.j2 +++ b/tools/containers/Dockerfile.j2 @@ -1,7 +1,7 @@ # This Dockerfile is used as the base for containerizing applications rendered out via repo_kit_template. # Utilize Kit Kernel 106.0.0 -FROM nvcr.io/nvidia/omniverse/ov-kit-kernel:106.1.0-ea.140981.10a4b5c0 +FROM nvcr.io/nvidia/omniverse/ov-kit-kernel:106.3.0-release.152900.95989438 # root user to bootstrap the container USER root diff --git a/tools/containers/entrypoint.sh.j2 b/tools/containers/entrypoint.sh.j2 index d4753cd..7f393f5 100644 --- a/tools/containers/entrypoint.sh.j2 +++ b/tools/containers/entrypoint.sh.j2 @@ -2,15 +2,33 @@ set -e set -u +write_omniverse_toml() { + # Write out an omniverse.toml configuration file for Kit that contains a bookmark + # for a custom provided nucleus server. + local nucleus_server=$$1 + mkdir --parents /home/ubuntu/.nvidia-omniverse/config + cat < /home/ubuntu/.nvidia-omniverse/config/omniverse.toml +[bookmarks] +"$${nucleus_server}" = "omniverse://$${nucleus_server}" +EOF +} + + USER_ID="$${USER_ID:-""}" if [ -z "$${USER_ID}" ]; then echo "User id is not set" fi +# if NVDA_KIT_NUCLEUS is set, write out the omniverse.toml value +if [ -n "$${NVDA_KIT_NUCLEUS:-}" ]; then + write_omniverse_toml "$${NVDA_KIT_NUCLEUS}" +fi + CMD="/app/kit/kit" ARGS=( "/app/apps/$KIT_FILE_NAME_BREADCRUMB" $KIT_ARGS_BREADCRUMB +$${NVDA_KIT_ARGS:-""} ) # Emit the .kit file to be executed if kit_verbose is set diff --git a/tools/deps/kit-sdk-deps.packman.xml b/tools/deps/kit-sdk-deps.packman.xml index 5c19b04..fb2adaf 100644 --- a/tools/deps/kit-sdk-deps.packman.xml +++ b/tools/deps/kit-sdk-deps.packman.xml @@ -9,7 +9,6 @@ - @@ -21,11 +20,8 @@ - - - diff --git a/tools/deps/kit-sdk.packman.xml b/tools/deps/kit-sdk.packman.xml index 58d4c45..03a6f13 100644 --- a/tools/deps/kit-sdk.packman.xml +++ b/tools/deps/kit-sdk.packman.xml @@ -1,4 +1,4 @@ - + diff --git a/tools/deps/repo-deps.packman.xml b/tools/deps/repo-deps.packman.xml index 0698277..f6d79f1 100644 --- a/tools/deps/repo-deps.packman.xml +++ b/tools/deps/repo-deps.packman.xml @@ -1,12 +1,12 @@ - + - + - + @@ -15,9 +15,9 @@ - + - + diff --git a/tools/packman/bootstrap/configure.bat b/tools/packman/bootstrap/configure.bat old mode 100644 new mode 100755 diff --git a/tools/packman/bootstrap/fetch_file_from_packman_bootstrap.cmd b/tools/packman/bootstrap/fetch_file_from_packman_bootstrap.cmd old mode 100644 new mode 100755 diff --git a/tools/packman/packman b/tools/packman/packman old mode 100644 new mode 100755 diff --git a/tools/packman/packman.cmd b/tools/packman/packman.cmd old mode 100644 new mode 100755 diff --git a/tools/packman/python.bat b/tools/packman/python.bat old mode 100644 new mode 100755 diff --git a/tools/repoman/launch.py b/tools/repoman/launch.py index c4b889c..a4e9943 100644 --- a/tools/repoman/launch.py +++ b/tools/repoman/launch.py @@ -205,12 +205,18 @@ def run_selected_image(image_id: str, dev_bundle: bool, extra_args: List[str], v """ # TODO: Can we just assume the Dockerfile expose port ranges # and always map those in? Or should this be configurable via CLI args/toml file? + nvda_kit_args = os.environ.get("NVDA_KIT_ARGS", "") + nvda_kit_nucleus = os.environ.get("NVDA_KIT_NUCLEUS", "") docker_run_cmd = [ "docker", "run", "--gpus=all", "--env", f"OM_KIT_VERBOSE={1 if verbose else 0}", + "--env", + f"NVDA_KIT_ARGS={nvda_kit_args}", + "--env", + f"NVDA_KIT_NUCLEUS={nvda_kit_nucleus}", "--mount", # RTX Shader Cache "type=volume,src=omniverse_shader_cache,dst=/home/ubuntu/.cache/ov,volume-driver=local", "--mount", # Kit Extension Cache @@ -424,15 +430,6 @@ def launch_kit( # Enable the developer bundle kit_cmd = [str(app_build_path)] - # Stealing this from the `repo_precache_exts` logic in `repo build` - # Ensures we're pointing at the correct registries for kit when using `repo launch` - registries = config.get("repo_precache_exts", {}).get("registries", []) - for idx, registry in enumerate(registries): - name = registry.get("name") - url = registry.get("url") - if name and url: - kit_cmd += [f'--/exts/omni.kit.registry.nucleus/registries/{idx}/name={name}', - f'--/exts/omni.kit.registry.nucleus/registries/{idx}/url={url}'] if dev_bundle: kit_cmd += ["--enable", "omni.kit.developer.bundle"]