Merge branch 'fix-debug-color' into tileset-material-nodes

CesiumGS · Oct 19, 2023 · 2c20a58 · 2c20a58
2 parents 680059b + 2a48b39
commit 2c20a58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/core/include/cesium/omniverse/Tokens.h b/src/core/include/cesium/omniverse/Tokens.h
@@ -243,9 +243,9 @@ const omni::fabric::Type outputs_out(omni::fabric::BaseDataType::eToken, 1, 0, o
 const omni::fabric::Type points(omni::fabric::BaseDataType::eFloat, 3, 1, omni::fabric::AttributeRole::ePosition);
 const omni::fabric::Type primvarInterpolations(omni::fabric::BaseDataType::eToken, 1, 1, omni::fabric::AttributeRole::eNone);
 const omni::fabric::Type primvars(omni::fabric::BaseDataType::eToken, 1, 1, omni::fabric::AttributeRole::eNone);
+const omni::fabric::Type primvars_displayColor(omni::fabric::BaseDataType::eFloat, 3, 1, omni::fabric::AttributeRole::eColor);
 const omni::fabric::Type primvars_normals(omni::fabric::BaseDataType::eFloat, 3, 1, omni::fabric::AttributeRole::eNormal);
 const omni::fabric::Type primvars_st(omni::fabric::BaseDataType::eFloat, 2, 1, omni::fabric::AttributeRole::eTexCoord);
-const omni::fabric::Type primvars_displayColor(omni::fabric::BaseDataType::eFloat, 3, 1, omni::fabric::AttributeRole::eColor);
 const omni::fabric::Type Shader(omni::fabric::BaseDataType::eTag, 1, 0, omni::fabric::AttributeRole::ePrimTypeName);
 const omni::fabric::Type subdivisionScheme(omni::fabric::BaseDataType::eToken, 1, 0, omni::fabric::AttributeRole::eNone);
 const omni::fabric::Type _cesium_localToEcefTransform(omni::fabric::BaseDataType::eDouble, 16, 0, omni::fabric::AttributeRole::eMatrix);

diff --git a/src/core/src/FabricGeometry.cpp b/src/core/src/FabricGeometry.cpp
@@ -169,7 +169,7 @@ void FabricGeometry::initialize() {
     // Initialize primvars
     size_t primvarsCount = 0;
     size_t primvarIndexNormal = 0;
-    size_t primvarIndexDisplayColor = 0;
+    size_t primvarIndexVertexColor = 0;
 
     std::vector<uint64_t> primvarIndexStArray;
     primvarIndexStArray.reserve(texcoordSetCount);
@@ -183,7 +183,7 @@ void FabricGeometry::initialize() {
     }
 
     if (hasVertexColors) {
-        primvarIndexDisplayColor = primvarsCount++;
+        primvarIndexVertexColor = primvarsCount++;
     }
 
     srw.setArrayAttributeSize(_path, FabricTokens::primvars, primvarsCount);
@@ -205,8 +205,8 @@ void FabricGeometry::initialize() {
     }
 
     if (hasVertexColors) {
-        primvarsFabric[primvarIndexDisplayColor] = FabricTokens::primvars_displayColor;
-        primvarInterpolationsFabric[primvarIndexDisplayColor] = FabricTokens::vertex;
+        primvarsFabric[primvarIndexVertexColor] = FabricTokens::primvars_displayColor;
+        primvarInterpolationsFabric[primvarIndexVertexColor] = FabricTokens::vertex;
     }
 }