Add constant for -1 tilesetId

CesiumGS · Jul 12, 2023 · 9a1346d · 9a1346d
1 parent e43b512
commit 9a1346d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/core/include/cesium/omniverse/FabricUtil.h b/src/core/include/cesium/omniverse/FabricUtil.h
@@ -20,6 +20,9 @@ struct FabricStatistics {
     uint64_t trianglesRendered{0};
 };
 
+// -1 means the prim is not yet associated with a tileset
+const auto NO_TILESET_ID = int64_t(-1);
+
 } // namespace cesium::omniverse
 
 namespace cesium::omniverse::FabricUtil {

diff --git a/src/core/src/FabricGeometry.cpp b/src/core/src/FabricGeometry.cpp
@@ -213,7 +213,7 @@ void FabricGeometry::reset() {
     displayColorFabric[0] = DEFAULT_VERTEX_COLOR;
     displayOpacityFabric[0] = DEFAULT_VERTEX_OPACITY;
 
-    FabricUtil::setTilesetId(_pathFabric, -1);
+    FabricUtil::setTilesetId(_pathFabric, NO_TILESET_ID);
 
     srw.setArrayAttributeSize(_pathFabric, FabricTokens::material_binding, 0);
     srw.setArrayAttributeSize(_pathFabric, FabricTokens::faceVertexCounts, 0);

diff --git a/src/core/src/FabricMaterial.cpp b/src/core/src/FabricMaterial.cpp
@@ -217,7 +217,7 @@ void FabricMaterial::reset() {
     auto srw = UsdUtil::getFabricStageReaderWriter();
 
     setMaterialValues(GltfUtil::getDefaultMaterialInfo());
-    setTilesetId(-1);
+    setTilesetId(NO_TILESET_ID);
 
     if (_materialDefinition.hasBaseColorTexture()) {
         clearBaseColorTexture();

diff --git a/src/core/src/FabricUtil.cpp b/src/core/src/FabricUtil.cpp
@@ -545,7 +545,7 @@ FabricStatistics getStatistics() {
         statistics.geometriesCapacity += paths.size();
 
         for (size_t i = 0; i < paths.size(); i++) {
-            if (tilesetIdFabric[i] == -1) {
+            if (tilesetIdFabric[i] == NO_TILESET_ID) {
                 continue;
             }
 
@@ -571,7 +571,7 @@ FabricStatistics getStatistics() {
         statistics.materialsCapacity += paths.size();
 
         for (size_t i = 0; i < paths.size(); i++) {
-            if (tilesetIdFabric[i] == -1) {
+            if (tilesetIdFabric[i] == NO_TILESET_ID) {
                 continue;
             }