@needle-tools/materialx 1.0.0-next.12f185d → 1.0.0-next.2fb4497

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/materialx",
-  "version": "1.0.0-next.12f185d",
+  "version": "1.0.0-next.2fb4497",
   "type": "module",
   "main": "index.ts",
   "exports": {

package/src/materialx.ts

@@ -5,42 +5,6 @@ import { renderPMREMToEquirect } from "./textureHelper.js";
 import { Light, MeshBasicMaterial, Object3D, PMREMGenerator } from "three";
 import { registerLights } from "./helper.js";
 
-// @ts-ignore
-import coreWasmUrl from "../bin/JsMaterialXCore.wasm?url";
-// @ts-ignore
-import shaderWasmUrl from "../bin/JsMaterialXGenShader.wasm?url";
-// @ts-ignore
-import shaderDataUrl from "../bin/JsMaterialXGenShader.data?url&inline";
-
-
-// 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.wasm")) {
-                return shaderWasmUrl; // Use the URL for the shader WASM file
-            }
-            else if (path.includes("JsMaterialXGenShader.data")) {
-                return shaderDataUrl; // Use the URL for the shader data 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 {
@@ -58,7 +22,6 @@ export const state = new class {
     }
 }
 
-
 // Initialize MaterialX WASM module lazily
 export async function initializeMaterialX(): Promise<void> {
     if (state.materialXInitPromise) {
@@ -68,7 +31,34 @@ export async function initializeMaterialX(): Promise<void> {
         if (state.materialXModule) return; // Already initialized
         if (debug) console.log("Initializing MaterialX WASM module...");
         try {
-            const module = await MaterialX(materialXConfig);
+
+            const urls = await Promise.all([
+                /** @ts-ignore */
+                import(`../bin/JsMaterialXCore.wasm?url`),
+                /** @ts-ignore */
+                import(`../bin/JsMaterialXGenShader.wasm?url`),
+                /** @ts-ignore */
+                import(`../bin/JsMaterialXGenShader.data?url`),
+            ]);
+            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;
+                },
+            });
             if (debug) console.log("MaterialXLoader module loaded", module);
             state.materialXModule = module;