Option to disable georeferencing

CHANGES.md

@@ -2,6 +2,7 @@
 
 ### v0.11.0 - 2023-10-02
 
+* Added debug option `cesium:debug:disableGeoreferencing` to `CesiumDataPrim` to disable georeferencing and view tilesets in ECEF coordinates.
 * Reduced the number of materials created when loading untextured tilesets.
 
 ### v0.10.0 - 2023-09-01

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

@@ -29,5 +29,6 @@ def _customize_props_layout(self, props):
                 CustomLayoutProperty("cesium:debug:materialPoolInitialCapacity")
                 CustomLayoutProperty("cesium:debug:texturePoolInitialCapacity")
                 CustomLayoutProperty("cesium:debug:randomColors")
+                CustomLayoutProperty("cesium:debug:disableGeoreferencing")
 
         return frame.apply(props)

exts/cesium.usd.plugins/cesium/usd/plugins/CesiumUsdSchemas/__init__.pyi

@@ -13,6 +13,8 @@ class Data(pxr.Usd.Typed):
     @classmethod
     def CreateDebugDisableGeometryPoolAttr(cls, *args, **kwargs) -> Any: ...
     @classmethod
+    def CreateDebugDisableGeoreferencingAttr(cls, *args, **kwargs) -> Any: ...
+    @classmethod
     def CreateDebugDisableMaterialPoolAttr(cls, *args, **kwargs) -> Any: ...
     @classmethod
     def CreateDebugDisableMaterialsAttr(cls, *args, **kwargs) -> Any: ...
@@ -39,6 +41,8 @@ class Data(pxr.Usd.Typed):
     @classmethod
     def GetDebugDisableGeometryPoolAttr(cls, *args, **kwargs) -> Any: ...
     @classmethod
+    def GetDebugDisableGeoreferencingAttr(cls, *args, **kwargs) -> Any: ...
+    @classmethod
     def GetDebugDisableMaterialPoolAttr(cls, *args, **kwargs) -> Any: ...
     @classmethod
     def GetDebugDisableMaterialsAttr(cls, *args, **kwargs) -> Any: ...
@@ -253,6 +257,8 @@ class Tokens(Boost.Python.instance):
     @property
     def cesiumDebugDisableGeometryPool(self) -> Any: ...
     @property
+    def cesiumDebugDisableGeoreferencing(self) -> Any: ...
+    @property
     def cesiumDebugDisableMaterialPool(self) -> Any: ...
     @property
     def cesiumDebugDisableMaterials(self) -> Any: ...

exts/cesium.usd.plugins/schemas/cesium_schemas.usda

@@ -113,6 +113,14 @@ class CesiumDataPrim "CesiumDataPrim" (
         displayName = "Random Colors"
         doc = "Debug option that renders tiles with random colors."
     )
+
+    bool cesium:debug:disableGeoreferencing = false (
+        customData = {
+            string apiName = "debugDisableGeoreferencing"
+        }
+        displayName = "Disable Georeferencing"
+        doc = "Debug option to disable georeferencing. Tiles will be rendered in EPSG:4978 (ECEF) coordinates where (0, 0, 0) is the center of the globe, the X axis points towards the prime meridian, the Y axis points towards the 90th meridian east, and the Z axis points towards the North Pole."
+    )
 }
 
 class CesiumSessionPrim "CesiumSessionPrim" (

src/core/include/cesium/omniverse/UsdUtil.h

@@ -79,6 +79,7 @@ pxr::SdfPath getRootPath();
 pxr::SdfPath getPathUnique(const pxr::SdfPath& parentPath, const std::string& name);
 std::string getSafeName(const std::string& name);
 pxr::TfToken getDynamicTextureProviderAssetPathToken(const std::string& name);
+glm::dmat4 computeEcefToUsdTransform(const CesiumGeospatial::Cartographic& origin);
 glm::dmat4 computeEcefToUsdTransformForPrim(const CesiumGeospatial::Cartographic& origin, const pxr::SdfPath& primPath);
 glm::dmat4 computeUsdToEcefTransformForPrim(const CesiumGeospatial::Cartographic& origin, const pxr::SdfPath& primPath);
 Cesium3DTilesSelection::ViewState

src/core/src/Context.cpp

@@ -187,9 +187,7 @@ void Context::onUpdateFrame(const std::vector<Viewport>& viewports) {
     processUsdNotifications();
 
     const auto georeferenceOrigin = Context::instance().getGeoreferenceOrigin();
-    const auto ecefToUsdTransform =
-        GeospatialUtil::getCoordinateSystem(georeferenceOrigin, UsdUtil::getUsdMetersPerUnit())
-            .getEcefToLocalTransformation();
+    const auto ecefToUsdTransform = UsdUtil::computeEcefToUsdTransform(georeferenceOrigin);
 
     // Check if the ecefToUsd transform has changed and update CesiumSession
     if (ecefToUsdTransform != _ecefToUsdTransform) {

src/core/src/UsdUtil.cpp

@@ -201,10 +201,22 @@ pxr::TfToken getDynamicTextureProviderAssetPathToken(const std::string& name) {
         pxr::SdfAssetPath(fmt::format("{}{}", rtx::resourcemanager::kDynamicTexturePrefix, name)).GetAssetPath());
 }
 
+glm::dmat4 computeEcefToUsdTransform(const CesiumGeospatial::Cartographic& origin) {
+    const auto cesiumDataUsd = UsdUtil::getOrCreateCesiumData();
+    bool disableGeoreferencing;
+    cesiumDataUsd.GetDebugDisableGeoreferencingAttr().Get(&disableGeoreferencing);
+
+    if (disableGeoreferencing) {
+        const auto scale = 1.0 / getUsdMetersPerUnit();
+        return glm::scale(glm::dmat4(1.0), glm::dvec3(scale));
+    }
+
+    return GeospatialUtil::getCoordinateSystem(origin, getUsdMetersPerUnit()).getEcefToLocalTransformation();
+}
+
 glm::dmat4
 computeEcefToUsdTransformForPrim(const CesiumGeospatial::Cartographic& origin, const pxr::SdfPath& primPath) {
-    const auto ecefToUsdTransform =
-        GeospatialUtil::getCoordinateSystem(origin, getUsdMetersPerUnit()).getEcefToLocalTransformation();
+    const auto ecefToUsdTransform = computeEcefToUsdTransform(origin);
     const auto primInverseUsdWorldTransform = computeUsdWorldTransform(primPath);
     const auto primEcefToUsdTransform = primInverseUsdWorldTransform * ecefToUsdTransform;
     return primEcefToUsdTransform;

src/plugins/CesiumUsdSchemas/generatedSchema.usda.in

@@ -11,6 +11,10 @@ class CesiumDataPrim "CesiumDataPrim" (
         displayName = "Disable Geometry Pool"
         doc = "Debug option that disables geometry pooling."
     )
+    bool cesium:debug:disableGeoreferencing = 0 (
+        displayName = "Disable Georeferencing"
+        doc = "Debug option to disable georeferencing. Tiles will be rendered in EPSG:4978 (ECEF) coordinates where (0, 0, 0) is the center of the globe, the X axis points towards the prime meridian, the Y axis points towards the 90th meridian east, and the Z axis points towards the North Pole."
+    )
     bool cesium:debug:disableMaterialPool = 0 (
         displayName = "Disable Material Pool"
         doc = "Debug option that disables material pooling."

src/plugins/CesiumUsdSchemas/src/CesiumUsdSchemas/data.cpp

@@ -267,6 +267,23 @@ CesiumData::CreateDebugRandomColorsAttr(VtValue const &defaultValue, bool writeS
                        writeSparsely);
 }
 
+UsdAttribute
+CesiumData::GetDebugDisableGeoreferencingAttr() const
+{
+    return GetPrim().GetAttribute(CesiumTokens->cesiumDebugDisableGeoreferencing);
+}
+
+UsdAttribute
+CesiumData::CreateDebugDisableGeoreferencingAttr(VtValue const &defaultValue, bool writeSparsely) const
+{
+    return UsdSchemaBase::_CreateAttr(CesiumTokens->cesiumDebugDisableGeoreferencing,
+                       SdfValueTypeNames->Bool,
+                       /* custom = */ false,
+                       SdfVariabilityVarying,
+                       defaultValue,
+                       writeSparsely);
+}
+
 namespace {
 static inline TfTokenVector
 _ConcatenateAttributeNames(const TfTokenVector& left,const TfTokenVector& right)
@@ -295,6 +312,7 @@ CesiumData::GetSchemaAttributeNames(bool includeInherited)
         CesiumTokens->cesiumDebugMaterialPoolInitialCapacity,
         CesiumTokens->cesiumDebugTexturePoolInitialCapacity,
         CesiumTokens->cesiumDebugRandomColors,
+        CesiumTokens->cesiumDebugDisableGeoreferencing,
     };
     static TfTokenVector allNames =
         _ConcatenateAttributeNames(

src/plugins/CesiumUsdSchemas/src/CesiumUsdSchemas/data.h

@@ -367,6 +367,28 @@ class CesiumData : public UsdTyped
     CESIUMUSDSCHEMAS_API
     UsdAttribute CreateDebugRandomColorsAttr(VtValue const &defaultValue = VtValue(), bool writeSparsely=false) const;
 
+public:
+    // --------------------------------------------------------------------- //
+    // DEBUGDISABLEGEOREFERENCING 
+    // --------------------------------------------------------------------- //
+    /// Debug option to disable georeferencing. Tiles will be rendered in EPSG:4978 (ECEF) coordinates where (0, 0, 0) is the center of the globe, the X axis points towards the prime meridian, the Y axis points towards the 90th meridian east, and the Z axis points towards the North Pole.
+    ///
+    /// | ||
+    /// | -- | -- |
+    /// | Declaration | `bool cesium:debug:disableGeoreferencing = 0` |
+    /// | C++ Type | bool |
+    /// | \ref Usd_Datatypes "Usd Type" | SdfValueTypeNames->Bool |
+    CESIUMUSDSCHEMAS_API
+    UsdAttribute GetDebugDisableGeoreferencingAttr() const;
+
+    /// See GetDebugDisableGeoreferencingAttr(), and also 
+    /// \ref Usd_Create_Or_Get_Property for when to use Get vs Create.
+    /// If specified, author \p defaultValue as the attribute's default,
+    /// sparsely (when it makes sense to do so) if \p writeSparsely is \c true -
+    /// the default for \p writeSparsely is \c false.
+    CESIUMUSDSCHEMAS_API
+    UsdAttribute CreateDebugDisableGeoreferencingAttr(VtValue const &defaultValue = VtValue(), bool writeSparsely=false) const;
+
 public:
     // ===================================================================== //
     // Feel free to add custom code below this line, it will be preserved by 

src/plugins/CesiumUsdSchemas/src/CesiumUsdSchemas/tokens.cpp

@@ -5,6 +5,7 @@ PXR_NAMESPACE_OPEN_SCOPE
 CesiumTokensType::CesiumTokensType() :
     cesiumCulledScreenSpaceError("cesium:culledScreenSpaceError", TfToken::Immortal),
     cesiumDebugDisableGeometryPool("cesium:debug:disableGeometryPool", TfToken::Immortal),
+    cesiumDebugDisableGeoreferencing("cesium:debug:disableGeoreferencing", TfToken::Immortal),
     cesiumDebugDisableMaterialPool("cesium:debug:disableMaterialPool", TfToken::Immortal),
     cesiumDebugDisableMaterials("cesium:debug:disableMaterials", TfToken::Immortal),
     cesiumDebugDisableTexturePool("cesium:debug:disableTexturePool", TfToken::Immortal),
@@ -43,6 +44,7 @@ CesiumTokensType::CesiumTokensType() :
     allTokens({
         cesiumCulledScreenSpaceError,
         cesiumDebugDisableGeometryPool,
+        cesiumDebugDisableGeoreferencing,
         cesiumDebugDisableMaterialPool,
         cesiumDebugDisableMaterials,
         cesiumDebugDisableTexturePool,

src/plugins/CesiumUsdSchemas/src/CesiumUsdSchemas/tokens.h

@@ -47,6 +47,10 @@ struct CesiumTokensType {
     /// 
     /// CesiumData
     const TfToken cesiumDebugDisableGeometryPool;
+    /// \brief "cesium:debug:disableGeoreferencing"
+    /// 
+    /// CesiumData
+    const TfToken cesiumDebugDisableGeoreferencing;
     /// \brief "cesium:debug:disableMaterialPool"
     /// 
     /// CesiumData

src/plugins/CesiumUsdSchemas/src/CesiumUsdSchemas/wrapData.cpp

@@ -102,6 +102,13 @@ _CreateDebugRandomColorsAttr(CesiumData &self,
     return self.CreateDebugRandomColorsAttr(
         UsdPythonToSdfType(defaultVal, SdfValueTypeNames->Bool), writeSparsely);
 }
+
+static UsdAttribute
+_CreateDebugDisableGeoreferencingAttr(CesiumData &self,
+                                      object defaultVal, bool writeSparsely) {
+    return self.CreateDebugDisableGeoreferencingAttr(
+        UsdPythonToSdfType(defaultVal, SdfValueTypeNames->Bool), writeSparsely);
+}
 
 static std::string
 _Repr(const CesiumData &self)
@@ -221,6 +228,13 @@ void wrapCesiumData()
              &_CreateDebugRandomColorsAttr,
              (arg("defaultValue")=object(),
               arg("writeSparsely")=false))
+
+        .def("GetDebugDisableGeoreferencingAttr",
+             &This::GetDebugDisableGeoreferencingAttr)
+        .def("CreateDebugDisableGeoreferencingAttr",
+             &_CreateDebugDisableGeoreferencingAttr,
+             (arg("defaultValue")=object(),
+              arg("writeSparsely")=false))
 
         .def("__repr__", ::_Repr)
     ;

src/plugins/CesiumUsdSchemas/src/CesiumUsdSchemas/wrapTokens.cpp

@@ -43,6 +43,7 @@ void wrapCesiumTokens()
         cls("Tokens", boost::python::no_init);
     _AddToken(cls, "cesiumCulledScreenSpaceError", CesiumTokens->cesiumCulledScreenSpaceError);
     _AddToken(cls, "cesiumDebugDisableGeometryPool", CesiumTokens->cesiumDebugDisableGeometryPool);
+    _AddToken(cls, "cesiumDebugDisableGeoreferencing", CesiumTokens->cesiumDebugDisableGeoreferencing);
     _AddToken(cls, "cesiumDebugDisableMaterialPool", CesiumTokens->cesiumDebugDisableMaterialPool);
     _AddToken(cls, "cesiumDebugDisableMaterials", CesiumTokens->cesiumDebugDisableMaterials);
     _AddToken(cls, "cesiumDebugDisableTexturePool", CesiumTokens->cesiumDebugDisableTexturePool);