@needle-tools/materialx 1.1.1-next.5900297 → 1.1.1-next.623fc20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/materialx",
-  "version": "1.1.1-next.5900297",
+  "version": "1.1.1-next.623fc20",
   "type": "module",
   "main": "index.ts",
   "exports": {

package/src/loader/loader.three.ts

@@ -14,10 +14,19 @@ export type MaterialX_root_extension = {
     mtlx: string;
     /** MaterialX texture pointers */
     textures: Array<{ name: string, pointer: string }>;
+    shaders?: Array<{
+        /** The materialx node name */
+        name: string,
+        /** The original name of the shader */
+        originalName: string,
+    }>,
 }
 
 export type MaterialX_material_extension = {
-    name: string; // Material name reference
+    /** The MaterialX material name */
+    name: string;
+    /** The index of the shader in the shaders array of the root extension. */
+    shader?: number;
 }
 
 type MaterialDefinition = {
@@ -240,8 +249,15 @@ export class MaterialXLoader implements GLTFLoaderPlugin {
 
             const shader = state.materialXGenerator.generate(elementName, renderableElement, state.materialXGenContext);
 
+            const rootExtension = this.materialX_root_data;
+
+            const shaderInfo = rootExtension && material_extension.shader !== undefined && material_extension.shader >= 0
+                ? rootExtension.shaders?.[material_extension.shader]
+                : null;
+
             const shaderMaterial = new MaterialXMaterial({
                 name: material_extension.name,
+                shaderName: shaderInfo?.originalName || shaderInfo?.name || null,
                 shader,
                 context: this.context,
                 parameters: {
@@ -256,9 +272,8 @@ export class MaterialXLoader implements GLTFLoaderPlugin {
                         const filenameWithoutExt = url.split('/').pop()?.split('.').shift() || '';
 
                         // Resolve the texture from the MaterialX root extension
-                        const ext = this.materialX_root_data;
-                        if (ext) {
-                            const textures = ext.textures || [];
+                        if (rootExtension) {
+                            const textures = rootExtension.textures || [];
                             let index = -1;
                             for (const texture of textures) {
                                 // Find the texture by name and use the pointer string to get the index

package/src/materialx.material.ts

@@ -11,6 +11,7 @@ const worldViewPos = new Vector3();
 
 declare type MaterialXMaterialInitParameters = {
     name: string,
+    shaderName?: string | null, // Optional name of the shader
     shader: any,
     loaders: Loaders,
     context: MaterialXContext,
@@ -23,6 +24,9 @@ type Precision = "highp" | "mediump" | "lowp";
 
 export class MaterialXMaterial extends ShaderMaterial {
 
+    /** The original name of the shader */
+    readonly shaderName : string | null = null;
+
     copy(source: MaterialXMaterial): this {
         super.copy(source);
         this._context = source._context;
@@ -146,6 +150,7 @@ export class MaterialXMaterial extends ShaderMaterial {
         });
         this._context = init.context;
         this._shader = init.shader;
+        this.shaderName = init.shaderName || null;
 
         Object.assign(this.uniforms, {
             ...getUniformValues(init.shader.getStage('vertex'), init.loaders, searchPath),