@needle-tools/materialx 1.2.0 → 1.2.1-next.343c31f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/materialx",
-  "version": "1.2.0",
+  "version": "1.2.1-next.343c31f",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -56,4 +56,4 @@
     "mtlx",
     "rendering"
   ]
-}
+}

package/src/materialx.js

@@ -3,6 +3,7 @@ import { debug } from "./utils.js";
 import { renderPMREMToEquirect } from "./utils.texture.js";
 import { Light, Mesh, MeshBasicMaterial, Object3D, PlaneGeometry, PMREMGenerator, Scene, Texture, WebGLRenderer } from "three";
 import { registerLights, getLightData } from "./materialx.helper.js";
+import { whiteTexture } from "./utils.texture.js";
 
 export const state = new class {
     /** @type {import("./materialx.types.js").MaterialX.MODULE | null} */
@@ -113,8 +114,9 @@ export async function ready() {
  */
 
 /**
- * MaterialXEnvironment manages the environment settings for MaterialX materials.
+ * MaterialXEnvironment manages the environment settings for MaterialX materials. 
  */
+// @dont-generate-component
 export class MaterialXEnvironment {
 
     /**
@@ -256,7 +258,14 @@ export class MaterialXEnvironment {
             // If the material has its own envMap, we don't use the irradiance texture
             return this._getTextures(material.envMap);
         }
-        return this._getTextures(this._scene.environment);
+
+        // Use the scene background for lighting if no environment is available
+        // If we don't do this we don't see the correct lighting for scenes exported with 'Environment Lighting: Color' and 'Environment Reflections: Skybox'  
+        const skybox = this._scene.environment || this._scene.background;
+        if (skybox instanceof Texture) {
+            return this._getTextures(skybox);
+        }
+        return this._getTextures(null);
     }
 
     /** @type {PMREMGenerator | null} */
@@ -284,6 +293,12 @@ export class MaterialXEnvironment {
      * @returns {{radianceTexture: Texture | null, irradianceTexture: Texture | null}}
      */
     _getTextures(texture) {
+
+        // Fallback to white texture if no texture is provided
+        if (!texture) {
+            texture = whiteTexture;
+        }
+
         /** @type {EnvironmentTextureSet | undefined} */
         let res = this._texturesCache.get(texture || null);
         if (res) {
@@ -322,7 +337,7 @@ export class MaterialXEnvironment {
             const lights = new Array();
             this._scene.traverse((/** @type {Object3D} */ object) => {
                 if ((/** @type {Light} */ (object)).isLight && object.visible)
-                    lights.push(/** @type {Light} */ (object));
+                    lights.push(/** @type {Light} */(object));
             });
             this._lights = lights;
         }

package/src/materialx.material.js

@@ -23,6 +23,7 @@ const worldViewPos = new Vector3();
  * @typedef {"highp" | "mediump" | "lowp"} Precision
  */
 
+// @dont-generate-component
 export class MaterialXMaterial extends ShaderMaterial {
 
     /** The original name of the shader 
@@ -258,21 +259,25 @@ export class MaterialXMaterial extends ShaderMaterial {
         // Update standard transformation matrices
         if (uniforms.u_worldMatrix) {
             uniforms.u_worldMatrix.value = object.matrixWorld;
+            // @ts-ignore
             uniforms.u_worldMatrix.needsUpdate = true;
         }
 
         if (uniforms.u_viewProjectionMatrix) {
             uniforms.u_viewProjectionMatrix.value.multiplyMatrices(camera.projectionMatrix, camera.matrixWorldInverse);
+            // @ts-ignore
             uniforms.u_viewProjectionMatrix.needsUpdate = true;
         }
 
         if (uniforms.u_worldInverseTransposeMatrix) {
             uniforms.u_worldInverseTransposeMatrix.value.setFromMatrix3(normalMat.getNormalMatrix(object.matrixWorld));
+            // @ts-ignore
             uniforms.u_worldInverseTransposeMatrix.needsUpdate = true;
         }
 
         if (uniforms.u_viewPosition) {
             uniforms.u_viewPosition.value.copy(camera.getWorldPosition(worldViewPos));
+            // @ts-ignore
             uniforms.u_viewPosition.needsUpdate = true;
         }
 
@@ -294,10 +299,10 @@ export class MaterialXMaterial extends ShaderMaterial {
             uniforms.u_frame.value = frame;
         }
 
+        this.uniformsNeedUpdate = true;
+
         // Update light uniforms
         this.updateEnvironmentUniforms(environment);
-
-        this.uniformsNeedUpdate = true;
     }
 
     /**
@@ -331,6 +336,7 @@ export class MaterialXMaterial extends ShaderMaterial {
         if (uniforms.u_envRadiance) {
             const prev = uniforms.u_envRadiance.value;
             uniforms.u_envRadiance.value = textures.radianceTexture;
+            // @ts-ignore
             if (prev != textures.radianceTexture) uniforms.u_envRadiance.needsUpdate = true;
         }
         if (uniforms.u_envRadianceMips) {
@@ -339,6 +345,7 @@ export class MaterialXMaterial extends ShaderMaterial {
         if (uniforms.u_envIrradiance) {
             const prev = uniforms.u_envIrradiance.value;
             uniforms.u_envIrradiance.value = textures.irradianceTexture;
+            // @ts-ignore
             if (prev != textures.irradianceTexture) uniforms.u_envIrradiance.needsUpdate = true;
         }
 

package/src/utils.texture.js

@@ -3,6 +3,13 @@ import { getParam } from './utils.js';
 
 const debug = getParam("debugmaterialx");
 
+export const whiteTexture = new Texture();
+whiteTexture.needsUpdate = true;
+whiteTexture.image = new Image();
+whiteTexture.image.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAAAXNSR0IB2cksfwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAANQTFRFr6+vGqg52AAAAAxJREFUeJxjZGBEgQAAWAAJLpjsTQAAAABJRU5ErkJggg=="
+
+
+
 /**
  * Renders a PMREM environment map to an equirectangular texture with specified roughness
  * @param {WebGLRenderer} renderer - Three.js WebGL renderer