@needle-tools/materialx 1.0.1-next.c315a2f → 1.0.1-next.df0e959

package/src/materialx.ts

@@ -1,15 +1,13 @@
-import { Context, delay, isDevEnvironment, ObjectUtils, GameObject, onBeforeRender } from "@needle-tools/engine";
-import type { MaterialX as MX } from "./materialx.types.js";
+import { Context, delay, isDevEnvironment, ObjectUtils, GameObject } from "@needle-tools/engine";
 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 type { MaterialXMaterial } from "./materialx.material.js";
+import { Light, MeshBasicMaterial, Object3D, PMREMGenerator, Texture } from "three";
+import { registerLights } from "./helper.js";
 
 
 export const state = new class {
-    materialXModule: MX.MODULE | null = null;
+    materialXModule: typeof MaterialX | null = null;
     materialXGenerator: any = null;
     materialXGenContext: any = null;
     materialXStdLib: any = null;
@@ -61,7 +59,7 @@ export async function ready(): Promise<void> {
                 },
             });
             if (debug) console.log("[MaterialX] module loaded", module);
-            state.materialXModule = module as MX.MODULE
+            state.materialXModule = module;
 
             // Initialize shader generator and context
             state.materialXGenerator = module.EsslShaderGenerator.create();
@@ -73,6 +71,7 @@ export async function ready(): Promise<void> {
             tempDoc.setDataLibrary(state.materialXStdLib);
 
             // TODO ShaderInterfaceType.SHADER_INTERFACE_REDUCED would be better, but doesn't actually seem to be supported in the MaterialX javascript bindings
+            const options = state.materialXGenContext.getOptions();
             state.materialXGenContext.getOptions().shaderInterfaceType = state.materialXModule.ShaderInterfaceType.SHADER_INTERFACE_COMPLETE;
 
             // SPECULAR_ENVIRONMENT_NONE: Do not use specular environment maps.
@@ -96,7 +95,7 @@ export async function ready(): Promise<void> {
             state.materialXGenContext.getOptions().hwMaxActiveLightSources = 4;
 
             // This prewarms the shader generation context to have all light types
-            await registerLights(state.materialXModule, state.materialXGenContext);
+            await registerLights(state.materialXModule, [], state.materialXGenContext);
 
             if (debug) console.log("[MaterialX]  generator initialized successfully");
         } catch (error) {
@@ -106,156 +105,124 @@ export async function ready(): Promise<void> {
     })();
 }
 
-type EnvironmentTextureSet = {
-    radianceTexture: Texture | null;
-    irradianceTexture: Texture | null;
-}
-
 // MaterialX Environment Manager - handles lighting and environment setup
 export class MaterialXEnvironment {
     private _context: Context | null = null;
-    private _lights: Array<Light> = [];
     private _lightData: any = null;
     private _lightCount: number = 0;
+    private _radianceTexture: Texture | null = null;
+    private _irradianceTexture: Texture | null = null;
     private _initializePromise: Promise<boolean> | null = null;
 
-    private _unsubscribehook: (() => void) | null = null;
-
     constructor() {
         if (debug) console.log("[MaterialX] Environment created");
     }
 
     // Initialize with Needle Engine context
-    async initialize(context: Context): Promise<boolean> {
+    async initializeFromContext(context: Context): Promise<boolean> {
+
+        // Prevent multiple initializations
         if (this._initializePromise) {
+            if (debug) console.log("[MaterialX] environment already initialized, skipping");
             return this._initializePromise;
         }
-        return this._initializePromise = this._initialize(context);
-    }
 
-    get lightData() { return this._lightData; }
-    get lightCount() { return this._lightCount || 0; }
-    getTextures(material: MaterialXMaterial) {
-        if (material.envMap) {
-            // If the material has its own envMap, we don't use the irradiance texture
-            return this._getTextures(material.envMap);
-        }
-        return this._getTextures(this._context?.scene.environment);
+        return this._initializePromise = this._initialize(context);
     }
 
-    private _pmremGenerator: PMREMGenerator | null = null;
-    private readonly _texturesCache: Map<Texture | null, EnvironmentTextureSet> = new Map();
+    getLightData() { return this._lightData; }
+    getLightCount() { return this._lightCount; }
+    
+    setRadianceTexture(texture: Texture) { this._radianceTexture = texture; }
+    getRadianceTexture() { return this._radianceTexture; }
 
-    private _initialize: (context: Context) => Promise<boolean> = async (context: Context) => {
-
-        this._context = context;
-        this._pmremGenerator = new PMREMGenerator(context.renderer);
-
-        this._unsubscribehook?.();
-        this._unsubscribehook = onBeforeRender(() => {
-            this.updateLighting(false);
-            this._getTextures(context.scene.environment);
-        })
-
-        // TODO remove this delay; we should wait for the scene lighting to be ready
-        // and then update the uniforms
-        while (!context.scene.environment) {
-            await delay(5);
-        }
-        this._getTextures(context.scene.environment);
-
-        // if (debug) {
-        //     console.log({ radiance: this._radianceTexture, irradiance: this._irradianceTexture });
-        //     // Show both of them on cubes in the scene
-        //     const unlitMat = new MeshBasicMaterial();
-        //     unlitMat.side = 2;
-        //     const radianceMat = unlitMat.clone();
-        //     radianceMat.map = this._radianceTexture;
-        //     const radianceCube = ObjectUtils.createPrimitive("Quad", { material: radianceMat });
-        //     const irradianceMat = unlitMat.clone();
-        //     irradianceMat.map = this._irradianceTexture;
-        //     const irradianceCube = ObjectUtils.createPrimitive("Quad", { material: irradianceMat });
-        //     context.scene.add(radianceCube);
-        //     context.scene.add(irradianceCube);
-        //     radianceCube.position.set(2, 0, 0);
-        //     irradianceCube.position.set(-2, 0, 0);
-        //     console.log("[MaterialX] environment initialized from Needle context", this, this._context.scene);
-        // }
-
-        this.updateLighting(true);
-
-        // Mark as initialized
-        return true;
-    }
+    getIrradianceTexture() { return this._irradianceTexture; }
+    setIrradianceTexture(texture: Texture) { this._irradianceTexture = texture; }
 
     // Reset the environment to allow re-initialization
     reset() {
         if (debug) console.log("[MaterialX] Resetting environment");
+        if (this._radianceTexture) {
+            this._radianceTexture.dispose();
+            this._radianceTexture = null;
+        }
+        if (this._irradianceTexture) {
+            this._irradianceTexture.dispose();
+            this._irradianceTexture = null;
+        }
         this._initializePromise = null;
-        this._lights = [];
+        // this.lights = [];
         this._lightData = null;
-        this._lightCount = 0;
-        this._pmremGenerator?.dispose();
-        this._pmremGenerator = null;
-        for(const textureSet of this._texturesCache.values()) {
-            textureSet.radianceTexture?.dispose();
-            textureSet.irradianceTexture?.dispose();
-        }
-        this._texturesCache.clear();
-
-        this._unsubscribehook?.();
-        this._unsubscribehook = null;
     }
 
-    private _getTextures(texture: Texture | null | undefined): {
-        radianceTexture: Texture | null,
-        irradianceTexture: Texture | null
-    } {
+    private _initialize: (context: Context) => Promise<boolean> = async (context: Context) => {
 
-        let res: EnvironmentTextureSet | undefined = this._texturesCache.get(texture || null);
-        if (res) {
-            return res;
-        }
+        this._context = context;
 
-        if (this._context && this._pmremGenerator && texture) {
-            if (debug) console.log("[MaterialX] Generating environment textures", texture.name);
-
-            const target = this._pmremGenerator.fromEquirectangular(texture);
-            const radianceRenderTarget = renderPMREMToEquirect(this._context.renderer, target.texture, 0.0, 1024, 512, target.height);
-            const irradianceRenderTarget = renderPMREMToEquirect(this._context.renderer, target.texture, 1.0, 32, 16, target.height);
-            target.dispose();
-            res = {
-                radianceTexture: radianceRenderTarget.texture,
-                irradianceTexture: irradianceRenderTarget.texture
-            }
+        // Clean up previous textures if they exist
+        if (this._radianceTexture) {
+            if (debug) console.log("[MaterialX] Disposing previous radiance texture");
+            this._radianceTexture.dispose();
+            this._radianceTexture = null;
         }
-        else {
-            res = {
-                radianceTexture: null,
-                irradianceTexture: null
-            }
+        if (this._irradianceTexture) {
+            if (debug) console.log("[MaterialX] Disposing previous irradiance texture");
+            this._irradianceTexture.dispose();
+            this._irradianceTexture = null;
         }
-        this._texturesCache.set(texture || null, res);
-        return res;
-    }
 
-    private updateLighting = (collectLights: boolean = false) => {
-        if (!this._context) return;
+        // Get renderer from context
+        const renderer = this._context.renderer;
 
-        // Find lights in scene
-        if (collectLights) {
-            const lights = new Array<Light>();
-            this._context.scene.traverse((object: Object3D) => {
-                if ((object as Light).isLight && GameObject.isActiveInHierarchy(object))
-                    lights.push(object as Light);
-            });
-            this._lights = lights;
+        // TODO remove this delay; we should wait for the scene lighting to be ready
+        // and then update the uniforms
+        let envMap = this._context.scene.environment;
+        while (!envMap) {
+            await delay(200);
+            envMap = this._context.scene.environment;
         }
-
-        if (state.materialXGenContext) {
-            const { lightData, lightCount } = getLightData(this._lights, state.materialXGenContext);
-            this._lightData = lightData;
-            this._lightCount = lightCount;
+        var pmrem = new PMREMGenerator(renderer);
+        const target = pmrem.fromEquirectangular(envMap);
+
+        const radianceRenderTarget = renderPMREMToEquirect(renderer, target.texture, 0.0, 1024, 512, target.height);
+        const irradianceRenderTarget = renderPMREMToEquirect(renderer, target.texture, 1.0, 32, 16, target.height);
+
+        this._radianceTexture = radianceRenderTarget.texture;
+        this._irradianceTexture = irradianceRenderTarget.texture;
+
+        // Clean up PMREM generator and its render target
+        target.dispose();
+        pmrem.dispose();
+
+        if (debug) {
+            console.log({ radiance: this._radianceTexture, irradiance: this._irradianceTexture });
+            // Show both of them on cubes in the scene
+            const unlitMat = new MeshBasicMaterial();
+            unlitMat.side = 2;
+            const radianceMat = unlitMat.clone();
+            radianceMat.map = this._radianceTexture;
+            const radianceCube = ObjectUtils.createPrimitive("Quad", { material: radianceMat });
+            const irradianceMat = unlitMat.clone();
+            irradianceMat.map = this._irradianceTexture;
+            const irradianceCube = ObjectUtils.createPrimitive("Quad", { material: irradianceMat });
+            this._context.scene.add(radianceCube);
+            this._context.scene.add(irradianceCube);
+            radianceCube.position.set(2, 0, 0);
+            irradianceCube.position.set(-2, 0, 0);
+            // await this.initializeLighting(defaultLightRigXml, renderer);
+            console.log("[MaterialX] environment initialized from Needle context", this, this._context.scene);
         }
+
+        // Find lights in scene
+        let lights = new Array<Light>();
+        this._context.scene.traverse((object: Object3D) => {
+            if ((object as Light).isLight && GameObject.isActiveInHierarchy(object))
+                lights.push(object as Light);
+        });
+
+        const { lightData, lightCount } = await registerLights(state.materialXModule, lights, state.materialXGenContext);
+        this._lightData = lightData;
+        this._lightCount = lightCount;
+        return true;
     }
 }

package/src/textureHelper.ts

@@ -40,7 +40,7 @@ export function renderPMREMToEquirect(renderer: WebGLRenderer, pmremTexture: Tex
     } else {
         imageHeight = 256; // Final fallback
     }
-
+    
     const maxMip = Math.log2(imageHeight) - 2;
     const cubeUVHeight = imageHeight;
     const cubeUVWidth = 3 * Math.max(Math.pow(2, maxMip), 7 * 16);
@@ -129,14 +129,14 @@ export function renderPMREMToEquirect(renderer: WebGLRenderer, pmremTexture: Tex
     const currentAutoClear = renderer.autoClear;
     const currentXrEnabled = renderer.xr.enabled;
     const currentShadowMapEnabled = renderer.shadowMap.enabled;
-
+    
     renderTarget.texture.generateMipmaps = true;
-
+    
     try {
         // Disable XR and shadow mapping during our render to avoid interference
         renderer.xr.enabled = false;
         renderer.shadowMap.enabled = false;
-
+        
         // Render to our target
         renderer.autoClear = true;
         renderer.setRenderTarget(renderTarget);
@@ -148,7 +148,7 @@ export function renderPMREMToEquirect(renderer: WebGLRenderer, pmremTexture: Tex
         renderer.autoClear = currentAutoClear;
         renderer.xr.enabled = currentXrEnabled;
         renderer.shadowMap.enabled = currentShadowMapEnabled;
-
+        
         // Clean up temporary objects
         geometry.dispose();
         material.dispose();
@@ -159,7 +159,7 @@ export function renderPMREMToEquirect(renderer: WebGLRenderer, pmremTexture: Tex
     renderTarget.texture.mapping = EquirectangularReflectionMapping;
 
     // Log mipmap infos
-    if (debug) console.log('[MaterialX] PMREM to Equirect Render Target:', {
+    if (debug) console.log('PMREM to Equirect Render Target:', {
         width: renderTarget.width,
         height: renderTarget.height,
         mipmaps: renderTarget.texture.mipmaps?.length,

package/src/utils.ts

@@ -2,7 +2,10 @@ import { Context, getParam } from "@needle-tools/engine";
 import { Mesh } from "three";
 
 export const debug = getParam("debugmaterialx");
-export const debugUpdate = getParam("debugmaterialxupdate");
+
+
+
+
 
 /**
  * =====================================
@@ -30,44 +33,6 @@ const patchWebGL2 = () => {
         }
         return uniform4fv.call(this, location, v);
     };
-
-    const uniform3fv = WebGL2RenderingContext.prototype.uniform3fv;
-    WebGL2RenderingContext.prototype.uniform3fv = function (location: WebGLUniformLocation | null, v: Float32Array | number[]) {
-        if (location) {
-            const uniformName = programAndNameToUniformLocation.get(location);
-            if (true) console.log("Calling uniform3fv", { location, v, name: uniformName?.name });
-        }
-        return uniform3fv.call(this, location, v);
-    };
-
-    const uniform3iv = WebGL2RenderingContext.prototype.uniform3iv;
-    WebGL2RenderingContext.prototype.uniform3iv = function (location: WebGLUniformLocation | null, v: Int32Array | number[]) {
-        if (location) {
-            const uniformName = programAndNameToUniformLocation.get(location);
-            if (true) console.log("Calling uniform3iv", { location, v, name: uniformName?.name });
-        }
-        return uniform3iv.call(this, location, v);
-    };
-
-    const uniform3uiv = WebGL2RenderingContext.prototype.uniform3uiv;
-    WebGL2RenderingContext.prototype.uniform3uiv = function (location: WebGLUniformLocation | null, v: Uint32Array | number[]) {
-        if (location) {
-            const uniformName = programAndNameToUniformLocation.get(location);
-            if (true) console.log("Calling uniform3uiv", { location, v, name: uniformName?.name });
-        }
-        return uniform3uiv.call(this, location, v);
-    };
-
-    const uniform3f = WebGL2RenderingContext.prototype.uniform3f;
-    WebGL2RenderingContext.prototype.uniform3f = function (location: WebGLUniformLocation
-        | null, x: number, y: number, z: number) {
-        if (location) {
-            const uniformName = programAndNameToUniformLocation.get(location);
-            if (uniformName?.name !== "diffuse")
-                if (true) console.log("Calling uniform3f", { location, x, y, z, name: uniformName?.name });
-        }
-        return uniform3f.call(this, location, x, y, z);
-    };
 };
 // patchWebGL2();