Add filename resolve.

KhronosGroup · Sep 5, 2023 · 4532d42 · 4532d42
1 parent dc6d0c0
commit 4532d42
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/source/MaterialXRender/GltfMaterialHandler.cpp b/source/MaterialXRender/GltfMaterialHandler.cpp
@@ -135,7 +135,7 @@ void writeColor3Input(const NodePtr pbrNode, const string& inputName,
     {
         InputPtr fileInput = imageNode->getInput(Implementation::FILE_ATTRIBUTE);
         filename = fileInput && fileInput->getAttribute(TypedElement::TYPE_ATTRIBUTE) == FILENAME_TYPE_STRING ?
-            fileInput->getValueString() : EMPTY_STRING;
+            fileInput->getResolvedValueString() : EMPTY_STRING;
         if (filename.empty())
         {
             imageNode = nullptr;
@@ -185,7 +185,7 @@ void writeFloatInput(const NodePtr pbrNode, const string& inputName,
     {
         InputPtr fileInput = imageNode->getInput(Implementation::FILE_ATTRIBUTE);
         filename = fileInput && fileInput->getAttribute(TypedElement::TYPE_ATTRIBUTE) == FILENAME_TYPE_STRING ?
-            fileInput->getValueString() : EMPTY_STRING;
+            fileInput->getResolvedValueString() : EMPTY_STRING;
         if (filename.empty())
         {
             imageNode = nullptr;
@@ -575,7 +575,7 @@ bool GltfMaterialHandler::save(const FilePath& filePath, StringVec& logger)
         {
             InputPtr fileInput = imageNode->getInput(Implementation::FILE_ATTRIBUTE);
             filename = fileInput && fileInput->getAttribute(TypedElement::TYPE_ATTRIBUTE) == FILENAME_TYPE_STRING ?
-                fileInput->getValueString() : EMPTY_STRING;
+                fileInput->getResolvedValueString() : EMPTY_STRING;
             if (filename.empty())
                 imageNode = nullptr;
         }
@@ -677,7 +677,7 @@ bool GltfMaterialHandler::save(const FilePath& filePath, StringVec& logger)
                 {
                     InputPtr fileInput = imageNode->getInput(Implementation::FILE_ATTRIBUTE);
                     filename = fileInput && fileInput->getAttribute(TypedElement::TYPE_ATTRIBUTE) == FILENAME_TYPE_STRING ?
-                        fileInput->getValueString() : EMPTY_STRING;
+                        fileInput->getResolvedValueString() : EMPTY_STRING;
                     filenames[e] = filename;
                     imageNamePaths[e] = imageNode->getNamePath();
                 }
@@ -852,7 +852,7 @@ bool GltfMaterialHandler::save(const FilePath& filePath, StringVec& logger)
             {
                 InputPtr fileInput = imageNode->getInput(Implementation::FILE_ATTRIBUTE);
                 filename = fileInput && fileInput->getAttribute(TypedElement::TYPE_ATTRIBUTE) == FILENAME_TYPE_STRING ?
-                    fileInput->getValueString() : EMPTY_STRING;
+                    fileInput->getResolvedValueString() : EMPTY_STRING;
                 if (filename.empty())
                     imageNode = nullptr;
             }
@@ -931,7 +931,7 @@ bool GltfMaterialHandler::save(const FilePath& filePath, StringVec& logger)
             {
                 InputPtr fileInput = thicknessNode->getInput(Implementation::FILE_ATTRIBUTE);
                 thicknessFileName = fileInput && fileInput->getAttribute(TypedElement::TYPE_ATTRIBUTE) == FILENAME_TYPE_STRING ?
-                    fileInput->getValueString() : EMPTY_STRING;
+                    fileInput->getResolvedValueString() : EMPTY_STRING;
 
                 cgltf_texture* texture = &(textureList[imageIndex]);
                 iridescence.iridescence_thickness_texture.texture = texture;
@@ -989,7 +989,7 @@ bool GltfMaterialHandler::save(const FilePath& filePath, StringVec& logger)
             {
                 InputPtr fileInput = imageNode->getInput(Implementation::FILE_ATTRIBUTE);
                 filename = fileInput && fileInput->getAttribute(TypedElement::TYPE_ATTRIBUTE) == FILENAME_TYPE_STRING ?
-                    fileInput->getValueString() : EMPTY_STRING;
+                    fileInput->getResolvedValueString() : EMPTY_STRING;
                 if (filename.empty())
                     imageNode = nullptr;
             }