Fix crash when setting globe anchor attributes when georefencing is d…

…isabled
CesiumGS · May 7, 2024 · 04fe545 · 04fe545
1 parent 988d827
commit 04fe545
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/src/core/include/cesium/omniverse/UsdUtil.h b/src/core/include/cesium/omniverse/UsdUtil.h
@@ -168,4 +168,6 @@ struct TranslateRotateScaleOps {
 
 std::optional<TranslateRotateScaleOps> getOrCreateTranslateRotateScaleOps(const pxr::UsdGeomXformable& xformable);
 
+bool getDebugDisableGeoreferencing(const Context& context);
+
 }; // namespace cesium::omniverse::UsdUtil
diff --git a/src/core/src/OmniGlobeAnchor.cpp b/src/core/src/OmniGlobeAnchor.cpp
@@ -235,6 +235,10 @@ bool OmniGlobeAnchor::isAnchorValid() const {
         return false;
     }
 
+    if (UsdUtil::getDebugDisableGeoreferencing(*_pContext)) {
+        return false;
+    }
+
     return true;
 }
 

diff --git a/src/core/src/UsdUtil.cpp b/src/core/src/UsdUtil.cpp
@@ -50,19 +50,6 @@
 
 namespace cesium::omniverse::UsdUtil {
 
-namespace {
-
-bool getDebugDisableGeoreferencing(const Context& context) {
-    const auto pData = context.getAssetRegistry().getFirstData();
-    if (!pData) {
-        return false;
-    }
-
-    return pData->getDebugDisableGeoreferencing();
-}
-
-} // namespace
-
 glm::dvec3 usdToGlmVector(const pxr::GfVec3d& vector) {
     return {vector[0], vector[1], vector[2]};
 }
@@ -803,4 +790,13 @@ std::optional<TranslateRotateScaleOps> getOrCreateTranslateRotateScaleOps(const
     return TranslateRotateScaleOps{translateOp, rotateOp, scaleOp, eulerAngleOrder};
 }
 
+bool getDebugDisableGeoreferencing(const Context& context) {
+    const auto pData = context.getAssetRegistry().getFirstData();
+    if (!pData) {
+        return false;
+    }
+
+    return pData->getDebugDisableGeoreferencing();
+}
+
 } // namespace cesium::omniverse::UsdUtil