Merge branch 'AcademySoftwareFoundation:main' into patch_js_packages

Author: kwokcb

.github/workflows/main.yml

@@ -67,33 +67,33 @@ jobs:
           cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON
           python: 3.11
 
-        - name: MacOS_Xcode_16_Python312
+        - name: MacOS_Xcode_16_Python313
           os: macos-15
           compiler: xcode
-          compiler_version: "16.1"
-          python: 3.12
+          compiler_version: "16.4"
+          python: 3.13
           test_shaders: ON
 
-        - name: MacOS_Xcode_16_Python313
-          os: macos-15
+        - name: MacOS_Xcode_26_Python313
+          os: macos-26
           compiler: xcode
-          compiler_version: "16.1"
+          compiler_version: "26.0"
           python: 3.13
           static_analysis: ON
           cmake_config: -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 
         - name: MacOS_Xcode_DynamicAnalysis
-          os: macos-15
+          os: macos-26
           compiler: xcode
-          compiler_version: "16.1"
+          compiler_version: "26.0"
           python: None
           dynamic_analysis: ON
           cmake_config: -DMATERIALX_DYNAMIC_ANALYSIS=ON
 
-        - name: iOS_Xcode_16
-          os: macos-15
+        - name: iOS_Xcode_26
+          os: macos-26
           compiler: xcode
-          compiler_version: "16.1"
+          compiler_version: "26.0"
           python: None
           cmake_config: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=`xcrun --sdk iphoneos --show-sdk-path` -DCMAKE_OSX_ARCHITECTURES=arm64
 
@@ -144,15 +144,9 @@ jobs:
       if: runner.os == 'macOS'
       run: |
         if [ "${{ matrix.compiler_version }}" != 'None' ]; then
-          if [ "${{ matrix.compiler }}" = "gcc" ]; then
-            brew install gcc@${{ matrix.compiler_version }}
-            echo "CC=gcc-${{ matrix.compiler_version }}" >> $GITHUB_ENV
-            echo "CXX=g++-${{ matrix.compiler_version }}" >> $GITHUB_ENV
-          else
-            ls -ls /Applications/
-            sudo xcode-select -switch /Applications/Xcode_${{ matrix.compiler_version }}.app
-            echo "CC=clang" >> $GITHUB_ENV
-            echo "CXX=clang++" >> $GITHUB_ENV
+          sudo xcode-select -switch /Applications/Xcode_${{ matrix.compiler_version }}.app
+          if [ "${{ matrix.os }}" == 'macos-26' ]; then
+            xcodebuild -downloadComponent MetalToolchain
           fi
         fi
 

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Change Log
 
-## [1.39.4] - Release Candidate
+## [1.39.5] - Development
+
+## [1.39.4] - 2025-09-15
 
 ### Added
 - Added support for [WebGPU Shading Language](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2407) in MaterialX shader generation.

CMakeLists.txt

@@ -1,7 +1,7 @@
 # MaterialX Version
 set(MATERIALX_MAJOR_VERSION 1)
 set(MATERIALX_MINOR_VERSION 39)
-set(MATERIALX_BUILD_VERSION 4)
+set(MATERIALX_BUILD_VERSION 5)
 set(MATERIALX_LIBRARY_VERSION ${MATERIALX_MAJOR_VERSION}.${MATERIALX_MINOR_VERSION}.${MATERIALX_BUILD_VERSION})
 
 # CMake setup

documents/Specification/MaterialX.PBRSpec.md

@@ -388,8 +388,8 @@ Note that the standard library includes definitions for [**`displacement`**](./M
 * **`artistic_ior`**: Converts the artistic parameterization reflectivity and edge_color to complex IOR values. To be used with the [<conductor_bsdf>](#node-conductor-bsdf) node.
     * `reflectivity` (color3): Reflectivity per color component at facing angles. Defaults to (0.947, 0.776, 0.371).
     * `edge_color` (color3): Reflectivity per color component at grazing angles. Defaults to (1.0, 0.982, 0.753).
-    * `ior` (**output**, vector3): Computed index of refraction.
-    * `extinction` (**output**, vector3): Computed extinction coefficient.
+    * `ior` (**output**, color3): Computed index of refraction.
+    * `extinction` (**output**, color3): Computed extinction coefficient.
 
 <a id="node-chiang-hair-roughness"> </a>
 

libraries/bxdf/translation/standard_surface_to_gltf_pbr.mtlx

@@ -8,6 +8,7 @@
     <input name="specular_anisotropy" type="float" value="0.0" />
     <input name="specular_rotation" type="float" value="0.0" />
     <input name="specular_roughness" type="float" value="0.2" />
+    <input name="specular_IOR" type="float" value="1.5" />
     <input name="transmission" type="float" value="0" />
     <input name="transmission_color" type="color3" value="1, 1, 1" />
     <input name="transmission_depth" type="float" value="0" />
@@ -19,10 +20,13 @@
     <input name="coat_roughness" type="float" value="0.1" />
     <input name="emission" type="float" value="0" />
     <input name="emission_color" type="color3" value="1, 1, 1" />
+    <input name="normal" type="vector3" defaultgeomprop="Nworld" />
+    <input name="tangent" type="vector3" defaultgeomprop="Tworld" />
 
     <output name="base_color_out" type="color3" />
     <output name="metallic_out" type="float" />
     <output name="roughness_out" type="float" />
+    <output name="ior_out" type="float" />
     <output name="anisotropy_strength_out" type="float" />
     <output name="anisotropy_rotation_out" type="float" />
     <output name="transmission_out" type="float" />
@@ -33,6 +37,9 @@
     <output name="clearcoat_out" type="float" />
     <output name="clearcoat_roughness_out" type="float" />
     <output name="emissive_out" type="color3" />
+    <output name="emissive_strength_out" type="float" />
+    <output name="normal_out" type="vector3" />
+    <output name="tangent_out" type="vector3" />
   </nodedef>
 
   <nodegraph name="NG_standard_surface_to_gltf_pbr" nodedef="ND_standard_surface_to_gltf_pbr">
@@ -186,14 +193,30 @@
     </dot>
 
     <!-- Emission -->
-    <multiply name="emissive" type="color3">
-      <input name="in1" type="color3" interfacename="emission_color" />
-      <input name="in2" type="float" interfacename="emission" />
-    </multiply>
+    <dot name="emissive" type="color3">
+      <input name="in" type="color3" interfacename="emission_color" />
+    </dot>
+    <dot name="emissive_strength" type="float">
+      <input name="in" type="float" interfacename="emission" />
+    </dot>
+
+    <!-- Specular Index of Refraction -->
+    <dot name="ior" type="float">
+      <input name="in" type="float" interfacename="specular_IOR" />
+    </dot>
+
+    <!-- Geometry -->
+    <dot name="normal" type="vector3">
+      <input name="in" type="vector3" interfacename="normal" />
+    </dot>
+    <dot name="tangent" type="vector3">
+      <input name="in" type="vector3" interfacename="tangent" />
+    </dot>
 
     <output name="base_color_out" type="color3" nodename="base_color" />
     <output name="metallic_out" type="float" nodename="metallic" />
     <output name="roughness_out" type="float" nodename="roughness" />
+    <output name="ior_out" type="float" nodename="ior" />
     <output name="anisotropy_strength_out" type="float" nodename="anisotropy_strength" />
     <output name="anisotropy_rotation_out" type="float" nodename="anisotropy_rotation" />
     <output name="transmission_out" type="float" nodename="transmission" />
@@ -204,6 +227,9 @@
     <output name="clearcoat_out" type="float" nodename="clearcoat" />
     <output name="clearcoat_roughness_out" type="float" nodename="clearcoat_roughness" />
     <output name="emissive_out" type="color3" nodename="emissive" />
+    <output name="emissive_strength_out" type="float" nodename="emissive_strength" />
+    <output name="normal_out" type="vector3" nodename="normal" />
+    <output name="tangent_out" type="vector3" nodename="tangent" />
 
   </nodegraph>
 </materialx>

libraries/pbrlib/genglsl/lib/mx_closure_type.glsl

@@ -15,3 +15,8 @@ struct ClosureData {
     vec3 P;
     float occlusion;
 };
+
+ClosureData makeClosureData(int closureType, vec3 L, vec3 V, vec3 N, vec3 P, float occlusion)
+{
+    return $closureDataConstructor;
+}

libraries/pbrlib/genglsl/lib/mx_environment_fis.glsl

@@ -32,7 +32,7 @@ vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distributio
         float VdotH = clamp(dot(V, H), M_FLOAT_EPS, 1.0);
 
         // Sample the environment light from the given direction.
-        vec3 Lw = tangentToWorld * L;
+        vec3 Lw = mx_matrix_mul(tangentToWorld, L);
         float pdf = mx_ggx_NDF(H, alpha) * G1V / (4.0 * NdotV);
         float lod = mx_latlong_compute_lod(Lw, pdf, float($envRadianceMips - 1), envRadianceSamples);
         vec3 sampleColor = mx_latlong_map_lookup(Lw, $envMatrix, lod, $envRadiance);

libraries/pbrlib/genglsl/lib/mx_generate_prefilter_env.glsl

@@ -52,7 +52,7 @@ vec3 mx_generate_prefilter_env()
         float G = mx_ggx_smith_G2(NdotL, NdotV, alpha);
 
         // Sample the environment light from the given direction.
-        vec3 Lw = tangentToWorld * L;
+        vec3 Lw = mx_matrix_mul(tangentToWorld, L);
         float pdf = mx_ggx_NDF(H, vec2(alpha)) * G1V / (4.0 * NdotV);
         float lod = mx_latlong_compute_lod(Lw, pdf, float($envRadianceMips - 1), envRadianceSamples);
         vec3 sampleColor = mx_latlong_map_lookup(Lw, $envMatrix, lod, $envRadiance);

libraries/pbrlib/genglsl/lib/mx_microfacet_sheen.glsl

@@ -136,7 +136,7 @@ mat3 mx_orthonormal_basis_ltc(vec3 V, vec3 N, float NdotV)
 float mx_zeltner_sheen_brdf(vec3 L, vec3 V, vec3 N, float NdotV, float roughness)
 {
     mat3 toLTC = transpose(mx_orthonormal_basis_ltc(V, N, NdotV));
-    vec3 w = toLTC * L;
+    vec3 w = mx_matrix_mul(toLTC, L);
 
     float aInv = mx_zeltner_sheen_ltc_aInv(NdotV, roughness);
     float bInv = mx_zeltner_sheen_ltc_bInv(NdotV, roughness);
@@ -183,7 +183,7 @@ vec3 mx_zeltner_sheen_importance_sample(vec2 Xi, vec3 V, vec3 N, float roughness
     pdf = max(w.z, 0.0) * M_PI_INV * mx_square(aInv * lenSqr);
 
     mat3 fromLTC = mx_orthonormal_basis_ltc(V, N, NdotV);
-    w = fromLTC * w;
+    w = mx_matrix_mul(fromLTC, w);
 
     return w;
 }

libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl

@@ -374,7 +374,7 @@ vec3 mx_fresnel_airy(float cosTheta, FresnelData fd)
 
     // Reflectance term for m>0 (pairs of diracs)
     Cm = Rs - T121.x;
-    for (int m=1; m<=2; m++)
+    for (int m = 1; m <= AIRY_FRESNEL_ITERATIONS; m++)
     {
         Cm *= r123p;
         Sm  = 2.0 * mx_eval_sensitivity(float(m) * opd, float(m)*(phi23p+vec3(phi21.x)));
@@ -389,7 +389,7 @@ vec3 mx_fresnel_airy(float cosTheta, FresnelData fd)
 
     // Reflectance term for m>0 (pairs of diracs)
     Cm = Rp - T121.y;
-    for (int m=1; m<=2; m++)
+    for (int m = 1; m <= AIRY_FRESNEL_ITERATIONS; m++)
     {
         Cm *= r123s;
         Sm  = 2.0 * mx_eval_sensitivity(float(m) * opd, float(m)*(phi23s+vec3(phi21.y)));
@@ -400,7 +400,7 @@ vec3 mx_fresnel_airy(float cosTheta, FresnelData fd)
     I *= 0.5;
 
     // Convert back to RGB reflectance
-    I = clamp(XYZ_TO_RGB * I, 0.0, 1.0);
+    I = clamp(mx_matrix_mul(XYZ_TO_RGB, I), 0.0, 1.0);
 
     return I;
 }
@@ -493,7 +493,7 @@ vec2 mx_latlong_projection(vec3 dir)
 
 vec3 mx_latlong_map_lookup(vec3 dir, mat4 transform, float lod, $texSamplerSignature)
 {
-    vec3 envDir = normalize((transform * vec4(dir,0.0)).xyz);
+    vec3 envDir = normalize(mx_matrix_mul(transform, vec4(dir,0.0)).xyz);
     vec2 uv = mx_latlong_projection(envDir);
     return textureLod($texSamplerSampler2D, uv, lod).rgb;
 }