Merge branch 'main' into fractal2d

Author: jstone-lucasfilm

.github/workflows/main.yml

@@ -25,18 +25,18 @@ jobs:
           python: 3.7
           cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON -DMATERIALX_BUILD_MONOLITHIC=ON
 
-        - name: Linux_GCC_13_Python311
+        - name: Linux_GCC_14_Python312
           os: ubuntu-24.04
           compiler: gcc
-          compiler_version: "13"
-          python: 3.11
-          build_javascript: ON
+          compiler_version: "14"
+          python: 3.12
 
-        - name: Linux_GCC_14_Python312
+        - name: Linux_GCC_14_Python313
           os: ubuntu-24.04
           compiler: gcc
           compiler_version: "14"
-          python: 3.12
+          python: 3.13
+          test_render: ON
 
         - name: Linux_GCC_CoverageAnalysis
           os: ubuntu-24.04
@@ -53,23 +53,22 @@ jobs:
           python: 3.7
           cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON
 
-        - name: Linux_Clang_18_Python312
+        - name: Linux_Clang_18_Python313
           os: ubuntu-24.04
           compiler: clang
           compiler_version: "18"
-          python: 3.12
-          test_render: ON
+          python: 3.13
           clang_format: ON
 
-        - name: MacOS_Xcode_14_Python39
-          os: macos-13
+        - name: MacOS_Xcode_15_Python311
+          os: macos-14
           compiler: xcode
-          compiler_version: "14.1"
+          compiler_version: "15.4"
           cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON
-          python: 3.9
+          python: 3.11
 
         - name: MacOS_Xcode_15_Python312
-          os: macos-14
+          os: macos-15
           compiler: xcode
           compiler_version: "15.4"
           python: 3.12
@@ -160,11 +159,7 @@ jobs:
     - name: Install Dependencies (Windows)
       if: runner.os == 'Windows'
       run: |
-        git clone https://github.com/Microsoft/vcpkg -b 2021.05.12 -c advice.detachedHead=false
-        vcpkg/bootstrap-vcpkg.bat -disableMetrics
         Add-Content $env:GITHUB_PATH "$PWD/build/installed/bin"
-        Add-Content $env:GITHUB_PATH "$PWD/vcpkg/installed/x64-windows/bin"
-        Add-Content $env:GITHUB_PATH "$PWD/vcpkg/installed/x64-windows/tools"
 
     - name: Install Python ${{ matrix.python }}
       if: matrix.python != 'None'
@@ -177,22 +172,6 @@ jobs:
       if: matrix.python != 'None'
       run: pip install setuptools
 
-    - name: Install Emscripten
-      if: matrix.build_javascript == 'ON'
-      run: |
-        git clone https://github.com/emscripten-core/emsdk --recursive
-        cd emsdk
-        ./emsdk install 2.0.20
-        ./emsdk activate 2.0.20
-        source ./emsdk_env.sh
-        echo "EMSDK=$EMSDK" >> $GITHUB_ENV
-
-    - name: Install Node
-      if: matrix.build_javascript == 'ON'
-      uses: actions/setup-node@v4
-      with:
-         node-version: '16'
-
     - name: Run Clang Format
       if: matrix.clang_format == 'ON'
       run: find source \( -name *.h -o -name *.cpp -o -name *.mm -o -name *.inl \) ! -path "*/External/*" ! -path "*/NanoGUI/*" | xargs clang-format -i --verbose
@@ -227,10 +206,10 @@ jobs:
     - name: Shader Validation Tests (Windows)
       if: matrix.test_shaders == 'ON' && runner.os == 'Windows'
       run: |
-        vcpkg/vcpkg install glslang --triplet=x64-windows
-        glslangValidator.exe -v
-        python python/Scripts/generateshader.py resources/Materials/Examples --target glsl --validator glslangValidator.exe
-        python python/Scripts/generateshader.py resources/Materials/Examples --target essl --validator glslangValidator.exe
+        C:/vcpkg/vcpkg install glslang[tools] --triplet=x64-windows-release
+        C:/vcpkg/installed/x64-windows-release/tools/glslang/glslangValidator.exe -v
+        python python/Scripts/generateshader.py resources/Materials/Examples --target glsl --validator C:/vcpkg/installed/x64-windows-release/tools/glslang/glslangValidator.exe
+        python python/Scripts/generateshader.py resources/Materials/Examples --target essl --validator C:/vcpkg/installed/x64-windows-release/tools/glslang/glslangValidator.exe
 
     - name: Shader Validation Tests (MacOS)
       if: matrix.test_shaders == 'ON' && runner.os == 'macOS'
@@ -313,43 +292,60 @@ jobs:
         name: MaterialX_Coverage
         path: build/coverage
 
+  javascript:
+    name: JavaScript
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Sync Repository
+      uses: actions/checkout@v4
+
+    - name: Install Emscripten
+      run: |
+        git clone https://github.com/emscripten-core/emsdk --recursive
+        cd emsdk
+        ./emsdk install 2.0.20
+        ./emsdk activate 2.0.20
+        source ./emsdk_env.sh
+        echo "EMSDK=$EMSDK" >> $GITHUB_ENV
+
+    - name: Install Node
+      uses: actions/setup-node@v4
+      with:
+         node-version: '16'
+
     - name: JavaScript CMake Generate
-      if: matrix.build_javascript == 'ON'
       run: cmake -S . -B javascript/build -DMATERIALX_BUILD_JS=ON -DMATERIALX_EMSDK_PATH=${{ env.EMSDK }}
 
     - name: JavaScript CMake Build
-      if: matrix.build_javascript == 'ON'
       run: cmake --build javascript/build --target install --config Release --parallel 2
 
     - name: JavaScript Unit Tests
-      if: matrix.build_javascript == 'ON'
       run: |
         npm install
         npm run test
         npm run test:browser
       working-directory: javascript/MaterialXTest
 
     - name: Build Web Viewer
-      if: matrix.build_javascript == 'ON'
       run: |
         npm install
         npm run build
       working-directory: javascript/MaterialXView
 
     - name: Deploy Web Viewer
-      if: matrix.build_javascript == 'ON' && github.event_name != 'pull_request'
+      if: github.event_name != 'pull_request'
       uses: JamesIves/github-pages-deploy-action@v4.6.4
       with:
         branch: gh-pages
         folder: javascript/MaterialXView/dist
         single-commit: true
 
     - name: Upload JavaScript Package
-      if: matrix.build_javascript == 'ON'
       uses: actions/upload-artifact@v4
       with:
         name: MaterialX_JavaScript
-        path: javascript/build/installed/JavaScript/MaterialX        
+        path: javascript/build/installed/JavaScript/MaterialX
 
   sdist:
     name: Python SDist

CHANGELOG.md

@@ -1,6 +1,32 @@
 # Change Log
 
-## [1.39.3] - Development
+## [1.39.4] - Development
+
+## [1.39.3] - 2025-03-07
+
+### Added
+- 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
+- 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 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 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,18 +1,18 @@
 # 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
-cmake_minimum_required(VERSION 3.24)
+cmake_minimum_required(VERSION 3.26)
 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)
@@ -49,6 +49,7 @@ option(MATERIALX_BUILD_TESTS "Build unit tests." OFF)
 option(MATERIALX_BUILD_BENCHMARK_TESTS "Build benchmark tests." OFF)
 
 option(MATERIALX_BUILD_SHARED_LIBS "Build MaterialX libraries as shared rather than static." OFF)
+option(MATERIALX_BUILD_DATA_LIBRARY "Build generated products from the MaterialX data library." OFF)
 option(MATERIALX_BUILD_MONOLITHIC "Build a single monolithic MaterialX library." OFF)
 option(MATERIALX_BUILD_USE_CCACHE "Enable the use of ccache to speed up build time, if present." ON)
 option(MATERIALX_PYTHON_LTO "Enable link-time optimizations for MaterialX Python." ON)
@@ -170,6 +171,7 @@ mark_as_advanced(MATERIALX_BUILD_RENDER_PLATFORMS)
 mark_as_advanced(MATERIALX_BUILD_OIIO)
 mark_as_advanced(MATERIALX_BUILD_BENCHMARK_TESTS)
 mark_as_advanced(MATERIALX_BUILD_SHARED_LIBS)
+mark_as_advanced(MATERIALX_BUILD_DATA_LIBRARY)
 mark_as_advanced(MATERIALX_BUILD_MONOLITHIC)
 mark_as_advanced(MATERIALX_BUILD_USE_CCACHE)
 mark_as_advanced(MATERIALX_NAMESPACE_SUFFIX)
@@ -252,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
@@ -356,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()
 
@@ -586,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)
 
@@ -599,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()

documents/CMakeLists.txt

@@ -3,23 +3,23 @@ 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)
 
 foreach(FOLDER ${MATERIALX_DOXYGEN_SOURCE_FOLDERS})
-    file(GLOB FOLDER_HEADERS CONFIGURE_DEPENDS ${FOLDER}/*.h)
+    file(GLOB FOLDER_HEADERS ${FOLDER}/*.h)
     list(APPEND DOXYGEN_INPUT_LIST ${FOLDER_HEADERS})
 endforeach()
 

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

javascript/MaterialXTest/browser/shaderGenerator.spec.js

@@ -34,17 +34,17 @@ describe('Generate Shaders', function ()
 
         const generators = []
         if (typeof mx.EsslShaderGenerator != 'undefined')
-            generators.push(new mx.EsslShaderGenerator());
+            generators.push(mx.EsslShaderGenerator.create());
         if (typeof mx.GlslShaderGenerator != 'undefined')
-            generators.push(new mx.GlslShaderGenerator());
+            generators.push(mx.GlslShaderGenerator.create());
         if (typeof mx.MslShaderGenerator != 'undefined')
-            generators.push(new mx.MslShaderGenerator());
+            generators.push(mx.MslShaderGenerator.create());
         if (typeof mx.OslShaderGenerator != 'undefined')
-            generators.push(new mx.OslShaderGenerator());
+            generators.push(mx.OslShaderGenerator.create());
         if (typeof mx.VkShaderGenerator != 'undefined')
-            generators.push(new mx.VkShaderGenerator());
+            generators.push(mx.VkShaderGenerator.create());
         if (typeof mx.MdlShaderGenerator != 'undefined')
-            generators.push(new mx.MdlShaderGenerator());
+            generators.push(mx.MdlShaderGenerator.create());
 
         const elem = mx.findRenderableElement(doc);
         for (let gen of generators)