Merge branch 'AcademySoftwareFoundation:main' into python_image_loader_fix

Author: kwokcb

source/MaterialXFormat/File.cpp

@@ -185,7 +185,7 @@ FilePathVec FilePath::getFilesInDirectory(const string& extension) const
 
 #if defined(_WIN32)
     WIN32_FIND_DATAA fd;
-    FilePath query = extension.empty() ? *this : (*this / ("*." + extension));
+    FilePath query = extension.empty() ? (*this / "*") : (*this / ("*." + extension));
     HANDLE hFind = FindFirstFileA(query.asString().c_str(), &fd);
     if (hFind != INVALID_HANDLE_VALUE)
     {

source/MaterialXGenOsl/CMakeLists.txt

@@ -1,17 +1,7 @@
-file(GLOB_RECURSE materialx_source
- "${CMAKE_CURRENT_SOURCE_DIR}/OslShaderGenerator.cpp"
- "${CMAKE_CURRENT_SOURCE_DIR}/OslSyntax.cpp"
- "${CMAKE_CURRENT_SOURCE_DIR}/OslNetworkShaderGenerator.cpp"
- "${CMAKE_CURRENT_SOURCE_DIR}/OslNetworkSyntax.cpp"
- "${CMAKE_CURRENT_SOURCE_DIR}/Nodes/OsoNode.cpp")
-
-file(GLOB_RECURSE materialx_headers
-  "${CMAKE_CURRENT_SOURCE_DIR}/OslShaderGenerator.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/OslSyntax.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/OslNetworkShaderGenerator.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/OslNetworkSyntax.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Nodes/OsoNode.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Export.h")
+file(GLOB_RECURSE materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
+file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
+
+list(REMOVE_ITEM materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/LibsToOso.cpp")
 
 mx_add_library(MaterialXGenOsl
     SOURCE_FILES
@@ -25,7 +15,7 @@ mx_add_library(MaterialXGenOsl
         MATERIALX_GENOSL_EXPORTS)
 
 # FIXME: LibsToOso has a dependency on the OslRenderer.
-if (MATERIALX_BUILD_RENDER)
+if (MATERIALX_BUILD_OSOS AND MATERIALX_BUILD_RENDER)
     file(GLOB GenNodes_SRC "${CMAKE_CURRENT_SOURCE_DIR}/LibsToOso.cpp")
 
     set(MATERIALX_LIBRARIES

source/MaterialXGenOsl/LibsToOso.cpp

@@ -335,7 +335,7 @@ int main(int argc, char* const argv[])
     mx::NodeGraphPtr librariesDocGraph = librariesDoc->addNodeGraph("librariesDocGraph");
 
     // Loop over all the `NodeDef` gathered in our documents from the provided libraries.
-    for (const mx::NodeDefPtr& nodeDef : librariesDoc->getNodeDefs())
+    for (mx::NodeDefPtr nodeDef : librariesDoc->getNodeDefs())
     {
         std::string nodeName = nodeDef->getName();
 
@@ -364,7 +364,7 @@ int main(int argc, char* const argv[])
         }
 
         // TODO: Check for the existence/validity of the `Node`?
-        mx::NodePtr node = librariesDoc->addNodeInstance(nodeDef, nodeName);
+        mx::NodePtr node = librariesDocGraph->addNodeInstance(nodeDef, nodeName);
 
         std::string oslShaderName = node->getName();
         oslShaderGen->getSyntax().makeValidName(oslShaderName);

source/MaterialXRenderOsl/OslRenderer.cpp

@@ -28,6 +28,7 @@ OslRendererPtr OslRenderer::create(unsigned int width, unsigned int height, Imag
 OslRenderer::OslRenderer(unsigned int width, unsigned int height, Image::BaseType baseType) :
     ShaderRenderer(width, height, baseType),
     _useTestRender(true),
+    _useOSLCmdStr(false),
     _raysPerPixelLit(1),
     _raysPerPixelUnlit(1)
 {

source/MaterialXTest/MaterialXFormat/File.cpp

@@ -185,20 +185,23 @@ TEST_CASE("Get all files in directory", "[file]")
     mx::FilePathVec results;
 
     results = lightsDir.getFilesInDirectory("mtlx");
-    for (const mx::FilePath& filename : results)
+    REQUIRE(results.size() > 0);
+    for (const mx::FilePath& filename : mtlxFilenames)
     {
-        REQUIRE(std::find(mtlxFilenames.begin(), mtlxFilenames.end(), filename) != mtlxFilenames.end());
+        REQUIRE(std::find(results.begin(), results.end(), filename) != results.end());
     }
 
     results = lightsDir.getFilesInDirectory("hdr");
-    for (const mx::FilePath& filename : results)
+    REQUIRE(results.size() > 0);
+    for (const mx::FilePath& filename : hdrFilenames)
     {
-        REQUIRE(std::find(hdrFilenames.begin(), hdrFilenames.end(), filename) != hdrFilenames.end());
+        REQUIRE(std::find(results.begin(), results.end(), filename) != results.end());
     }
 
     results = lightsDir.getFilesInDirectory();
-    for (const mx::FilePath& filename : results)
+    REQUIRE(results.size() > 0);
+    for (const mx::FilePath& filename : allFilesnames)
     {
-        REQUIRE(std::find(allFilesnames.begin(), allFilesnames.end(), filename) != allFilesnames.end());
+        REQUIRE(std::find(results.begin(), results.end(), filename) != results.end());
     }
 }

source/MaterialXTest/MaterialXRenderMsl/RenderMsl.mm

@@ -165,7 +165,7 @@ bool runRenderer(const std::string& shaderName,
                                           std::ostream& log,
                                           const GenShaderUtil::TestSuiteOptions& testOptions,
                                           RenderUtil::RenderProfileTimes& profileTimes,
-                                          const mx::FileSearchPath& /*imageSearchPath*/,
+                                          const mx::FileSearchPath& imageSearchPath,
                                           const std::string& outputPath,
                                           mx::ImageVec* imageVec)
 {
@@ -351,7 +351,7 @@ bool runRenderer(const std::string& shaderName,
 
                 {
                     mx::ScopedTimer renderTimer(&profileTimes.languageTimes.renderTime);
-                    _renderer->getImageHandler()->setSearchPath(mx::getDefaultDataSearchPath());
+                    _renderer->getImageHandler()->setSearchPath(imageSearchPath);
                     unsigned int width = (unsigned int) testOptions.renderSize[0] * supersampleFactor;
                     unsigned int height = (unsigned int) testOptions.renderSize[1] * supersampleFactor;
                     _renderer->setSize(width, height);