@needle-tools/materialx 1.0.1-next.b9467c8 → 1.0.1-next.b9638d9

package/src/materialx.material.ts

@@ -1,227 +0,0 @@
-import { Camera, DoubleSide, FrontSide, GLSL3, Matrix3, Matrix4, Mesh, Object3D, ShaderMaterial, Texture, Vector3 } from "three";
-import { debug } from "./utils.js";
-import { MaterialXEnvironment, state } from "./materialx.js";
-import { getUniformValues, Loaders } from "./materialx.helper.js";
-import { Context } from "@needle-tools/engine";
-
-
-// Add helper matrices for uniform updates (similar to MaterialX example)
-const identityMatrix = new Matrix4();
-const normalMat = new Matrix3();
-const viewProjMat = new Matrix4();
-const worldViewPos = new Vector3();
-
-declare type MaterialXMaterialInitParameters = {
-    name: string,
-    shader: any,
-    loaders: Loaders,
-    transparent?: boolean,
-}
-
-export class MaterialXMaterial extends ShaderMaterial {
-
-    // copy(source: MaterialXMaterial): this {
-    //     super.copy(source);
-    //     this.name = source.name;
-    //     this.uniforms = { ...source.uniforms }; // Shallow copy of uniforms
-    //     this.envMapIntensity = source.envMapIntensity;
-    //     this.envMap = source.envMap;
-    //     this.updateUniforms = source.updateUniforms; // Copy the update function
-    //     return this;
-    // }
-
-    constructor(init?: MaterialXMaterialInitParameters) {
-
-        // TODO: we need to properly copy the uniforms and other properties from the source material
-        if (!init) {
-            super();
-            return;
-        }
-
-        // Get vertex and fragment shader source, and remove #version directive for newer js. 
-        // It's added by three.js glslVersion.
-        let vertexShader = init.shader.getSourceCode("vertex");
-        let fragmentShader = init.shader.getSourceCode("pixel");
-
-        vertexShader = vertexShader.replace(/^#version.*$/gm, '').trim();
-        fragmentShader = fragmentShader.replace(/^#version.*$/gm, '').trim();
-
-        // MaterialX uses different attribute names than js defaults,
-        // so we patch the MaterialX shaders to match the js standard names.
-        // Otherwise, we'd have to modify the mesh attributes (see original MaterialX for reference).
-
-        // Patch vertexShader
-        vertexShader = vertexShader.replace(/\bi_position\b/g, 'position');
-        vertexShader = vertexShader.replace(/\bi_normal\b/g, 'normal');
-        vertexShader = vertexShader.replace(/\bi_texcoord_0\b/g, 'uv');
-        vertexShader = vertexShader.replace(/\bi_texcoord_1\b/g, 'uv1');
-        vertexShader = vertexShader.replace(/\bi_tangent\b/g, 'tangent');
-        vertexShader = vertexShader.replace(/\bi_color_0\b/g, 'color');
-
-        // Patch fragmentShader
-        fragmentShader = fragmentShader.replace(/\bi_position\b/g, 'position');
-        fragmentShader = fragmentShader.replace(/\bi_normal\b/g, 'normal');
-        fragmentShader = fragmentShader.replace(/\bi_texcoord_0\b/g, 'uv');
-        fragmentShader = fragmentShader.replace(/\bi_texcoord_1\b/g, 'uv1');
-        fragmentShader = fragmentShader.replace(/\bi_tangent\b/g, 'tangent');
-        fragmentShader = fragmentShader.replace(/\bi_color_0\b/g, 'color');
-
-        // Remove `in vec3 position;` and so on since they're already declared by ShaderMaterial
-        vertexShader = vertexShader.replace(/in\s+vec3\s+position;/g, '');
-        vertexShader = vertexShader.replace(/in\s+vec3\s+normal;/g, '');
-        vertexShader = vertexShader.replace(/in\s+vec3\s+uv;/g, '');
-        vertexShader = vertexShader.replace(/in\s+vec3\s+uv1;/g, '');
-        vertexShader = vertexShader.replace(/in\s+vec4\s+tangent;/g, '');
-        vertexShader = vertexShader.replace(/in\s+vec4\s+color;/g, '');
-
-        // Patch uv 2-component to 3-component (`texcoord_0 = uv;` needs to be replaced with `texcoord_0 = vec3(uv, 0.0);`)
-        // TODO what if we actually have a 3-component UV? Not sure what three.js does then
-        vertexShader = vertexShader.replace(/texcoord_0 = uv;/g, 'texcoord_0 = vec3(uv, 0.0);');
-
-        // Patch units – seems MaterialX uses different units and we end up with wrong light values?
-        // result.direction = light.position - position;
-        fragmentShader = fragmentShader.replace(
-            /result\.direction\s*=\s*light\.position\s*-\s*position;/g,
-            'result.direction = (light.position - position) * 10.0 / 1.0;');
-
-        // Add tonemapping and colorspace handling
-        // Replace `out vec4 out1;` with `out vec4 gl_FragColor;`
-        fragmentShader = fragmentShader.replace(
-            /out\s+vec4\s+out1;/,
-            'layout(location = 0) out vec4 pc_fragColor;\n#define gl_FragColor pc_fragColor');
-
-        // Replace `out1 = vec4(<CAPTURE>)` with `gl_FragColor = vec4(<CAPTURE>)` and tonemapping/colorspace handling
-        fragmentShader = fragmentShader.replace(/^\s*out1\s*=\s*vec4\((.*)\);/gm, `
-    gl_FragColor = vec4($1);
-    #include <tonemapping_fragment>
-    #include <colorspace_fragment>`);
-
-        const searchPath = ""; // Could be derived from the asset path if needed
-        const flipV = false; // Set based on your geometry requirements
-        const isTransparent = init.transparent ?? false;
-        super({
-            name: init.name,
-            uniforms: {
-                ...getUniformValues(init.shader.getStage('vertex'), init.loaders, searchPath, flipV),
-                ...getUniformValues(init.shader.getStage('pixel'), init.loaders, searchPath, flipV),
-            },
-            vertexShader: vertexShader,
-            fragmentShader: fragmentShader,
-            glslVersion: GLSL3,
-            transparent: isTransparent,
-            side: FrontSide,
-            depthTest: true,
-            depthWrite: !isTransparent,
-        });
-
-
-
-        Object.assign(this.uniforms, {
-            u_envMatrix: { value: new Matrix4() },
-            u_envRadiance: { value: null, type: 't' },
-            u_envRadianceMips: { value: 8, type: 'i' },
-            // TODO we need to figure out how we can set a PMREM here... doing many texture samples is prohibitively expensive
-            u_envRadianceSamples: { value: 8, type: 'i' },
-            u_envIrradiance: { value: null, type: 't' },
-            u_refractionEnv: { value: true },
-            u_numActiveLightSources: { value: 0 },
-            u_lightData: { value: [] }, // Array of light data
-        });
-
-        if (debug) {
-            // Get lighting and environment data from MaterialX environment
-            console.group("[MaterialX]: ", name);
-            console.log("Vertex shader length:", vertexShader.length, vertexShader);
-            console.log("Fragment shader length:", fragmentShader.length, fragmentShader);
-            console.groupEnd();
-        }
-
-    }
-
-
-    envMapIntensity: number = 1.0; // Default intensity for environment map
-    envMap: Texture | null = null; // Environment map texture, can be set externally
-    updateUniforms = (context: Context, environment: MaterialXEnvironment, object: Object3D, camera: Camera) => {
-
-        const uniforms = this.uniforms;
-
-        if (!uniforms) return;
-
-        // TODO remove. Not sure why this is needed, but without it
-        // we currently get some "swimming" where matrices are not up to date.
-        camera.updateMatrixWorld(true);
-
-        // 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));
-        }
-
-        // Update time uniforms
-        if (uniforms.u_time) {
-            uniforms.u_time.value = context.time.time;
-        }
-        if (uniforms.u_frame) {
-            uniforms.u_frame.value = context.time.frame;
-        }
-
-        // Update light uniforms
-        this.updateEnvironmentUniforms(environment);
-
-        this.uniformsNeedUpdate = true;
-    }
-
-    private updateEnvironmentUniforms = (environment: MaterialXEnvironment) => {
-
-        // Get lighting data from environment
-        const lightData = environment.lightData || null;
-        const lightCount = environment.lightCount || 0;
-        const textures = environment.getTextures(this) || null;
-
-        // Update each generated material's lighting uniforms
-        if (!this.uniforms) return;
-
-        // Update light count
-        if (this.uniforms.u_numActiveLightSources && lightCount >= 0) {
-            this.uniforms.u_numActiveLightSources.value = lightCount;
-        }
-
-        // Update light data if we have lights
-        if (lightData) {
-            this.uniforms.u_lightData.value = lightData;
-            if (debug) console.log("[MaterialX] Updated light data for material", this.name, lightData, this.uniforms,);
-        }
-        else if (debug) console.warn("[MaterialX] No light data available to update uniforms for material", this.name);
-
-        // 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 || null;
-        }
-        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 (this.uniforms.u_envIrradiance) {
-            this.uniforms.u_envIrradiance.value = textures.irradianceTexture;
-        }
-
-        this.uniformsNeedUpdate = true;
-    }
-}

package/src/materialx.types.d.ts

@@ -1,50 +0,0 @@
-
-
-
-export namespace MaterialX {
-
-    export type MODULE = {
-        ShaderInterfaceType: any;
-        HwSpecularEnvironmentMethod: any;
-        HwShaderGenerator: {
-            bindLightShader(def: any, id: number, genContext: GenContext): void;
-            unbindLightShaders(context: any): void;
-        };
-        createDocument(): Document;
-        readFromXmlString(doc: Document, xml: string, unknown: string): void;
-        loadStandardLibraries(genContext: GenContext): StandardLibrary;
-        isTransparentSurface(renderableElement: any, target: string): boolean;
-    }
-
-
-    export type GenContext = {
-    }
-
-    export type StandardLibrary = {
-
-    }
-    
-    // https://github.com/AcademySoftwareFoundation/MaterialX/blob/b74787db6544283dc32afc8085ebc93cabe937cb/source/MaterialXGenShader/ShaderStage.h#L56
-    export type ShaderStage = {
-        getUniformBlocks(): Record<string, any>;
-    }
-
-    export type Document = {
-        setDataLibrary(lib: StandardLibrary): void;
-        importLibrary(lib: Document): void;
-
-        getNodes(): Node[];
-    }
-
-    export type Node = {
-        getType(): string;
-    }
-
-    export type Matrix = {
-        numRows(): number;
-        numColumns(): number;
-        get size(): number;
-        getItem(row: number, col: number): number;
-    }
-
-}