@needle-tools/materialx 1.0.0-next.85f6ffd → 1.0.0-next.a660bbe

package/package.json

@@ -1,17 +1,24 @@
 {
   "name": "@needle-tools/materialx",
-  "version": "1.0.0-next.85f6ffd",
+  "version": "1.0.0-next.a660bbe",
   "type": "module",
   "main": "index.ts",
-  "dependencies": {},
+  "exports": {
+    ".": {
+      "import": "./index.ts",
+      "require": "./index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "peerDependencies": {
     "@needle-tools/engine": "4.x",
     "three": "npm:@needle-tools/three@^0.169.5"
   },
   "devDependencies": {
     "@needle-tools/engine": "4.x",
+    "@types/three": "0.169.0",
     "three": "npm:@needle-tools/three@^0.169.5",
-    "@types/three": "0.169.0"
+    "vite": "^7.0.3"
   },
   "publishConfig": {
     "access": "public",

package/src/materialx.ts

@@ -5,6 +5,16 @@ 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) => {
@@ -12,9 +22,19 @@ const materialXConfig = {
 
         // 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 correctPath = new URL(`../bin/${path}`, import.meta.url).href;
-            if (debug) console.log("Resolved path:", correctPath);
+            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;

package/bin/README.md

@@ -1,5 +0,0 @@
-Source: https://github.com/AcademySoftwareFoundation/MaterialX/tree/gh-pages
-
-Edits:
-
-- `JsMaterialXGenShader.js` added `export default MaterialX;` at bottom