@needle-tools/materialx 1.0.0-next.834eeec → 1.0.0-next.a660bbe

package/README.md

@@ -1,20 +1 @@
-# Needle MaterialX
-
-## How to use
-
-To use with Needle Engine simply import the module
-
-```ts
-import "@needle-tools/materialx"
-```
-
-<br />
-
-# Contact ✒️
-<b>[🌵 Needle](https://needle.tools)</b> • 
-[Github](https://github.com/needle-tools) • 
-[Twitter](https://twitter.com/NeedleTools) • 
-[Discord](https://discord.needle.tools) • 
-[Forum](https://forum.needle.tools) • 
-[Youtube](https://www.youtube.com/@needle-tools)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/materialx",
-  "version": "1.0.0-next.834eeec",
+  "version": "1.0.0-next.a660bbe",
   "type": "module",
   "main": "index.ts",
   "exports": {

package/src/index.ts

@@ -2,5 +2,4 @@
 
 const getMaterialXEnvironment = () => state.materialXEnvironment;
 
-export { initializeMaterialX, getMaterialXEnvironment };
-export { needleMaterialX } from "./vite/index.js";
+export { initializeMaterialX, getMaterialXEnvironment };

package/src/materialx.ts

@@ -5,6 +5,44 @@ import { renderPMREMToEquirect } from "./textureHelper.js";
 import { Light, MeshBasicMaterial, Object3D, PMREMGenerator } from "three";
 import { registerLights } from "./helper.js";
 
+const coreWasmUrl = new URL('../bin/JsMaterialXCore.wasm', import.meta.url).href;
+const shaderDataUrl = new URL('../bin/JsMaterialXGenShader.data', import.meta.url).href;
+const shaderWasmUrl = new URL('../bin/JsMaterialXGenShader.wasm', import.meta.url).href;
+
+// const moduleUrls = import.meta.glob('../bin/JsMaterialXCore.wasm', {
+//   query: '?url',
+//   import: 'default',
+// })
+// import jsMaterialCoreUrl from "../bin/JsMaterialXCore.wasm?url";
+
+// Configure MaterialX with the correct path for its data files
+const materialXConfig = {
+    locateFile: (path: string, scriptDirectory: string) => {
+        if (debug) console.debug("MaterialX locateFile called:", { path, scriptDirectory });
+
+        // Return the correct path for MaterialX data files
+        if (path.endsWith('.data') || path.endsWith('.wasm')) {
+            if(path.includes("JsMaterialXCore.wasm")) {
+                return coreWasmUrl; // Use the URL for the core WASM file
+            }
+            else if (path.includes("JsMaterialXGenShader.data")) {
+                return shaderDataUrl; // Use the URL for the shader data file
+            }
+            else if (path.includes("JsMaterialXGenShader.wasm")) {
+                return shaderWasmUrl; // Use the URL for the shader WASM file
+            }
+            // For Vite dev server, we need to use the correct module path
+            const url = new URL(`../bin/${path}?url`, import.meta.url);
+            const correctPath = url.href;
+            if (debug) console.debug("MaterialX locateFile resolved:", correctPath, { url, meta_url: import.meta.url });
+            return correctPath;
+        }
+        return scriptDirectory + path;
+    },
+    // Add buffer allocation to handle the data file properly
+    wasmBinary: null,
+    wasmMemory: null
+};
 
 // Global MaterialX module instance - initialized lazily
 export const state = new class {
@@ -22,6 +60,7 @@ export const state = new class {
     }
 }
 
+
 // Initialize MaterialX WASM module lazily
 export async function initializeMaterialX(): Promise<void> {
     if (state.materialXInitPromise) {
@@ -31,34 +70,7 @@ export async function initializeMaterialX(): Promise<void> {
         if (state.materialXModule) return; // Already initialized
         if (debug) console.log("Initializing MaterialX WASM module...");
         try {
-
-            const urls: Array<string> = await Promise.all([
-                /** @ts-ignore */
-                import(`../bin/JsMaterialXCore.wasm?url`).then(m => m.default || m),
-                /** @ts-ignore */
-                import(`../bin/JsMaterialXGenShader.wasm?url`).then(m => m.default || m),
-                /** @ts-ignore */
-                import(`../bin/JsMaterialXGenShader.data.txt?url`).then(m => m.default || m),
-            ]);
-            const [JsMaterialXCore, JsMaterialXGenShader, JsMaterialXGenShader_data] = urls;
-
-            const module = await MaterialX({
-                locateFile: (path: string, scriptDirectory: string) => {
-                    if (debug) console.debug("MaterialX locateFile called:", { path, scriptDirectory });
-
-                    if (path.includes("JsMaterialXCore.wasm")) {
-                        return JsMaterialXCore; // Use the URL for the core WASM file
-                    }
-                    else if (path.includes("JsMaterialXGenShader.wasm")) {
-                        return JsMaterialXGenShader; // Use the URL for the shader WASM file
-                    }
-                    else if (path.includes("JsMaterialXGenShader.data")) {
-                        return JsMaterialXGenShader_data; // Use the URL for the shader data file
-                    }
-
-                    return scriptDirectory + path;
-                },
-            });
+            const module = await MaterialX(materialXConfig);
             if (debug) console.log("MaterialXLoader module loaded", module);
             state.materialXModule = module;
 
@@ -72,15 +84,15 @@ export async function initializeMaterialX(): Promise<void> {
             tempDoc.setDataLibrary(state.materialXStdLib);
 
             // Initialize basic lighting with default light rig
-            //             const defaultLightRigXml = `<?xml version="1.0"?>
-            // <materialx version="1.39">
-            //   <!-- Default directional light -->
-            //   <directional_light name="default_light" type="lightshader">
-            //     <input name="direction" type="vector3" value="0.0, -1.0, -0.5" />
-            //     <input name="color" type="color3" value="1.0, 1.0, 1.0" />
-            //     <input name="intensity" type="float" value="1.0" />
-            //   </directional_light>
-            // </materialx>`;
+            const defaultLightRigXml = `<?xml version="1.0"?>
+<materialx version="1.39">
+  <!-- Default directional light -->
+  <directional_light name="default_light" type="lightshader">
+    <input name="direction" type="vector3" value="0.0, -1.0, -0.5" />
+    <input name="color" type="color3" value="1.0, 1.0, 1.0" />
+    <input name="intensity" type="float" value="1.0" />
+  </directional_light>
+</materialx>`;
 
             // This prewarms the shader generation context to have all light types
             await registerLights(state.materialXModule, [], state.materialXGenContext);