@needle-tools/materialx 1.0.3 → 1.0.4-next.29f5d7d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/materialx",
-  "version": "1.0.3",
+  "version": "1.0.4-next.29f5d7d",
   "type": "module",
   "main": "index.ts",
   "exports": {
@@ -14,10 +14,6 @@
       "require": "./codegen/register_types.js"
     }
   },
-  "peerDependencies": {
-    "@needle-tools/engine": "4.x",
-    "three": "npm:@needle-tools/three@^0.169.5"
-  },
   "devDependencies": {
     "@needle-tools/engine": "4.x",
     "@types/three": "0.169.0",
@@ -39,4 +35,4 @@
     "mtlx",
     "rendering"
   ]
-}
+}

package/src/materialx.helper.ts

@@ -216,7 +216,7 @@ function toThreeUniform(uniforms: any, type: string, value: any, name: string, l
             const key = type + ':' + name;
             if (!valueTypeWarningMap.has(key)) {
                 valueTypeWarningMap.set(key, true);
-                console.warn('MaterialX: Unsupported uniform type: ' + type + ' for uniform: ' + name, value);
+                console.warn(`MaterialX: Unsupported uniform type: ${type} for uniform: ${name}`);
             }
             break;
     }
@@ -370,7 +370,7 @@ function threeLightTypeToMaterialXNodeName(threeLightType) {
     }
 };
 
-type LightData = {
+export type LightData = {
     type: number, // Light type ID
     position: THREE.Vector3, // Position in world space
     direction: THREE.Vector3, // Direction in world space
@@ -469,7 +469,7 @@ export function getUniformValues(shaderStage: MaterialX.ShaderStage, loaders: Lo
                 const value = variable.getValue()?.getData();
                 const name = variable.getVariable();
                 if (debug) console.log("Adding uniform", { path: variable.getPath(), name: name, value: value, type: variable.getType().getName() });
-                threeUniforms[name] = toThreeUniform(uniforms, variable.getType().getName(), value, name, loaders, searchPath);;
+                threeUniforms[name] = toThreeUniform(uniforms, variable.getType().getName(), value, name, loaders, searchPath);
             }
         }
     }

package/src/materialx.material.ts

@@ -1,7 +1,7 @@
 import { Camera, DoubleSide, FrontSide, GLSL3, MaterialParameters, Matrix3, Matrix4, Object3D, ShaderMaterial, Texture, Vector3 } from "three";
 import { debug } from "./utils.js";
 import { MaterialXEnvironment } from "./materialx.js";
-import { getUniformValues, Loaders } from "./materialx.helper.js";
+import { getLightData, getUniformValues, Loaders } from "./materialx.helper.js";
 import { Context } from "@needle-tools/engine";
 
 
@@ -114,6 +114,12 @@ export class MaterialXMaterial extends ShaderMaterial {
         Object.assign(this.uniforms, {
             ...getUniformValues(init.shader.getStage('vertex'), init.loaders, searchPath),
             ...getUniformValues(init.shader.getStage('pixel'), init.loaders, searchPath),
+
+            u_worldMatrix: { value: new Matrix4() },
+            u_viewProjectionMatrix: { value: new Matrix4() },
+            u_viewPosition: { value: new Vector3() },
+            u_worldInverseTransposeMatrix: { value: new Matrix4() },
+
             u_envMatrix: { value: new Matrix4() },
             u_envRadiance: { value: null, type: 't' },
             u_envRadianceMips: { value: 8, type: 'i' },
@@ -122,7 +128,7 @@ export class MaterialXMaterial extends ShaderMaterial {
             u_envIrradiance: { value: null, type: 't' },
             u_refractionEnv: { value: true },
             u_numActiveLightSources: { value: 0 },
-            u_lightData: { value: [] }, // Array of light data
+            u_lightData: { value: [], needsUpdate: false }, // Array of light data. We need to set needsUpdate to false until we actually update it
         });
 
         if (debug) {
@@ -148,22 +154,18 @@ export class MaterialXMaterial extends ShaderMaterial {
 
         // Update standard transformation matrices
         if (uniforms.u_worldMatrix) {
-            if (!uniforms.u_worldMatrix.value?.isMatrix4) uniforms.u_worldMatrix.value = new Matrix4();
             uniforms.u_worldMatrix.value = object.matrixWorld;
         }
 
         if (uniforms.u_viewProjectionMatrix) {
-            if (!uniforms.u_viewProjectionMatrix.value?.isMatrix4) uniforms.u_viewProjectionMatrix.value = new Matrix4();
             uniforms.u_viewProjectionMatrix.value.multiplyMatrices(camera.projectionMatrix, camera.matrixWorldInverse);
         }
 
         if (uniforms.u_viewPosition) {
-            if (!uniforms.u_viewPosition.value?.isVector3) uniforms.u_viewPosition.value = new Vector3();
             uniforms.u_viewPosition.value.copy(camera.getWorldPosition(worldViewPos));
         }
 
         if (uniforms.u_worldInverseTransposeMatrix) {
-            if (!uniforms.u_worldInverseTransposeMatrix.value?.isMatrix4) uniforms.u_worldInverseTransposeMatrix.value = new Matrix4();
             uniforms.u_worldInverseTransposeMatrix.value.setFromMatrix3(normalMat.getNormalMatrix(object.matrixWorld));
         }
 
@@ -194,14 +196,15 @@ export class MaterialXMaterial extends ShaderMaterial {
         }
 
         // Update light data
-        if (lightData) {
+        if (lightData?.length) {
             this.uniforms.u_lightData.value = lightData;
+            if ("needsUpdate" in this.uniforms.u_lightData && this.uniforms.u_lightData.needsUpdate === false) {
+                if (debug) console.debug(`[MaterialX] LightData assigned (${this.name}, ${this.uuid})`, lightData);
+                this.uniforms.u_lightData.needsUpdate = undefined;
+            }
         }
 
         // Update environment uniforms
-        if (this.uniforms.u_envMatrix) {
-            this.uniforms.u_envMatrix.value = identityMatrix;
-        }
         if (this.uniforms.u_envRadiance) {
             this.uniforms.u_envRadiance.value = textures.radianceTexture;
         }

package/src/materialx.ts

@@ -4,7 +4,7 @@ import MaterialX from "../bin/JsMaterialXGenShader.js";
 import { debug } from "./utils.js";
 import { renderPMREMToEquirect } from "./textureHelper.js";
 import { Light, Material, MeshBasicMaterial, Object3D, PMREMGenerator, Texture } from "three";
-import { registerLights, getLightData } from "./materialx.helper.js";
+import { registerLights, getLightData, LightData } from "./materialx.helper.js";
 import type { MaterialXMaterial } from "./materialx.material.js";
 
 
@@ -115,7 +115,7 @@ type EnvironmentTextureSet = {
 export class MaterialXEnvironment {
     private _context: Context | null = null;
     private _lights: Array<Light> = [];
-    private _lightData: any = null;
+    private _lightData: null | LightData[] = null;
     private _lightCount: number = 0;
     private _initializePromise: Promise<boolean> | null = null;
 
@@ -133,7 +133,13 @@ export class MaterialXEnvironment {
         return this._initializePromise = this._initialize(context);
     }
 
-    get lightData() { return this._lightData; }
+    get lightData() {
+        // if (this._lightData === null) {
+        //     if(debug) console.warn("[MaterialX] Light data is not initialized, updating lighting");
+        //     this.updateLighting(true);
+        // }
+        return this._lightData;
+    }
     get lightCount() { return this._lightCount || 0; }
     getTextures(material: MaterialXMaterial) {
         if (material.envMap) {
@@ -197,7 +203,7 @@ export class MaterialXEnvironment {
         this._lightCount = 0;
         this._pmremGenerator?.dispose();
         this._pmremGenerator = null;
-        for(const textureSet of this._texturesCache.values()) {
+        for (const textureSet of this._texturesCache.values()) {
             textureSet.radianceTexture?.dispose();
             textureSet.irradianceTexture?.dispose();
         }