@needle-tools/materialx 1.7.3 → 1.7.4-next.bdb4b9a

package/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.7.4] - 2026-07-09
+
+### Fixed
+- MaterialX shader graphs that call generated world-matrix helpers from nodegraph functions now compile and render correctly while preserving Three.js instancing transforms.
+
 ## [1.7.3] - 2026-07-09
 
 ### Fixed

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@needle-tools/materialx",
   "description": "MaterialX material support for three.js and Needle Engine – render physically based MaterialX shaders in the browser via WebAssembly",
-  "version": "1.7.3",
+  "version": "1.7.4-next.bdb4b9a",
   "type": "module",
   "license": "PolyForm-Noncommercial-1.0.0",
   "main": "index.js",
@@ -78,4 +78,4 @@
     "type": "git",
     "url": "https://github.com/needle-tools/needle-engine-materialx.git"
   }
-}
+}

package/src/materialx.material.js

@@ -358,10 +358,10 @@ function patchImageAddressModes(fragmentShader) {
 }
 
 function patchInstancingTransforms(vertexShader) {
-    if (!vertexShader.includes('u_worldMatrix') || vertexShader.includes('mtlxWorldMatrix')) return vertexShader;
+    if (!vertexShader.includes('u_worldMatrix')) return vertexShader;
 
     let helper = `
-mat4 mtlxWorldMatrix()
+mat4 mx_three_worldMatrix()
 {
 #ifdef USE_INSTANCING
     return u_worldMatrix * instanceMatrix;
@@ -373,7 +373,7 @@ mat4 mtlxWorldMatrix()
 
     if (vertexShader.includes('u_worldInverseTransposeMatrix')) {
         helper += `
-vec3 mtlxWorldNormal(vec3 objectNormal)
+vec3 mx_three_worldNormal(vec3 objectNormal)
 {
     vec3 transformedNormal = objectNormal;
 #ifdef USE_INSTANCING
@@ -390,22 +390,28 @@ vec3 mtlxWorldNormal(vec3 objectNormal)
 `;
     }
 
-    vertexShader = vertexShader.replace(/void\s+main\s*\(\s*\)\s*\{/, `${helper}\nvoid main() {`);
+    const firstFunctionMatch = vertexShader.match(/\n(?:void|float|int|bool|vec[234]|mat[234])\s+[A-Za-z_]\w*\s*\(/);
+    if (firstFunctionMatch?.index !== undefined) {
+        vertexShader = `${vertexShader.slice(0, firstFunctionMatch.index)}${helper}${vertexShader.slice(firstFunctionMatch.index)}`;
+    } else {
+        vertexShader = vertexShader.replace(/void\s+main\s*\(\s*\)\s*\{/, `${helper}\nvoid main() {`);
+    }
+    vertexShader = vertexShader.replaceAll('mtlxWorldMatrix()', 'mx_three_worldMatrix()');
     vertexShader = vertexShader.replaceAll(
         'u_worldMatrix * vec4(position, 1.0)',
-        'mtlxWorldMatrix() * vec4(position, 1.0)',
+        'mx_three_worldMatrix() * vec4(position, 1.0)',
     );
     vertexShader = vertexShader.replaceAll(
         'mx_matrix_mul(u_worldMatrix, vec4(tangent, 0.0)).xyz',
-        '(mtlxWorldMatrix() * vec4(tangent, 0.0)).xyz',
+        '(mx_three_worldMatrix() * vec4(tangent, 0.0)).xyz',
     );
     vertexShader = vertexShader.replaceAll(
         'normalize(mx_matrix_mul(u_worldInverseTransposeMatrix, vec4(normal, 0.0)).xyz)',
-        'mtlxWorldNormal(normal)',
+        'mx_three_worldNormal(normal)',
     );
     vertexShader = vertexShader.replaceAll(
         'normalize(mat3(viewMatrix) * mat3(u_worldInverseTransposeMatrix) * normal)',
-        'normalize(mat3(viewMatrix) * mtlxWorldNormal(normal))',
+        'normalize(mat3(viewMatrix) * mx_three_worldNormal(normal))',
     );
 
     return vertexShader;