Merge branch 'main' into add-hextiling-nodes

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,48 +53,47 @@ 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
-          compiler: xcode
-          compiler_version: "14.1"
-          cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON
-          python: 3.9
-
         - name: MacOS_Xcode_15_Python311
           os: macos-14
           compiler: xcode
-          compiler_version: "15.1"
+          compiler_version: "15.4"
+          cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON
           python: 3.11
-          static_analysis: ON
-          cmake_config: -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 
         - name: MacOS_Xcode_15_Python312
-          os: macos-14
+          os: macos-15
           compiler: xcode
           compiler_version: "15.4"
           python: 3.12
           test_shaders: ON
 
+        - name: MacOS_Xcode_16_Python313
+          os: macos-15
+          compiler: xcode
+          compiler_version: "16.1"
+          python: 3.13
+          static_analysis: ON
+          cmake_config: -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+
         - name: MacOS_Xcode_DynamicAnalysis
-          os: macos-14
+          os: macos-15
           compiler: xcode
-          compiler_version: "15.4"
+          compiler_version: "16.1"
           python: None
           dynamic_analysis: ON
           cmake_config: -DMATERIALX_DYNAMIC_ANALYSIS=ON
 
-        - name: iOS_Xcode_15
-          os: macos-14
+        - name: iOS_Xcode_16
+          os: macos-15
           compiler: xcode
-          compiler_version: "15.4"
+          compiler_version: "16.1"
           python: None
           cmake_config: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=`xcrun --sdk iphoneos --show-sdk-path` -DCMAKE_OSX_ARCHITECTURES=arm64
 
@@ -104,20 +103,20 @@ jobs:
           python: 3.7
           cmake_config: -G "Visual Studio 16 2019" -A "Win32" -DMATERIALX_BUILD_SHARED_LIBS=ON
 
-        - name: Windows_VS2022_x64_Python311
-          os: windows-2022
-          architecture: x64
-          python: 3.11
-          cmake_config: -G "Visual Studio 17 2022" -A "x64"
-          test_shaders: ON
-
         - name: Windows_VS2022_x64_Python312
           os: windows-2022
           architecture: x64
           python: 3.12
           cmake_config: -G "Visual Studio 17 2022" -A "x64"
           upload_shaders: ON
 
+        - name: Windows_VS2022_x64_Python313
+          os: windows-2025
+          architecture: x64
+          python: 3.13
+          cmake_config: -G "Visual Studio 17 2022" -A "x64"
+          test_shaders: ON
+
     steps:
     - name: Sync Repository
       uses: actions/checkout@v4
@@ -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,28 +1,68 @@
 # Change Log
 
-## [1.39.2] - 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
 
 ### Added
 - Added support for the [Chiang Hair BSDF](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1968), with initial implementations in hardware shading languages and MDL.
 - Added support for the [Disney Principled](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2004) shading model, implemented as a language-independent graph.
+- Added support for [generic color ramps](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1884), using a graph-based ramp node with ten control points.
+- Added support for [Worley noise with solid cells](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2119), opening up new artistic options for metal flake shaders.
 - Added support for [data library referencing](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2054), enabling improved performance in shader generation.
 - Added support for [custom structure types](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1831) in MaterialX.
 - Added support for [functional equivalence](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2003) tests between MaterialX elements.
+- Added support for [geompropvalueuniform nodes](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2092), improving functional parity between MaterialX and USD.
 - Added support for [transmission effects](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2027) in the translation graph from Standard Surface to glTF PBR.
 - Added support for [coated emission](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2087) in the translation graph from Standard Surface to UsdPreviewSurface.
 - Added support for [Apple framework builds](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2020).
 - Added support for [MDL 1.9](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2102) in shader generation.
 - Added support for [viewdirection space](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2036) in hardware shading languages.
+- Added support for [image downsampling](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2159) in MaterialXRender.
+- Added support for [image difference statistics](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2160) in render tests.
 - Added a [combined version define](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2031) to MaterialX C++.
 - Added a [release signing workflow](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2009) to GitHub Actions.
 - Added documentation for [keyboard shortcuts](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2026) in the MaterialX Viewer.
 
 ### Changed
+- Improved the performance of [graph traversal](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2023) by skipping edges that have already been visited.
 - Reduced duplication between the [MSL and GLSL implementations](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2068) of nodes.
+- Updated the [UsdPreviewSurface shading model](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2084) to v2.6, maintaining the visual interpretation of existing assets.
+- Raised the [minimum OSL version](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2144) to v1.12.6 in OSL shader generation.
 
 ### Fixed
 - Fixed [unintentional camera orbiting](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2032) in the render view of the MaterialX Graph Editor.
 - Fixed [banding artifacts](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1977) in the MaterialX Viewer on MacOS.
+- Fixed the handling of [missing scenes](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2124) in the MaterialX Web Viewer.
+- Fixed an edge case for [node pasting](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2145) in the MaterialX Graph Editor.
+- Fixed the implementation of [texture filtering](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2158) in OSL shader generation.
+- Fixed the implementation of the [heighttonormal node](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2165) in OSL shader generation.
 - Fixed a call to the [anisotropic_vdf closure](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2016) in OSL shader generation.
 
 ### Removed