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

package/README.md

@@ -1 +1,20 @@
+# 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,17 +1,24 @@
 {
   "name": "@needle-tools/materialx",
-  "version": "1.0.0-next.5e016a7",
+  "version": "1.0.0-next.834eeec",
   "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/index.ts

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

package/src/materialx.ts

@@ -5,24 +5,6 @@ import { renderPMREMToEquirect } from "./textureHelper.js";
 import { Light, MeshBasicMaterial, Object3D, PMREMGenerator } from "three";
 import { registerLights } from "./helper.js";
 
-// 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')) {
-            // 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);
-            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 {
@@ -40,7 +22,6 @@ export const state = new class {
     }
 }
 
-
 // Initialize MaterialX WASM module lazily
 export async function initializeMaterialX(): Promise<void> {
     if (state.materialXInitPromise) {
@@ -50,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: 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;
+                },
+            });
             if (debug) console.log("MaterialXLoader module loaded", module);
             state.materialXModule = module;
 
@@ -64,15 +72,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);

package/.github/workflows/release.yml

@@ -1,36 +0,0 @@
-name: Release Workflow
-on:
-  push:
-    branches:
-      - 'release/stable'
-      - 'release/next'
-      - 'release/experimental'
-
-jobs:
-  run-release-script:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    defaults:
-      run:
-        working-directory: ./
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-          
-      - name: Install dependencies
-        run: npm ci
-                
-      - name: Publish to npm (stable branch)
-        if: startsWith(github.ref_name, 'release/stable')
-        run: npx --yes needle-publish-helper@stable publish "." --webhook "${{ secrets.DISCORD_WEBHOOK }}" --access-token "${{ secrets.NPM_TOKEN }}" --tag "stable" --create-tag "release/"
-
-      - name: Publish to npm (next and experimental branches)
-        if: ${{ !startsWith(github.ref_name, 'release/stable') }}
-        run: npx --yes needle-publish-helper@stable publish "." --webhook "${{ secrets.DISCORD_WEBHOOK }}" --access-token "${{ secrets.NPM_TOKEN }}" --tag "${{ github.ref_name }}" --version+tag --version+hash --create-tag "release/"
-
-

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 

package/workspace.code-workspace

@@ -1,18 +0,0 @@
-{
-  "folders": [
-    {
-      "path": "."
-    },
-    {
-      "name": "Needle",
-      "path": "./node_modules/@needle-tools"
-    }
-  ],
-  "settings": {
-    "files.exclude": {
-      "**/.git": true,
-      "**/.DS_Store": true,
-      "**/*.meta": true
-    }
-  }
-}