Avoid hardcoding the texture inputs length

CesiumGS · Oct 6, 2023 · 95c1107 · 95c1107
1 parent f497b7c
commit 95c1107
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 25 deletions.
diff --git a/src/core/include/cesium/omniverse/FabricMaterial.h b/src/core/include/cesium/omniverse/FabricMaterial.h
@@ -80,6 +80,7 @@ class FabricMaterial {
 
     bool _useTextureArray;
     uint64_t _textureArrayLength;
+    std::vector<omni::fabric::Token> _inputTextureTokens;
 };
 
 } // namespace cesium::omniverse
diff --git a/src/core/include/cesium/omniverse/Tokens.h b/src/core/include/cesium/omniverse/Tokens.h
@@ -61,9 +61,6 @@ __pragma(warning(push)) __pragma(warning(disable : 4003))
     ((inputs_scale, "inputs:scale")) \
     ((inputs_tex_coord_index, "inputs:tex_coord_index")) \
     ((inputs_texture, "inputs:texture")) \
-    ((inputs_texture_0, "inputs:texture_0")) \
-    ((inputs_texture_1, "inputs:texture_1")) \
-    ((inputs_texture_2, "inputs:texture_2")) \
     ((inputs_vertex_color_name, "inputs:vertex_color_name")) \
     ((inputs_wrap_s, "inputs:wrap_s")) \
     ((inputs_wrap_t, "inputs:wrap_t")) \

diff --git a/src/core/src/FabricMaterial.cpp b/src/core/src/FabricMaterial.cpp
@@ -30,6 +30,14 @@ FabricMaterial::FabricMaterial(
         return;
     }
 
+    if (_useTextureArray) {
+        _inputTextureTokens.reserve(_textureArrayLength);
+        for (uint64_t i = 0; i < _textureArrayLength; i++) {
+            const auto name = fmt::format("inputs:texture_{}", i);
+            _inputTextureTokens.emplace_back(name.c_str());
+        }
+    }
+
     initialize();
     reset();
 }
@@ -251,23 +259,14 @@ void FabricMaterial::createTextureArray(
     const omni::fabric::Path& texturePath,
     const omni::fabric::Path& shaderPath,
     const omni::fabric::Token& shaderInput) {
-
-    const auto inputTextureTokens = std::vector<omni::fabric::Token>{
-        FabricTokens::inputs_texture_0,
-        FabricTokens::inputs_texture_1,
-        FabricTokens::inputs_texture_2,
-    };
-
-    assert(inputTextureTokens.size() == _textureArrayLength);
-
     auto srw = UsdUtil::getFabricStageReaderWriter();
 
     srw.createPrim(texturePath);
 
     FabricAttributesBuilder attributes;
 
     for (uint64_t i = 0; i < _textureArrayLength; i++) {
-        attributes.addAttribute(FabricTypes::inputs_texture, inputTextureTokens[i]);
+        attributes.addAttribute(FabricTypes::inputs_texture, _inputTextureTokens[i]);
     }
 
     // clang-format off
@@ -303,7 +302,7 @@ void FabricMaterial::createTextureArray(
     *infoMdlSourceAssetSubIdentifierFabric = FabricTokens::cesium_texture_array_lookup;
 
     for (uint64_t i = 0; i < _textureArrayLength; i++) {
-        paramColorSpaceFabric[i * 2] = inputTextureTokens[i];
+        paramColorSpaceFabric[i * 2] = _inputTextureTokens[i];
         paramColorSpaceFabric[i * 2 + 1] = FabricTokens::_auto;
     }
 
@@ -438,18 +437,8 @@ void FabricMaterial::setTextureArrayValues(
     const std::vector<pxr::TfToken>& textureAssetPathTokens) {
     auto srw = UsdUtil::getFabricStageReaderWriter();
 
-    assert(textureAssetPathTokens.size() == _textureArrayLength);
-
-    const auto inputTextureTokens = std::vector<omni::fabric::Token>{
-        FabricTokens::inputs_texture_0,
-        FabricTokens::inputs_texture_1,
-        FabricTokens::inputs_texture_2,
-    };
-
-    assert(inputTextureTokens.size() == _textureArrayLength);
-
     for (uint64_t i = 0; i < textureAssetPathTokens.size(); i++) {
-        auto textureFabric = srw.getAttributeWr<omni::fabric::AssetPath>(texturePath, inputTextureTokens[i]);
+        auto textureFabric = srw.getAttributeWr<omni::fabric::AssetPath>(texturePath, _inputTextureTokens[i]);
         textureFabric->assetPath = textureAssetPathTokens[i];
         textureFabric->resolvedPath = pxr::TfToken();
     }