Merge branch 'main' into globe-anchors

CesiumGS · Oct 4, 2023 · f280996 · f280996
2 parents 593e46b + c8edb67
commit f280996
Show file tree

Hide file tree

Showing 11 changed files with 103 additions and 193 deletions.
diff --git a/.vscode/launch.linux.json b/.vscode/launch.linux.json
@@ -14,39 +14,13 @@
         "UBSAN_OPTIONS": "print_stacktrace=1"
       },
       "cwd": "${workspaceFolder}",
-      "type": "lldb",
+      "type": "cppdbg",
       "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart",
       "MIMode": "gdb",
-      "setupCommands": [
-        {
-          "text": "-enable-pretty-printing",
-          "ignoreFailures": true
-        },
-        {
-          "text": "set print elements 0"
-        }
-      ]
-    },
-    {
-      "name": "Tests Extension",
-      "preLaunchTask": "Build Only (debug)",
-      "program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit",
-      "args": [
-        "${workspaceFolder}/apps/cesium.omniverse.cpp.tests.runner.kit"
-      ],
-      "env": {
-        // Disable LSAN when debugging since it doesn't work with GDB and prints harmless but annoying warning messages
-        "ASAN_OPTIONS": "detect_leaks=0",
-        "UBSAN_OPTIONS": "print_stacktrace=1"
+      "symbolLoadInfo": {
+        "loadAll": false,
+        "exceptionList": "libcesium.omniverse.plugin.so;libcesium.omniverse.cpp.tests.plugin.so"
       },
-      "cwd": "${workspaceFolder}",
-      "type": "lldb",
-      "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart",
-      "MIMode": "gdb",
       "setupCommands": [
         {
           "text": "-enable-pretty-printing",
@@ -70,91 +44,8 @@
         "UBSAN_OPTIONS": "print_stacktrace=1"
       },
       "cwd": "${workspaceFolder}",
-      "type": "lldb",
-      "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart",
-      "MIMode": "gdb",
-      "setupCommands": [
-        {
-          "text": "-enable-pretty-printing",
-          "ignoreFailures": true
-        },
-        {
-          "text": "set print elements 0"
-        }
-      ]
-    },
-    {
-      "name": "Performance Tracing",
-      "preLaunchTask": "Build Only (release)",
-      "program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit",
-      "args": [
-        "${workspaceFolder}/apps/cesium.omniverse.dev.trace.kit"
-      ],
-      "env": {
-        // Disable LSAN when debugging since it doesn't work with GDB and prints harmless but annoying warning messages
-        "ASAN_OPTIONS": "detect_leaks=0",
-        "UBSAN_OPTIONS": "print_stacktrace=1"
-      },
-      "cwd": "${workspaceFolder}",
-      "type": "lldb",
+      "type": "cppdbg",
       "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart",
-      "MIMode": "gdb",
-      "setupCommands": [
-        {
-          "text": "-enable-pretty-printing",
-          "ignoreFailures": true
-        },
-        {
-          "text": "set print elements 0"
-        }
-      ]
-    },
-    {
-      "name": "Performance Testing App",
-      "preLaunchTask": "Build Only (release)",
-      "program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit",
-      "args": [
-        "${workspaceFolder}/apps/cesium.performance.kit"
-      ],
-      "env": {
-        // Disable LSAN when debugging since it doesn't work with GDB and prints harmless but annoying warning messages
-        "ASAN_OPTIONS": "detect_leaks=0",
-        "UBSAN_OPTIONS": "print_stacktrace=1"
-      },
-      "cwd": "${workspaceFolder}",
-      "type": "lldb",
-      "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart",
-      "MIMode": "gdb",
-      "setupCommands": [
-        {
-          "text": "-enable-pretty-printing",
-          "ignoreFailures": true
-        },
-        {
-          "text": "set print elements 0"
-        }
-      ]
-    },
-    {
-      "name": "C++ Unit Tests",
-      "preLaunchTask": "Build Only (debug)",
-      "program": "${workspaceFolder}/build-debug/bin/tests",
-      "env": {
-        // Disable LSAN when debugging since it doesn't work with GDB and prints harmless but annoying warning messages
-        "ASAN_OPTIONS": "detect_leaks=0",
-        "UBSAN_OPTIONS": "print_stacktrace=1"
-      },
-      "cwd": "${workspaceFolder}",
-      "type": "lldb",
-      "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart",
       "MIMode": "gdb",
       "setupCommands": [
         {
@@ -171,19 +62,21 @@
       "preLaunchTask": "Build Only (debug)",
       "program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit",
       "args": [
-        "${workspaceFolder}/apps/cesium.omniverse.dev.kit"
+        "${workspaceFolder}/apps/cesium.omniverse.dev.python.debug.kit"
       ],
       "env": {
         // Disable LSAN when debugging since it doesn't work with GDB and prints harmless but annoying warning messages
         "ASAN_OPTIONS": "detect_leaks=0",
         "UBSAN_OPTIONS": "print_stacktrace=1"
       },
       "cwd": "${workspaceFolder}",
-      "type": "lldb",
+      "type": "cppdbg",
       "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart",
       "MIMode": "gdb",
+      "symbolLoadInfo": {
+        "loadAll": false,
+        "exceptionList": "libcesium.omniverse.plugin.so;libcesium.omniverse.cpp.tests.plugin.so"
+      },
       "setupCommands": [
         {
           "text": "-enable-pretty-printing",
@@ -202,4 +95,4 @@
       "host": "localhost"
     }
   ]
-}
+}
diff --git a/.vscode/launch.windows.json b/.vscode/launch.windows.json
@@ -10,9 +10,7 @@
       ],
       "cwd": "${workspaceFolder}",
       "type": "cppvsdbg",
-      "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart"
+      "request": "launch"
     },
     {
       "name": "Development App (Kit Debug)",
@@ -23,67 +21,7 @@
       ],
       "cwd": "${workspaceFolder}",
       "type": "cppvsdbg",
-      "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "Performance Tracing",
-      "preLaunchTask": "Build Only (release)",
-      "program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit.exe",
-      "args": [
-        "${workspaceFolder}/apps/cesium.omniverse.dev.trace.kit"
-      ],
-      "cwd": "${workspaceFolder}",
-      "type": "cppvsdbg",
-      "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "Performance Testing App",
-      "preLaunchTask": "Build Only (release)",
-      "program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit.exe",
-      "args": [
-        "${workspaceFolder}/apps/cesium.performance.kit"
-      ],
-      "cwd": "${workspaceFolder}",
-      "type": "cppvsdbg",
-      "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "C++ Unit Tests",
-      "preLaunchTask": "Build Only (debug)",
-      "program": "${workspaceFolder}/build/bin/Debug/tests.exe",
-      "cwd": "${workspaceFolder}",
-      "type": "cppvsdbg",
-      "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "Tests Extension",
-      "preLaunchTask": "Build Only (debug)",
-      "program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit.exe",
-      "args": [
-        "${workspaceFolder}/apps/cesium.omniverse.cpp.tests.runner.kit"
-      ],
-      "cwd": "${workspaceFolder}",
-      "type": "cppvsdbg",
-      "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart",
-      "setupCommands": [
-        {
-          "text": "-enable-pretty-printing",
-          "ignoreFailures": true
-        },
-        {
-          "text": "set print elements 0"
-        }
-      ]
+      "request": "launch"
     },
     {
       "name": "Python Debugging (start)",
@@ -94,9 +32,7 @@
       ],
       "cwd": "${workspaceFolder}",
       "type": "cppvsdbg",
-      "request": "launch",
-      "console": "externalTerminal",
-      "internalConsoleOptions": "openOnSessionStart"
+      "request": "launch"
     },
     {
       "name": "Python Debugging (attach)",
@@ -106,4 +42,4 @@
       "host": "localhost"
     }
   ]
-}
+}
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Change Log
 
+### v0.12.0 - 2023-11-01
+
+* Basis Universal textures are now decoded to the native BCn texture format instead of RGBA8 in Kit 105.1 and above.
+
 ### v0.11.0 - 2023-10-02
 
 * **Breaking change:** Cesium for Omniverse now requires Kit 105.1 or above (USD Composer 2023.2.0 or above).

diff --git a/apps/cesium.omniverse.dev.kit b/apps/cesium.omniverse.dev.kit
@@ -17,6 +17,7 @@ app.window.title = "Cesium for Omniverse Testing App"
 app.useFabricSceneDelegate = true
 app.usdrt.scene_delegate.enableProxyCubes = false
 app.usdrt.scene_delegate.geometryStreaming.enabled = false
+omnihydra.parallelHydraSprimSync = false
 app.fastShutdown = true
 # Both searchPaths settings must be set in order for material graph to find cesium mdl exports
 renderer.mdl.searchPaths.custom = "${app}/../exts/cesium.omniverse/mdl"

diff --git a/apps/cesium.omniverse.dev.python.debug.kit b/apps/cesium.omniverse.dev.python.debug.kit
@@ -10,3 +10,11 @@ app = true
 
 [settings]
 app.window.title = "Cesium For Omniverse Python Debugging App"
+
+[settings.app.exts]
+folders.'++' = [
+    "${app}", # Find other applications in this folder
+    "${app}/exts", # Find extensions in this folder
+    "${app}/../exts", # Find cesium.omniverse and cesium.usd.schemas
+    "${app}/../extern/nvidia/app/extscache" # Find omni.kit.window.material_graph
+]
diff --git a/apps/cesium.omniverse.dev.trace.kit b/apps/cesium.omniverse.dev.trace.kit
@@ -9,3 +9,11 @@ app = true
 [settings]
 app.window.title = "Cesium For Omniverse Performance Tracing App"
 app.fastShutdown = false
+
+[settings.app.exts]
+folders.'++' = [
+    "${app}", # Find other applications in this folder
+    "${app}/exts", # Find extensions in this folder
+    "${app}/../exts", # Find cesium.omniverse and cesium.usd.schemas
+    "${app}/../extern/nvidia/app/extscache" # Find omni.kit.window.material_graph
+]
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -120,7 +120,12 @@ set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_LIBRARIES})
 # Add TBB
 set(NVIDIA_USD_TARGET_NAMES ${NVIDIA_USD_TARGET_NAMES} tbb)
 set(NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} tbb)
-set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} tbb_debug)
+
+if(WIN32)
+    set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} tbb_debug)
+else()
+    set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} tbb)
+endif()
 
 # Add boost python
 set(NVIDIA_USD_TARGET_NAMES ${NVIDIA_USD_TARGET_NAMES} boost_python310)

diff --git a/exts/cesium.omniverse/cesium/omniverse/ui/fabric_modal.py b/exts/cesium.omniverse/cesium/omniverse/ui/fabric_modal.py
@@ -19,6 +19,7 @@ def _on_yes_click(self):
         carb.settings.get_settings().set_bool("/app/useFabricSceneDelegate", True)
         carb.settings.get_settings().set_bool("/app/usdrt/scene_delegate/enableProxyCubes", False)
         carb.settings.get_settings().set_bool("/app/usdrt/scene_delegate/geometryStreaming/enabled", False)
+        carb.settings.get_settings().set_bool("/omnihydra/parallelHydraSprimSync", False)
         omni.kit.window.file.new()
         self.visible = False
 

diff --git a/src/core/src/Context.cpp b/src/core/src/Context.cpp
@@ -245,6 +245,7 @@ void Context::processCesiumDataChanged(const ChangedPrim& changedPrim) {
         name == pxr::CesiumTokens->cesiumDebugDisableTextures ||
         name == pxr::CesiumTokens->cesiumDebugDisableGeometryPool ||
         name == pxr::CesiumTokens->cesiumDebugDisableMaterialPool ||
+        name == pxr::CesiumTokens->cesiumDebugDisableTexturePool ||
         name == pxr::CesiumTokens->cesiumDebugGeometryPoolInitialCapacity ||
         name == pxr::CesiumTokens->cesiumDebugMaterialPoolInitialCapacity ||
         name == pxr::CesiumTokens->cesiumDebugTexturePoolInitialCapacity ||