@needle-tools/materialx 1.7.0-next.57183d6 → 1.7.0-next.8333b4d

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@needle-tools/materialx",
   "description": "MaterialX material support for three.js and Needle Engine – render physically based MaterialX shaders in the browser via WebAssembly",
-  "version": "1.7.0-next.57183d6",
+  "version": "1.7.0-next.8333b4d",
   "type": "module",
   "license": "PolyForm-Noncommercial-1.0.0",
   "main": "index.js",
@@ -27,10 +27,7 @@
     "three": ">=0.160.0"
   },
   "scripts": {
-    "test": "node --import=./tests/unit/register-json-loader.js --test tests/unit/**/*.test.js",
-    "test:runtime:node": "node tests/runtime/materialx-runtime-smoke.mjs",
-    "test:runtime:deno": "deno run --allow-read --no-lock --node-modules-dir=auto tests/runtime/materialx-runtime-smoke.mjs",
-    "test:runtime:bun": "bun tests/runtime/materialx-runtime-smoke.mjs"
+    "test": "node --import=./tests/unit/register-json-loader.js --test tests/unit/**/*.test.js"
   },
   "devDependencies": {
     "@needle-tools/engine": "4.x",

package/src/constants.js

@@ -1,5 +1,5 @@
-// Keep the runtime version tied to package.json. The import attribute is
-// required by browsers and Node.js for JSON modules; bundlers also understand
-// this shape.
-import pkg from '../package.json' with { type: 'json' };
+// Bare JSON import works in bundlers (Vite, Webpack, Rollup) and keeps the
+// runtime version tied to package.json. Node.js 22+ requires JSON import
+// attributes, so unit tests use tests/unit/register-json-loader.js.
+import pkg from '../package.json';
 export const VERSION = pkg.version;

package/src/materialx.helper.js

@@ -71,22 +71,10 @@ function fromMatrix(matrix, dimension) {
  * @property {(path: string) => Promise<THREE.Texture | null | void>} getTexture - Get a texture by path
  */
 
-/**
- * @param {string} src
- * @returns {HTMLImageElement | { src: string }}
- */
-function createPortableImage(src) {
-    if (typeof Image !== 'undefined') {
-        const image = new Image();
-        image.src = src;
-        return image;
-    }
-    return { src };
-}
-
 const defaultTexture = new THREE.Texture();
 defaultTexture.needsUpdate = true;
-defaultTexture.image = createPortableImage("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAAAXNSR0IB2cksfwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAANQTFRFr6+vGqg52AAAAAxJREFUeJxjZGBEgQAAWAAJLpjsTQAAAABJRU5ErkJggg==");
+defaultTexture.image = new Image();
+defaultTexture.image.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAAAXNSR0IB2cksfwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAANQTFRFr6+vGqg52AAAAAxJREFUeJxjZGBEgQAAWAAJLpjsTQAAAABJRU5ErkJggg=="
 // defaultTexture.image.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAAXNSR0IB2cksfwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAB5QTFRFAAAABAQEw8PD////v7+/vb29Xl5eQEBA+/v7PDw8GPBYkgAAAB1JREFUeJxjZGBgYFQSABIUMlxgDGMGBtaIAnIZAKwQCSDYUEZEAAAAAElFTkSuQmCC";
 // defaultTexture.wrapS = THREE.RepeatWrapping;
 // defaultTexture.wrapT = THREE.RepeatWrapping;
@@ -96,7 +84,8 @@ defaultTexture.image = createPortableImage("data:image/png;base64,iVBORw0KGgoAAA
 
 const defaultNormalTexture = new THREE.Texture();
 defaultNormalTexture.needsUpdate = true;
-defaultNormalTexture.image = createPortableImage("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAAXNSR0IB2cksfwAAAAlwSFlzAAALEwAACxMBAJqcGAAAABJQTFRFgYH4gIH4gYH3gIH3gIH5gID4m94ORAAAADFJREFUeJxjZBBkfMdo9P/BB0aBj/8FGB0ufghgFGT4r8wo+P8rD2Pgo3sMjIz8jAwAMLoN0ZjS5hgAAAAASUVORK5CYII=");
+defaultNormalTexture.image = new Image();
+defaultNormalTexture.image.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAAXNSR0IB2cksfwAAAAlwSFlzAAALEwAACxMBAJqcGAAAABJQTFRFgYH4gIH4gYH3gIH3gIH5gID4m94ORAAAADFJREFUeJxjZBBkfMdo9P/BB0aBj/8FGB0ufghgFGT4r8wo+P8rD2Pgo3sMjIz8jAwAMLoN0ZjS5hgAAAAASUVORK5CYII=";
 
 /**
  * @param {string} key

package/src/materialx.js

@@ -17,19 +17,6 @@ function isTextureLike(value) {
     return !!value && typeof value === "object" && /** @type {{ isTexture?: unknown }} */(value).isTexture === true;
 }
 
-function isNodeRuntime() {
-    return !!globalThis.process?.versions?.node && globalThis.process?.type !== "renderer";
-}
-
-async function getNodePackageAssetPaths() {
-    const { fileURLToPath } = await import(/* @vite-ignore */ "node:url");
-    return [
-        fileURLToPath(new URL("../bin/JsMaterialXCore.wasm", import.meta.url)),
-        fileURLToPath(new URL("../bin/JsMaterialXGenShader.wasm", import.meta.url)),
-        fileURLToPath(new URL("../bin/JsMaterialXGenShader.data.txt", import.meta.url)),
-    ];
-}
-
 
 /**
  * Preloads the MaterialX WebAssembly module.
@@ -82,10 +69,7 @@ export async function ready() {
 
             const location = globalThis.NEEDLE_MATERIALX_LOCATION;
 
-            if (isNodeRuntime()) {
-                urls = await getNodePackageAssetPaths();
-            }
-            else if (location === "package" || location === "bin/" || location === "./bin/" || location === "../bin/") {
+            if (location === "package" || location === "bin/" || location === "./bin/" || location === "../bin/") {
                 // Use local files from the @needle-tools/materialx npm package.
                 // Vite's ?url suffix copies these files to the output directory
                 // and returns their URL automatically — no CDN download needed.

package/src/utils.js

@@ -7,9 +7,7 @@
  * @returns {boolean|string} Parameter value or false if not found
  */
 export function getParam(name) {
-    const search = globalThis.location?.search ?? globalThis.window?.location?.search;
-    if (!search) return false;
-    const urlParams = new URLSearchParams(search);
+    const urlParams = new URLSearchParams(window.location.search);
     const param = urlParams.get(name);
     if (param == null || param === "0" || param === "false") return false;
     if (param === "") return true;
@@ -37,26 +35,22 @@ export function getFrame() {
     return frame;
 }
 
-const performanceApi = globalThis.performance
-    || globalThis.window?.performance
-    || /** @type {any} */ (globalThis.window)?.webkitPerformance
-    || /** @type {any} */ (globalThis.window)?.mozPerformance
-    || { now: () => Date.now() };
+const performance = window.performance || /** @type {any} */ (window).webkitPerformance || /** @type {any} */ (window).mozPerformance;
 
 function updateTime() {
-    time = performanceApi.now() / 1000; // Convert to seconds
+    time = performance.now() / 1000; // Convert to seconds
     frame++;
-    globalThis.requestAnimationFrame?.(updateTime);
+    window.requestAnimationFrame(updateTime);
 }
 
-globalThis.requestAnimationFrame?.(updateTime);
+window.requestAnimationFrame(updateTime);
 
 
 
 
 export async function waitForNetworkIdle() {
-    if (typeof globalThis.requestIdleCallback !== "undefined") {
-        return new Promise(res => globalThis.requestIdleCallback(res));
+    if (typeof requestIdleCallback !== "undefined") {
+        return new Promise(res => requestIdleCallback(res));
     }
     else {
         console.debug("[MaterialX] Can not wait for network idle, using fallback");
@@ -67,6 +61,5 @@ export async function waitForNetworkIdle() {
 
 export function isDevEnvironment() {
     // check if we're in localhost or using an ip address
-    const hostname = globalThis.location?.hostname ?? globalThis.window?.location?.hostname;
-    return hostname === "localhost" || !!hostname && /^\d{1,3}(\.\d{1,3}){3}$/.test(hostname);
-}
+    return window.location.hostname === "localhost" || /^\d{1,3}(\.\d{1,3}){3}$/.test(window.location.hostname);
+}