@needle-tools/materialx 1.0.4-next.6620f9d → 1.0.4-next.8713311

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/materialx",
-  "version": "1.0.4-next.6620f9d",
+  "version": "1.0.4-next.8713311",
   "type": "module",
   "main": "index.ts",
   "exports": {

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;
     }
@@ -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,4 +1,4 @@
-import { Camera, DoubleSide, FrontSide, GLSL3, MaterialParameters, Matrix3, Matrix4, Object3D, ShaderMaterial, Texture, Vector3 } from "three";
+import { Camera, DoubleSide, FrontSide, GLSL3, IUniform, MaterialParameters, Matrix3, Matrix4, Object3D, ShaderMaterial, Texture, Vector3 } from "three";
 import { debug } from "./utils.js";
 import { MaterialXEnvironment } from "./materialx.js";
 import { getLightData, getUniformValues, Loaders } from "./materialx.helper.js";
@@ -19,6 +19,8 @@ declare type MaterialXMaterialInitParameters = {
     side?: MaterialParameters['side'],
 }
 
+type Uniforms = Record<string, IUniform & { needsUpdate?: boolean }>;
+
 export class MaterialXMaterial extends ShaderMaterial {
 
     // copy(source: MaterialXMaterial): this {
@@ -114,6 +116,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 +130,7 @@ export class MaterialXMaterial extends ShaderMaterial {
             u_envIrradiance: { value: null, type: 't' },
             u_refractionEnv: { value: true },
             u_numActiveLightSources: { value: 0 },
-            u_lightData: { value: [], needsUpdate: false }, // 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) {
@@ -140,7 +148,7 @@ export class MaterialXMaterial extends ShaderMaterial {
     envMap: Texture | null = null; // Environment map texture, can be set externally
     updateUniforms = (context: Context, environment: MaterialXEnvironment, object: Object3D, camera: Camera) => {
 
-        const uniforms = this.uniforms;
+        const uniforms = this.uniforms as Uniforms;
 
         // TODO remove. Not sure why this is needed, but without it
         // we currently get some "swimming" where matrices are not up to date.
@@ -148,23 +156,23 @@ 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;
+            uniforms.u_worldMatrix.needsUpdate = true;
         }
 
         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);
+            uniforms.u_viewProjectionMatrix.needsUpdate = true;
         }
 
         if (uniforms.u_viewPosition) {
-            if (!uniforms.u_viewPosition.value?.isVector3) uniforms.u_viewPosition.value = new Vector3();
             uniforms.u_viewPosition.value.copy(camera.getWorldPosition(worldViewPos));
+            uniforms.u_viewPosition.needsUpdate = true;
         }
 
         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));
+            uniforms.u_worldInverseTransposeMatrix.needsUpdate = true;
         }
 
         // Update time uniforms
@@ -183,37 +191,40 @@ export class MaterialXMaterial extends ShaderMaterial {
 
     private updateEnvironmentUniforms = (environment: MaterialXEnvironment) => {
 
+        const uniforms = this.uniforms as Uniforms;
+
         // Get lighting data from environment
         const lightData = environment.lightData || null;
         const lightCount = environment.lightCount || 0;
         const textures = environment.getTextures(this) || null;
 
         // Update light count
-        if (this.uniforms.u_numActiveLightSources && lightCount >= 0) {
-            this.uniforms.u_numActiveLightSources.value = lightCount;
+        if (uniforms.u_numActiveLightSources && lightCount >= 0) {
+            uniforms.u_numActiveLightSources.value = lightCount;
         }
 
         // Update light data
         if (lightData?.length) {
-            this.uniforms.u_lightData.value = lightData;
-            if ("needsUpdate" in this.uniforms.u_lightData && this.uniforms.u_lightData.needsUpdate === false) {
+            uniforms.u_lightData.value = lightData;
+            if ("needsUpdate" in uniforms.u_lightData && uniforms.u_lightData.needsUpdate === false) {
                 if (debug) console.debug(`[MaterialX] LightData assigned (${this.name}, ${this.uuid})`, lightData);
-                this.uniforms.u_lightData.needsUpdate = undefined;
+                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;
+        if (uniforms.u_envRadiance) {
+            const prev = uniforms.u_envRadiance.value;
+            uniforms.u_envRadiance.value = textures.radianceTexture;
+            if (prev != textures.radianceTexture) uniforms.u_envRadiance.needsUpdate = true;
         }
-        if (this.uniforms.u_envRadianceMips) {
-            this.uniforms.u_envRadianceMips.value = Math.trunc(Math.log2(Math.max(textures.radianceTexture?.source.data.width ?? 0, textures.radianceTexture?.source.data.height ?? 0))) + 1;
+        if (uniforms.u_envRadianceMips) {
+            uniforms.u_envRadianceMips.value = Math.trunc(Math.log2(Math.max(textures.radianceTexture?.source.data.width ?? 0, textures.radianceTexture?.source.data.height ?? 0))) + 1;
         }
-        if (this.uniforms.u_envIrradiance) {
-            this.uniforms.u_envIrradiance.value = textures.irradianceTexture;
+        if (uniforms.u_envIrradiance) {
+            const prev = uniforms.u_envIrradiance.value;
+            uniforms.u_envIrradiance.value = textures.irradianceTexture;
+            if (prev != textures.irradianceTexture) uniforms.u_envIrradiance.needsUpdate = true;
         }
 
         this.uniformsNeedUpdate = true;