Merge branch 'main' into krohmer/add_subsurface_bsdf_tests

Author: krohmerNV

CHANGELOG.md

@@ -1,24 +1,31 @@
 # Change Log
 
-## [1.39.3] - Release Candidate
+## [1.39.4] - Development
+
+## [1.39.3] - 2025-03-07
 
 ### Added
-- Added support for the [fract node](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2169), including both new specification language and data library implementations.
+- Added support for the [fract node](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2169), with implementations in GLSL, OSL, and MDL.
+- Added a bitangent input to the [bump node](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2196), aligning its feature set with the normalmap node.
 - Added support for [OSL 1.14](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2204) in shader generation, leveraging the latest closures when available.
 - Added support for [MDL 1.10](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2214) in shader generation, leveraging the latest closures when available.
 - Added initial support for [data library builds](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2226), allowing future releases to generate derived artifacts from the MaterialX data libraries.
 - Added an [ElementVec type alias](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2231) in MaterialX C++, allowing certain patterns to be expressed more clearly and concisely. 
 
 ### Changed
-- Raised the minimum CMake version to [CMake 3.26](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2235).
+- Improved the compatibility of MaterialX shader generation with [Hydra Storm](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2211).
 - Refactored the [type system](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2176) in shader generation, improving the thread-safety and robustness of the generation process.
 - Improved the implementations of the [BSDF operator nodes](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2191), preferring data definitions over explicit C++ code.
-- Improved the implementation of the [time node](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2192), using a node graph implementation in hardware shading languages.
+- Improved the implementations of the [time node](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2192), using a graph definition in hardware shading languages.
+- Optimized [GitHub CI](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2253) to reduce build times for contributors.
+- Raised the minimum CMake version to [CMake 3.26](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2235).
 
 ### Fixed
+- Fixed two edge cases in the [version](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2248) [upgrade](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2251) logic for normalmap nodes, addressing the usage of MaterialX versioning in OpenUSD.
+- Fixed [tangent frame orthogonalization](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2245) for the normalmap node in OSL shader generation.
 - Added validation of [tree depth](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2232) and [XInclude depth](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2233) in XML parsing, addressing cases where unusually complex documents could trigger a stack overflow.
-- Adding missing [null](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2228) [checks](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2229) in the getShaderNodes helper function.
-- Fixed edge cases in the version upgrade process for [normalmap](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2248) [nodes](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2251).
+- Adding two missing [null](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2228) [checks](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2229) in the getShaderNodes helper function.
+- Integrated fixes to [OSL type classes](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2200) from recent work in the OSL project.
 - Improved the handling of [invalid materials](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2230) in the MaterialX Viewer, addressing cases where missing lights could trigger a crash.
 
 ## [1.39.2] - 2025-01-20

CMakeLists.txt

@@ -1,7 +1,7 @@
 # MaterialX Version
 set(MATERIALX_MAJOR_VERSION 1)
 set(MATERIALX_MINOR_VERSION 39)
-set(MATERIALX_BUILD_VERSION 3)
+set(MATERIALX_BUILD_VERSION 4)
 set(MATERIALX_LIBRARY_VERSION ${MATERIALX_MAJOR_VERSION}.${MATERIALX_MINOR_VERSION}.${MATERIALX_BUILD_VERSION})
 
 # Cmake setup
@@ -10,9 +10,9 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 set(CMAKE_MACOSX_RPATH ON)
 enable_testing()
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
 
 # JavaScript setup 
 option(MATERIALX_BUILD_JS "Build the MaterialX JavaScript package from C++ bindings. Requires the emscripten environment." OFF)
@@ -254,7 +254,7 @@ endif()
 
 # Adjust the default installation path
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/installed" CACHE PATH "Default install path" FORCE)
+    set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/installed" CACHE PATH "Default install path" FORCE)
 endif()
 
 # Set the installation path for shared libraries
@@ -358,7 +358,7 @@ function(mx_add_library MATERIALX_MODULE_NAME)
 
         # Create version resource
         if(MATERIALX_BUILD_SHARED_LIBS AND MSVC)
-            configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/MaterialXVersion.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
+            configure_file(${PROJECT_SOURCE_DIR}/cmake/modules/MaterialXVersion.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
             target_sources(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
         endif()
 
@@ -588,10 +588,10 @@ if(NOT SKBUILD)
     endif()
 
     configure_package_config_file(cmake/modules/MaterialXConfig.cmake.in
-                                ${CMAKE_BINARY_DIR}/cmake/${CMAKE_PROJECT_NAME}Config.cmake
+                                ${PROJECT_BINARY_DIR}/cmake/${CMAKE_PROJECT_NAME}Config.cmake
                                 INSTALL_DESTINATION "${MATERIALX_GEN_CONFIG_PATH}"
                                 PATH_VARS CMAKE_INSTALL_PREFIX CMAKE_PROJECT_NAME)
-    write_basic_package_version_file(${CMAKE_BINARY_DIR}/cmake/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
+    write_basic_package_version_file(${PROJECT_BINARY_DIR}/cmake/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
                                     VERSION ${MATERIALX_LIBRARY_VERSION}
                                     COMPATIBILITY AnyNewerVersion)
 
@@ -601,7 +601,7 @@ if(NOT SKBUILD)
             DESTINATION "${MATERIALX_GEN_CONFIG_PATH}"
             FILE ${CMAKE_PROJECT_NAME}Targets.cmake)
 
-    install(FILES "${CMAKE_BINARY_DIR}/cmake/${CMAKE_PROJECT_NAME}ConfigVersion.cmake"
-            "${CMAKE_BINARY_DIR}/cmake/${CMAKE_PROJECT_NAME}Config.cmake"
+    install(FILES "${PROJECT_BINARY_DIR}/cmake/${CMAKE_PROJECT_NAME}ConfigVersion.cmake"
+            "${PROJECT_BINARY_DIR}/cmake/${CMAKE_PROJECT_NAME}Config.cmake"
             DESTINATION "${MATERIALX_GEN_CONFIG_PATH}")
 endif()

README.md

@@ -72,9 +72,9 @@ The Open Chess Set is an open reference asset, consisting of a [MaterialX file](
 
 The following packages contain pre-built binaries for the latest release, including the MaterialX viewer, Python libraries, and example assets:
 
-- [Microsoft Windows (Visual Studio 2022, Python 3.12)](https://github.com/AcademySoftwareFoundation/MaterialX/releases/latest/download/MaterialX_Windows_VS2022_x64_Python312.zip)
-- [MacOS (Xcode 15, Python 3.12)](https://github.com/AcademySoftwareFoundation/MaterialX/releases/latest/download/MaterialX_MacOS_Xcode_15_Python312.zip)
-- [Linux (GCC 14, Python 3.12)](https://github.com/AcademySoftwareFoundation/MaterialX/releases/latest/download/MaterialX_Linux_GCC_14_Python312.zip)
+- [Microsoft Windows (Visual Studio 2022, Python 3.13)](https://github.com/AcademySoftwareFoundation/MaterialX/releases/latest/download/MaterialX_Windows_VS2022_x64_Python313.zip)
+- [MacOS (Xcode 16, Python 3.13)](https://github.com/AcademySoftwareFoundation/MaterialX/releases/latest/download/MaterialX_MacOS_Xcode_16_Python313.zip)
+- [Linux (GCC 14, Python 3.13)](https://github.com/AcademySoftwareFoundation/MaterialX/releases/latest/download/MaterialX_Linux_GCC_14_Python313.zip)
 
 ## Additional Resources
 

documents/CMakeLists.txt

@@ -3,18 +3,18 @@ set(DOXYGEN_HTML_OUTPUT_DIR ${DOXYGEN_OUTPUT_DIR}/html)
 set(DOXYGEN_INPUT_LIST ${CMAKE_CURRENT_BINARY_DIR}/MainPage.md)
 
 set(MATERIALX_DOXYGEN_SOURCE_FOLDERS
-    ${CMAKE_SOURCE_DIR}/source/MaterialXCore
-    ${CMAKE_SOURCE_DIR}/source/MaterialXFormat
-    ${CMAKE_SOURCE_DIR}/source/MaterialXGenShader
-    ${CMAKE_SOURCE_DIR}/source/MaterialXGenShader/Nodes
-    ${CMAKE_SOURCE_DIR}/source/MaterialXGenGlsl
-    ${CMAKE_SOURCE_DIR}/source/MaterialXGenGlsl/Nodes
-    ${CMAKE_SOURCE_DIR}/source/MaterialXGenOsl
-    ${CMAKE_SOURCE_DIR}/source/MaterialXGenMdl
-    ${CMAKE_SOURCE_DIR}/source/MaterialXRender
-    ${CMAKE_SOURCE_DIR}/source/MaterialXRenderHw
-    ${CMAKE_SOURCE_DIR}/source/MaterialXRenderGlsl
-    ${CMAKE_SOURCE_DIR}/source/MaterialXRenderOsl)
+    ${PROJECT_SOURCE_DIR}/source/MaterialXCore
+    ${PROJECT_SOURCE_DIR}/source/MaterialXFormat
+    ${PROJECT_SOURCE_DIR}/source/MaterialXGenShader
+    ${PROJECT_SOURCE_DIR}/source/MaterialXGenShader/Nodes
+    ${PROJECT_SOURCE_DIR}/source/MaterialXGenGlsl
+    ${PROJECT_SOURCE_DIR}/source/MaterialXGenGlsl/Nodes
+    ${PROJECT_SOURCE_DIR}/source/MaterialXGenOsl
+    ${PROJECT_SOURCE_DIR}/source/MaterialXGenMdl
+    ${PROJECT_SOURCE_DIR}/source/MaterialXRender
+    ${PROJECT_SOURCE_DIR}/source/MaterialXRenderHw
+    ${PROJECT_SOURCE_DIR}/source/MaterialXRenderGlsl
+    ${PROJECT_SOURCE_DIR}/source/MaterialXRenderOsl)
 
 find_package(Doxygen REQUIRED)
 

documents/Doxyfile.in

@@ -9,7 +9,7 @@ INPUT                  = ${DOXYGEN_INPUT_STR}
 OUTPUT_DIRECTORY       = ${DOXYGEN_OUTPUT_DIR}
 IMAGE_PATH             = ${DOXYGEN_OUTPUT_DIR}
 HTML_OUTPUT            = ${DOXYGEN_HTML_OUTPUT_DIR}
-STRIP_FROM_PATH        = ${CMAKE_SOURCE_DIR}
+STRIP_FROM_PATH        = ${PROJECT_SOURCE_DIR}
 
 JAVADOC_AUTOBRIEF      = YES
 HIDE_SCOPE_NAMES       = YES

source/CMakeLists.txt

@@ -10,7 +10,7 @@ if (MATERIALX_BUILD_MONOLITHIC)
 
     # Create version resource
     if(MATERIALX_BUILD_SHARED_LIBS AND MSVC)
-        configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/MaterialXVersion.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
+        configure_file(${PROJECT_SOURCE_DIR}/cmake/modules/MaterialXVersion.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
         target_sources(${MATERIALX_MODULE_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
     endif()
 

source/JsMaterialX/CMakeLists.txt

@@ -8,7 +8,7 @@ set(GENMSL ${CMAKE_CURRENT_SOURCE_DIR}/JsMaterialXGenMsl/)
 set(GENVK ${CMAKE_CURRENT_SOURCE_DIR}/JsMaterialXGenVk/)
 set(GENMDL ${CMAKE_CURRENT_SOURCE_DIR}/JsMaterialXGenMdl/)
 
-set(SOURCE_FOLDER ${CMAKE_SOURCE_DIR}/source)
+set(SOURCE_FOLDER ${PROJECT_SOURCE_DIR}/source)
 
 set(CORE_DEPS ${CORE}JsTypes.cpp
     ${CORE}JsMaterial.cpp
@@ -85,7 +85,7 @@ else()
 endif()
 
 
-set(JS_LINK_FLAGS_GENSHADER "${JS_LINK_FLAGS_CORE} --preload-file ${CMAKE_SOURCE_DIR}/libraries@libraries ")
+set(JS_LINK_FLAGS_GENSHADER "${JS_LINK_FLAGS_CORE} --preload-file ${PROJECT_SOURCE_DIR}/libraries@libraries ")
 
 add_executable(JsMaterialXCore MaterialXLib.cpp
     ${CORE_DEPS}
@@ -157,12 +157,12 @@ install(TARGETS JsMaterialXCore DESTINATION "JavaScript/MaterialX")
 install(TARGETS JsMaterialXGenShader DESTINATION "JavaScript/MaterialX")
 
 # Copy the wasm output
-install(FILES ${CMAKE_BINARY_DIR}/bin/JsMaterialXCore.wasm DESTINATION JavaScript/MaterialX/)
-install(FILES ${CMAKE_BINARY_DIR}/bin/JsMaterialXGenShader.wasm ${CMAKE_BINARY_DIR}/bin/JsMaterialXGenShader.data DESTINATION JavaScript/MaterialX/)
+install(FILES ${PROJECT_BINARY_DIR}/bin/JsMaterialXCore.wasm DESTINATION JavaScript/MaterialX/)
+install(FILES ${PROJECT_BINARY_DIR}/bin/JsMaterialXGenShader.wasm ${PROJECT_BINARY_DIR}/bin/JsMaterialXGenShader.data DESTINATION JavaScript/MaterialX/)
 
 # Copy the JavaScript files with the version appended to them.
-install(FILES ${CMAKE_BINARY_DIR}/bin/JsMaterialXCore.js DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ RENAME JsMaterialXCore-${MATERIALX_LIBRARY_VERSION}.js)
+install(FILES ${PROJECT_BINARY_DIR}/bin/JsMaterialXCore.js DESTINATION ${PROJECT_BINARY_DIR}/ RENAME JsMaterialXCore-${MATERIALX_LIBRARY_VERSION}.js)
 install(FILES ${CMAKE_INSTALL_PREFIX}/JavaScript/MaterialX/JsMaterialXCore.js DESTINATION JavaScript/MaterialX/ RENAME JsMaterialXCore-${MATERIALX_LIBRARY_VERSION}.js)
 
-install(FILES ${CMAKE_BINARY_DIR}/bin/JsMaterialXGenShader.js DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ RENAME JsMaterialXGenShader-${MATERIALX_LIBRARY_VERSION}.js)
+install(FILES ${PROJECT_BINARY_DIR}/bin/JsMaterialXGenShader.js DESTINATION ${PROJECT_BINARY_DIR}/ RENAME JsMaterialXGenShader-${MATERIALX_LIBRARY_VERSION}.js)
 install(FILES ${CMAKE_INSTALL_PREFIX}/JavaScript/MaterialX/JsMaterialXGenShader.js DESTINATION JavaScript/MaterialX/ RENAME JsMaterialXGenShader-${MATERIALX_LIBRARY_VERSION}.js)

source/MaterialXCore/Value.cpp

@@ -333,6 +333,34 @@ string AggregateValue::getValueString() const
     return result;
 }
 
+bool AggregateValue::isEqual(ConstValuePtr other) const
+{
+    if (!other->isA<AggregateValue>())
+    {
+        return false;
+    }
+
+    const AggregateValue& otherAggregate = other->asA<AggregateValue>();
+
+    size_t dataSize = _data.size();
+    size_t otherDataSize = otherAggregate._data.size();
+
+    if (dataSize != otherDataSize)
+    {
+        return false;
+    }
+
+    for (size_t i = 0; i < dataSize; i++)
+    {
+        if (!_data[i]->isEqual(otherAggregate._data[i]))
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
 AggregateValuePtr AggregateValue::createAggregateValueFromString(const string& value, const string& type, ConstTypeDefPtr typeDef)
 {
     StringVec subValues = parseStructValueString(value);

source/MaterialXCore/Value.h

@@ -122,6 +122,9 @@ class MX_CORE_API Value
         return _floatPrecision;
     }
 
+    // Returns true if value data matches.
+    virtual bool isEqual(ConstValuePtr other) const = 0;
+
   protected:
     template <class T> friend class ValueRegistry;
 
@@ -178,6 +181,16 @@ template <class T> class MX_CORE_API TypedValue : public Value
     /// Return value string.
     string getValueString() const override;
 
+    // Returns true if value data matches.
+    bool isEqual(ConstValuePtr other) const override
+    {
+        if (!other || !other->isA<T>())
+        {
+            return false;
+        }
+        return _data == other->asA<T>();
+    }
+
     //
     // Static helper methods
     //
@@ -238,6 +251,9 @@ class MX_CORE_API AggregateValue : public Value
     /// Return value string.
     string getValueString() const override;
 
+    // Returns true if value data matches.
+    bool isEqual(ConstValuePtr other) const override;
+
     //
     // Static helper methods
     //

source/MaterialXTest/CMakeLists.txt

@@ -58,8 +58,8 @@ if(MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_OSL OR MATERIALX_BUILD_GEN_MD
     if (NOT MATERIALX_BUILD_MONOLITHIC)
         get_target_property(MaterialXGenMdl_SOURCE_DIR MaterialXGenMdl SOURCE_DIR)
     else()
-        get_target_property(MaterialX_SOURCE_DIR ${MATERIALX_MONOLITHIC_TARGET} SOURCE_DIR)
-        set(MaterialXGenMdl_SOURCE_DIR "{MaterialX_SOURCE_DIR}/MaterialXGenMdl")
+        get_target_property(PROJECT_SOURCE_DIR ${MATERIALX_MONOLITHIC_TARGET} SOURCE_DIR)
+        set(MaterialXGenMdl_SOURCE_DIR "{PROJECT_SOURCE_DIR}/MaterialXGenMdl")
     endif()
     target_compile_definitions(MaterialXTest PRIVATE -DMATERIALX_MDL_IMPL_MODULE_PATH=\"${MaterialXGenMdl_SOURCE_DIR}/mdl\")
   endif()