Combine cesium.usd.plugins into the main extension

.gitignore

@@ -46,19 +46,18 @@ trace.csv
 # Installed python bindings
 exts/cesium.omniverse/cesium/omniverse/bindings/CesiumOmniversePythonBindings.cpython-310-x86_64-linux-gnu.so
 exts/cesium.omniverse/cesium/omniverse/bindings/CesiumOmniversePythonBindings.cp310-win_amd64.pyd
-exts/cesium.usd.plugins/cesium/usd/plugins/CesiumUsdSchemas/_CesiumUsdSchemas.so
-exts/cesium.usd.plugins/cesium/usd/plugins/CesiumUsdSchemas/_CesiumUsdSchemas.pyd
-exts/cesium.usd.plugins/cesium/usd/plugins/CesiumUsdSchemas/_CesiumUsdSchemas.lib
+exts/cesium.omniverse/cesium/omniverse/usd/plugins/CesiumUsdSchemas/_CesiumUsdSchemas.so
+exts/cesium.omniverse/cesium/omniverse/usd/plugins/CesiumUsdSchemas/_CesiumUsdSchemas.pyd
+exts/cesium.omniverse/cesium/omniverse/usd/plugins/CesiumUsdSchemas/_CesiumUsdSchemas.lib
 exts/cesium.omniverse.cpp.tests/cesium/omniverse/cpp/tests/bindings/CesiumOmniverseCppTestsPythonBindings.cpython-310-x86_64-linux-gnu.so
 exts/cesium.omniverse.cpp.tests/cesium/omniverse/cpp/tests/bindings/CesiumOmniverseCppTestsPythonBindings.cp310-win_amd64.pyd
 
 # Installed libraries
 exts/cesium.omniverse/bin/
-exts/cesium.usd.plugins/bin/
 exts/cesium.omniverse.cpp.tests/bin/
 
 # Installed plugins
-exts/cesium.usd.plugins/plugins/
+exts/cesium.omniverse/plugins/
 
 # Extension Docs
 exts/cesium.omniverse/doc/CHANGES.md

.vscode/cesium-omniverse-linux.code-workspace

@@ -30,7 +30,6 @@
     // Python modules search paths:
     "python.analysis.extraPaths": [
       "${workspaceFolder}/exts/cesium.omniverse",
-      "${workspaceFolder}/exts/cesium.usd.plugins",
       "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kernel/py",
       "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/exts/carb.audio",
       "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/exts/carb.hsscclient",

.vscode/cesium-omniverse-windows.code-workspace

@@ -30,7 +30,6 @@
     // Python modules search paths:
     "python.analysis.extraPaths": [
       "${workspaceFolder}/exts/cesium.omniverse",
-      "${workspaceFolder}/exts/cesium.usd.plugins",
       "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kernel/py",
       "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/exts/carb.audio",
       "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/exts/carb.hsscclient",

CHANGES.md

@@ -2,6 +2,7 @@
 
 ### v0.18.0 - 2024-03-01
 
+* **Breaking change:** `cesium.usd.plugins` has been removed and merged into the main `cesium.omniverse` extension. Python bindings for the Cesium USD Schemas are now available in the `cesium.omniverse.usd.plugins` module.
 * **Breaking change:** removed deprecated properties `projectDefaultIonAccessToken` and `projectDefaultIonAccessToken` from `CesiumDataPrim`. `CesiumIonServerPrim` should be used instead.
 * Added support for globe anchors on non-georeferenced tilesets.
 * Fixed zooming to tileset extents when tileset prims have non identity transformation.

CMakeLists.txt

@@ -509,10 +509,10 @@ configure_file("${PROJECT_SOURCE_DIR}/src/plugins/CesiumUsdSchemas/generatedSche
 
 set(KIT_EXTENSION_BIN_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.omniverse/bin")
 set(KIT_EXTENSION_CERTS_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.omniverse/certs/cacert.pem")
-set(KIT_PLUGIN_EXTENSION_BIN_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.usd.plugins/bin")
+set(KIT_PLUGIN_EXTENSION_BIN_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.omniverse/bin")
 set(KIT_EXTENSION_BINDINGS_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.omniverse/cesium/omniverse/bindings")
-set(KIT_PLUGIN_EXTENSION_BINDINGS_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.usd.plugins/cesium/usd/plugins")
-set(KIT_EXTENSION_PLUGINS_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.usd.plugins/plugins")
+set(KIT_PLUGIN_EXTENSION_BINDINGS_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.omniverse/cesium/omniverse/usd/plugins")
+set(KIT_EXTENSION_PLUGINS_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.omniverse/plugins")
 
 set(KIT_EXTENSION_TESTS_BIN_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.omniverse.cpp.tests/bin")
 set(KIT_EXTENSION_TESTS_BINDINGS_PATH
@@ -744,13 +744,6 @@ install(
     EXCLUDE_FROM_ALL
     PATTERN "__pycache__" EXCLUDE)
 
-install(
-    DIRECTORY "${PROJECT_SOURCE_DIR}/exts/cesium.usd.plugins"
-    DESTINATION .
-    COMPONENT package
-    EXCLUDE_FROM_ALL
-    PATTERN "__pycache__" EXCLUDE)
-
 set(CPACK_GENERATOR "ZIP")
 set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 set(CPACK_COMPONENTS_ALL package)

apps/cesium.omniverse.cpp.tests.runner.kit

@@ -15,6 +15,6 @@ app.useFabricSceneDelegate = true
 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}/../exts", # Find cesium.omniverse
     "${app}/../extern/nvidia/app/extscache" # Find omni.kit.window.material_graph
 ]

apps/cesium.omniverse.dev.kit

@@ -25,6 +25,6 @@ app.fastShutdown = true
 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}/../exts", # Find cesium.omniverse
     "${app}/../extern/nvidia/app/extscache" # Find omni.kit.window.material_graph
 ]

apps/cesium.omniverse.dev.python.debug.kit

@@ -15,6 +15,6 @@ app.window.title = "Cesium For Omniverse Python Debugging App"
 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}/../exts", # Find cesium.omniverse
     "${app}/../extern/nvidia/app/extscache" # Find omni.kit.window.material_graph
 ]

apps/cesium.omniverse.dev.trace.kit

@@ -14,6 +14,6 @@ app.fastShutdown = false
 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}/../exts", # Find cesium.omniverse
     "${app}/../extern/nvidia/app/extscache" # Find omni.kit.window.material_graph
 ]

apps/cesium.performance.kit

@@ -14,6 +14,6 @@ app.window.title = "Cesium For Omniverse Performance Testing App"
 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}/../exts", # Find cesium.omniverse
     "${app}/../extern/nvidia/app/extscache" # Find omni.kit.window.material_graph
 ]

apps/exts/cesium.performance.app/cesium/performance/app/extension.py

@@ -15,7 +15,7 @@
 from .fps_sampler import FpsSampler
 from cesium.omniverse.bindings import acquire_cesium_omniverse_interface, release_cesium_omniverse_interface
 from cesium.omniverse.utils import wait_n_frames, dock_window_async
-from cesium.usd.plugins.CesiumUsdSchemas import (
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import (
     Data as CesiumData,
     Georeference as CesiumGeoreference,
     IonRasterOverlay as CesiumIonRasterOverlay,

docs/release-guide/README.md

@@ -9,20 +9,17 @@ This is the process we follow when releasing a new version of Cesium for Omniver
 5. Verify that the Windows package loads in USD Composer (see instructions below).
 6. Update the project `VERSION` in [CMakeLists.txt](../../CMakeLists.txt).
 7. Update the extension `version` in [cesium.omniverse/config/extension.toml](../../exts/cesium.omniverse/config/extension.toml). This should be the same version as above.
-8. If any changes have been made to the Cesium USD schemas since last release:
-    * Update the extension `version` in [cesium.usd.plugins/config/extension.toml](../../exts/cesium.usd.plugins/config/extension.toml)
-    * Update the `cesium.usd.plugins` dependency version in [cesium.omniverse/config/extension.toml](../../exts/cesium.omniverse/config/extension.toml)
-9. Update [`CHANGES.md`](../../CHANGES.md).
-10. Update `ION_ACCESS_TOKEN` in [`extension.py`](../../apps/exts/cesium.performance.app/cesium/performance/app/extension.py) within `cesium.performance.app` using the newly generated keys.
-11. Create a branch, e.g. `git checkout -b release-0.0.0`.
-12. Commit the changes, e.g. `git commit -am "0.0.0 release"`.
-13. Push the commit, e.g. `git push origin release-0.0.0`.
-14. Open a PR and merge the branch with "Rebase and merge".
-15. Tag the release, e.g. `git tag -a v0.0.0 -m "0.0.0 release"`.
-16. Push the tag, e.g. `git push origin v0.0.0`.
-17. Wait for CI to pass.
-18. Download the latest build from S3. In the AWS management console (InternalServices AWS account), go to the bucket [`cesium-builds/cesium-omniverse`](https://s3.console.aws.amazon.com/s3/buckets/cesium-builds?prefix=cesium-omniverse/&region=us-east-1), find the folder with the new tag and download the AlmaLinux and Windows zip files (e.g. `CesiumGS-cesium-omniverse-linux-x86_64-v0.0.0.zip` and `CesiumGS-cesium-omniverse-windows-x86_64-v0.0.0.zip` )
-19. Create a new release on GitHub: https://github.com/CesiumGS/cesium-omniverse/releases/new.
+8. Update [`CHANGES.md`](../../CHANGES.md).
+9.  Update `ION_ACCESS_TOKEN` in [`extension.py`](../../apps/exts/cesium.performance.app/cesium/performance/app/extension.py) within `cesium.performance.app` using the newly generated keys.
+10. Create a branch, e.g. `git checkout -b release-0.0.0`.
+11. Commit the changes, e.g. `git commit -am "0.0.0 release"`.
+12. Push the commit, e.g. `git push origin release-0.0.0`.
+13. Open a PR and merge the branch with "Rebase and merge".
+14. Tag the release, e.g. `git tag -a v0.0.0 -m "0.0.0 release"`.
+15. Push the tag, e.g. `git push origin v0.0.0`.
+16. Wait for CI to pass.
+17. Download the latest build from S3. In the AWS management console (InternalServices AWS account), go to the bucket [`cesium-builds/cesium-omniverse`](https://s3.console.aws.amazon.com/s3/buckets/cesium-builds?prefix=cesium-omniverse/&region=us-east-1), find the folder with the new tag and download the AlmaLinux and Windows zip files (e.g. `CesiumGS-cesium-omniverse-linux-x86_64-v0.0.0.zip` and `CesiumGS-cesium-omniverse-windows-x86_64-v0.0.0.zip` )
+18. Create a new release on GitHub: https://github.com/CesiumGS/cesium-omniverse/releases/new.
     * Chose the new tag.
     * Copy the changelog into the description. Follow the format used in previous releases.
     * Upload the Linux and Windows release zip files.

exts/cesium.omniverse.cpp.tests/config/extension.toml

@@ -29,7 +29,6 @@ kit = ["105.*"]
 
 # Which extensions this extension depends on
 [dependencies]
-"cesium.usd.plugins" = {}
 "usdrt.scenegraph" = {}
 
 # Main python module this extension provides, it will be publicly available as "import cesium.omniverse"

exts/cesium.omniverse/cesium/omniverse/extension.py

@@ -31,7 +31,7 @@
 import os
 from typing import List, Optional, Callable
 from .ui.credits_viewport_controller import CreditsViewportController
-from cesium.usd.plugins.CesiumUsdSchemas import Data as CesiumData, IonServer as CesiumIonServer
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import Data as CesiumData, IonServer as CesiumIonServer
 from omni.kit.capture.viewport import CaptureExtension
 
 CESIUM_DATA_PRIM_PATH = "/Cesium"

exts/cesium.omniverse/cesium/omniverse/tests/extension_test.py

@@ -3,7 +3,7 @@
 import omni.usd
 import pxr.Usd
 
-import cesium.usd
+import cesium.omniverse
 from typing import Optional
 
 
@@ -44,9 +44,11 @@ async def test_blank_tileset(self):
         stage: pxr.Usd.Stage = omni.usd.get_context().get_stage()
         self.assertIsNotNone(stage)
 
-        self.assertFalse(any([i.IsA(cesium.usd.plugins.CesiumUsdSchemas.Tileset) for i in stage.Traverse()]))
+        self.assertFalse(
+            any([i.IsA(cesium.omniverse.usd.plugins.CesiumUsdSchemas.Tileset) for i in stage.Traverse()])
+        )
 
         await blankTilesetButton.click()
 
         await ui_test.wait_n_updates(2)  # passes without, but seems prudent
-        self.assertTrue(any([i.IsA(cesium.usd.plugins.CesiumUsdSchemas.Tileset) for i in stage.Traverse()]))
+        self.assertTrue(any([i.IsA(cesium.omniverse.usd.plugins.CesiumUsdSchemas.Tileset) for i in stage.Traverse()]))

exts/cesium.omniverse/cesium/omniverse/ui/add_menu_controller.py

@@ -5,7 +5,7 @@
 from omni.kit.window.property import get_window as get_property_window
 import omni.usd
 from pxr import Sdf, Tf, UsdGeom
-from cesium.usd.plugins.CesiumUsdSchemas import (
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import (
     Tileset as CesiumTileset,
     PolygonRasterOverlay as CesiumPolygonRasterOverlay,
     IonRasterOverlay as CesiumIonRasterOverlay,

exts/cesium.omniverse/cesium/omniverse/ui/attributes/data_attributes_widget.py

@@ -1,7 +1,7 @@
 import logging
 from omni.kit.property.usd.custom_layout_helper import CustomLayoutFrame, CustomLayoutGroup, CustomLayoutProperty
 from omni.kit.property.usd.usd_property_widget import SchemaPropertiesWidget
-from cesium.usd.plugins.CesiumUsdSchemas import Data as CesiumData
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import Data as CesiumData
 
 
 class CesiumDataSchemaAttributesWidget(SchemaPropertiesWidget):

exts/cesium.omniverse/cesium/omniverse/ui/attributes/georeference_attributes_widget.py

@@ -1,7 +1,7 @@
 import logging
 from omni.kit.property.usd.custom_layout_helper import CustomLayoutFrame, CustomLayoutGroup, CustomLayoutProperty
 from omni.kit.property.usd.usd_property_widget import SchemaPropertiesWidget
-from cesium.usd.plugins.CesiumUsdSchemas import Georeference as CesiumGeoreference
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import Georeference as CesiumGeoreference
 
 
 class CesiumGeoreferenceSchemaAttributesWidget(SchemaPropertiesWidget):

exts/cesium.omniverse/cesium/omniverse/ui/attributes/globe_anchor_attributes_widget.py

@@ -2,7 +2,7 @@
 from omni.kit.property.usd.custom_layout_helper import CustomLayoutFrame, CustomLayoutGroup, CustomLayoutProperty
 from omni.kit.property.usd.usd_property_widget import SchemaPropertiesWidget
 from ...bindings import ICesiumOmniverseInterface
-from cesium.usd.plugins.CesiumUsdSchemas import (
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import (
     GlobeAnchorAPI as CesiumGlobeAnchorAPI,
     Georeference as CesiumGeoreference,
 )

exts/cesium.omniverse/cesium/omniverse/ui/attributes/ion_raster_overlay_attributes_widget.py

@@ -1,7 +1,7 @@
 import logging
 from omni.kit.property.usd.custom_layout_helper import CustomLayoutFrame, CustomLayoutGroup, CustomLayoutProperty
 from omni.kit.property.usd.usd_property_widget import SchemaPropertiesWidget
-from cesium.usd.plugins.CesiumUsdSchemas import (
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import (
     IonRasterOverlay as CesiumIonRasterOverlay,
     IonServer as CesiumIonServer,
 )

exts/cesium.omniverse/cesium/omniverse/ui/attributes/ion_server_attributes_widget.py

@@ -2,7 +2,7 @@
 from omni.kit.property.usd.custom_layout_helper import CustomLayoutFrame, CustomLayoutGroup, CustomLayoutProperty
 from omni.kit.property.usd.usd_property_widget import SchemaPropertiesWidget
 from ...bindings import ICesiumOmniverseInterface
-from cesium.usd.plugins.CesiumUsdSchemas import IonServer as CesiumIonServer
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import IonServer as CesiumIonServer
 
 
 class CesiumIonServerAttributesWidget(SchemaPropertiesWidget):

exts/cesium.omniverse/cesium/omniverse/ui/attributes/polygon_raster_overlay_attributes_widget.py

@@ -1,7 +1,7 @@
 import logging
 from omni.kit.property.usd.custom_layout_helper import CustomLayoutFrame, CustomLayoutGroup, CustomLayoutProperty
 from omni.kit.property.usd.usd_property_widget import SchemaPropertiesWidget
-from cesium.usd.plugins.CesiumUsdSchemas import (
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import (
     PolygonRasterOverlay as CesiumPolygonRasterOverlay,
 )
 from pxr import UsdGeom

exts/cesium.omniverse/cesium/omniverse/ui/attributes/tileset_attributes_widget.py

@@ -3,7 +3,7 @@
 from omni.kit.property.usd.usd_property_widget import SchemaPropertiesWidget
 import omni.ui as ui
 from ...bindings import ICesiumOmniverseInterface
-from cesium.usd.plugins.CesiumUsdSchemas import (
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import (
     Tileset as CesiumTileset,
     IonServer as CesiumIonServer,
     Georeference as CesiumGeoreference,

exts/cesium.omniverse/cesium/omniverse/ui/attributes/web_map_service_raster_overlay_attributes_widget.py

@@ -1,7 +1,7 @@
 import logging
 from omni.kit.property.usd.custom_layout_helper import CustomLayoutFrame, CustomLayoutGroup, CustomLayoutProperty
 from omni.kit.property.usd.usd_property_widget import SchemaPropertiesWidget
-from cesium.usd.plugins.CesiumUsdSchemas import (
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import (
     WebMapServiceRasterOverlay as CesiumWebMapServiceRasterOverlay,
 )
 from .custom_attribute_widgets import build_slider

exts/cesium.omniverse/cesium/omniverse/ui/profile_widget.py

@@ -6,7 +6,7 @@
 from typing import List, Optional
 from ..bindings import ICesiumOmniverseInterface, CesiumIonSession
 from enum import Enum
-from cesium.usd.plugins.CesiumUsdSchemas import IonServer as CesiumIonServer
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import IonServer as CesiumIonServer
 from ..usdUtils import set_path_to_current_ion_server
 
 

exts/cesium.omniverse/cesium/omniverse/ui/quick_add_widget.py

@@ -7,7 +7,7 @@
 from ..bindings import ICesiumOmniverseInterface
 from ..models import AssetToAdd
 from .styles import CesiumOmniverseUiStyles
-from cesium.usd.plugins.CesiumUsdSchemas import IonServer as CesiumIonServer
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import IonServer as CesiumIonServer
 
 LABEL_HEIGHT = 24
 BUTTON_HEIGHT = 40

exts/cesium.omniverse/cesium/omniverse/ui/token_window.py

@@ -8,7 +8,7 @@
 from typing import List, Optional
 from ..bindings import ICesiumOmniverseInterface, Token
 from .styles import CesiumOmniverseUiStyles
-from cesium.usd.plugins.CesiumUsdSchemas import Data as CesiumData
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import Data as CesiumData
 
 SELECT_TOKEN_TEXT = (
     "Cesium for Omniverse embeds a Cesium ion token in your stage in order to allow it "

exts/cesium.usd.plugins/cesium/usd/plugins/__init__.py → exts/cesium.omniverse/cesium/omniverse/usd/plugins/__init__.py

@@ -1,7 +1,7 @@
 import os  # noqa: F401
 from pxr import Plug
 
-pluginsRoot = os.path.join(os.path.dirname(__file__), "../../../plugins")
+pluginsRoot = os.path.join(os.path.dirname(__file__), "../../../../plugins")
 cesiumUsdSchemasPath = pluginsRoot + "/CesiumUsdSchemas/resources"
 
 Plug.Registry().RegisterPlugins(cesiumUsdSchemasPath)

exts/cesium.omniverse/cesium/omniverse/usdUtils/usdUtils.py

@@ -4,7 +4,7 @@
 from typing import List, Optional
 from pxr import UsdGeom
 
-from cesium.usd.plugins.CesiumUsdSchemas import (
+from cesium.omniverse.usd.plugins.CesiumUsdSchemas import (
     Data as CesiumData,
     Tileset as CesiumTileset,
     IonRasterOverlay as CesiumIonRasterOverlay,

exts/cesium.omniverse/config/extension.toml

@@ -1,3 +1,8 @@
+[core]
+# Load after omni.usd.libs (-1000)
+# See https://docs.omniverse.nvidia.com/py/kit/docs/guide/usd_schema.html
+order = -100
+
 [package]
 version = "0.17.0"
 category = "simulation"
@@ -17,6 +22,7 @@ keywords = [
     "earth",
     "simulation",
 ]
+toggleable = false
 
 # Paths are relative to the extension folder
 changelog = "doc/CHANGES.md"
@@ -33,7 +39,6 @@ python = false
 
 # Which extensions this extension depends on
 [dependencies]
-"cesium.usd.plugins" = { version = "0.3.0" }
 "usdrt.scenegraph" = {}
 "omni.ui" = {}
 "omni.usd" = {}
@@ -57,6 +62,9 @@ archiveDirs = ["vendor"]
 [[native.plugin]]
 path = "bin/cesium.omniverse.plugin"
 
+[[native.library]]
+path = "bin/${lib_prefix}CesiumUsdSchemas${lib_ext}"
+
 [settings]
 exts."cesium.omniverse".defaultAccessToken = ""
 persistent.exts."cesium.omniverse".userAccessToken = ""