@pixagram/renderart 0.2.2 → 0.3.1

package/dist/index.mjs

@@ -619,131 +619,88 @@ var HEX_PRESETS = {
 
 // src/wasm-loader.ts
 var wasm = null;
-var wasmMemory = null;
+var wasmReady = false;
 var initPromise = null;
-var wasmUrl = "";
-var cachedUint8Memory = null;
-var WASM_VECTOR_LEN = 0;
-function getUint8Memory() {
-  if (cachedUint8Memory === null || cachedUint8Memory.byteLength === 0) {
-    cachedUint8Memory = new Uint8Array(wasmMemory.buffer);
-  }
-  return cachedUint8Memory;
-}
-function passArray8ToWasm(arg) {
-  const ptr = wasm.__wbindgen_malloc(arg.length);
-  getUint8Memory().set(arg, ptr);
-  WASM_VECTOR_LEN = arg.length;
-  return ptr;
-}
-function setWasmUrl(url) {
-  wasmUrl = url;
-}
-function getDefaultWasmUrl() {
-  if (wasmUrl) return wasmUrl;
-  const paths = [
-    "/renderart_wasm_bg.wasm",
-    "/wasm/renderart_wasm_bg.wasm",
-    "/static/wasm/renderart_wasm_bg.wasm",
-    "/assets/wasm/renderart_wasm_bg.wasm"
-  ];
-  return paths[0];
-}
-async function initWasm(customUrl) {
-  if (wasm) return;
+var initError = null;
+async function initWasm(wasmUrl) {
+  if (wasmReady) return;
+  if (initError) throw initError;
   if (initPromise) return initPromise;
-  const url = customUrl || getDefaultWasmUrl();
   initPromise = (async () => {
     try {
-      const response = await fetch(url);
-      if (!response.ok) {
-        throw new Error(`Failed to fetch WASM: ${response.status} ${response.statusText}`);
-      }
-      const bytes = await response.arrayBuffer();
-      const imports = {
-        __wbindgen_placeholder__: {
-          __wbindgen_throw: (ptr, len) => {
-            const msg = new TextDecoder().decode(getUint8Memory().subarray(ptr, ptr + len));
-            throw new Error(msg);
-          }
-        },
-        wbg: {
-          __wbindgen_throw: (ptr, len) => {
-            const msg = new TextDecoder().decode(getUint8Memory().subarray(ptr, ptr + len));
-            throw new Error(msg);
-          }
+      const wasmModule = await import('./renderart_wasm.js');
+      let url = wasmUrl;
+      if (!url) {
+        try {
+          url = new URL("./renderart_wasm_bg.wasm", import.meta.url).href;
+        } catch {
+          url = "renderart_wasm_bg.wasm";
         }
-      };
-      const { instance } = await WebAssembly.instantiate(bytes, imports);
-      wasm = instance.exports;
-      wasmMemory = wasm.memory;
-      if (wasm.__wbindgen_start) {
-        wasm.__wbindgen_start();
       }
+      await wasmModule.default(url);
+      wasm = wasmModule;
+      wasmReady = true;
     } catch (e) {
+      initError = new Error(`Failed to initialize WASM: ${e}`);
       initPromise = null;
-      throw new Error(`Failed to initialize WASM: ${e}. Make sure the .wasm file is served at: ${url}`);
+      throw initError;
     }
   })();
   return initPromise;
 }
 function isWasmLoaded() {
-  return wasm !== null;
+  return wasmReady;
+}
+function hasWasmError() {
+  return initError !== null;
+}
+function getWasmError() {
+  return initError;
 }
 async function ensureWasm() {
-  if (!wasm) {
+  if (!wasmReady) {
     await initWasm();
   }
 }
-function getOutputData(ptr, len) {
-  const buffer = getUint8Memory().subarray(ptr, ptr + len);
+function getOutputData(result) {
+  const memory = wasm.get_memory();
+  const buffer = new Uint8Array(memory.buffer, result.ptr, result.len);
   return new Uint8ClampedArray(buffer.slice());
 }
 function toUint8Array(input) {
   const data = input instanceof ImageData ? input.data : input.data;
   return data instanceof Uint8Array ? data : new Uint8Array(data);
 }
-function parseColorToU32(color, defaultVal) {
-  if (color === void 0) return defaultVal;
-  if (typeof color === "number") return color;
-  if (color === "transparent") return 0;
-  if (color.startsWith("#")) {
-    const hex = color.slice(1);
-    if (hex.length === 6) {
-      return parseInt(hex, 16) << 8 | 255;
-    }
-    if (hex.length === 8) {
-      return parseInt(hex, 16);
-    }
-  }
-  return defaultVal;
-}
 var CrtCpuRenderer = class _CrtCpuRenderer {
   constructor() {
-    this.ready = false;
+    this.initialized = false;
   }
-  /** Create and initialize renderer (auto-loads WASM) */
+  /** Create and initialize renderer */
   static async create() {
-    await ensureWasm();
     const renderer = new _CrtCpuRenderer();
-    renderer.ready = true;
+    await renderer.init();
     return renderer;
   }
+  /** Initialize (loads WASM if needed) */
+  async init() {
+    await ensureWasm();
+    this.initialized = true;
+  }
+  /** Check if renderer is ready */
   isReady() {
-    return this.ready && isWasmLoaded();
+    return this.initialized && wasmReady;
   }
+  /** Render CRT effect */
   render(input, options = {}) {
-    if (!this.ready || !wasm) {
-      throw new Error("Renderer not initialized");
+    if (!this.initialized || !wasm) {
+      throw new Error("Renderer not initialized. Call init() first or use CrtCpuRenderer.create()");
     }
     const data = toUint8Array(input);
     const width = input.width;
     const height = input.height;
     const scale = Math.min(32, Math.max(2, options.scale ?? 3));
-    const ptr = passArray8ToWasm(data);
-    const resultPtr = wasm.crt_upscale_raw(
-      ptr,
-      WASM_VECTOR_LEN,
+    const result = wasm.crt_upscale_config(
+      data,
       width,
       height,
       scale,
@@ -752,118 +709,124 @@ var CrtCpuRenderer = class _CrtCpuRenderer {
       options.scanHardness ?? -4,
       options.scanOpacity ?? 0.5,
       options.maskOpacity ?? 0.3,
-      options.enableWarp !== false ? 1 : 0,
-      options.enableScanlines !== false ? 1 : 0,
-      options.enableMask !== false ? 1 : 0
+      options.enableWarp !== false,
+      options.enableScanlines !== false,
+      options.enableMask !== false
     );
-    const outWidth = width * scale;
-    const outHeight = height * scale;
-    const outLen = outWidth * outHeight * 4;
     return {
-      data: getOutputData(resultPtr, outLen),
-      width: outWidth,
-      height: outHeight
+      data: getOutputData(result),
+      width: result.width,
+      height: result.height
     };
   }
+  /** Dispose resources */
   dispose() {
-    this.ready = false;
+    this.initialized = false;
   }
 };
+function parseColorToU32(color, defaultVal) {
+  if (color === void 0) return defaultVal;
+  if (typeof color === "number") return color;
+  if (color === "transparent") return 0;
+  if (color.startsWith("#")) {
+    const hex = color.slice(1);
+    if (hex.length === 6) {
+      return parseInt(hex, 16) << 8 | 255;
+    }
+    if (hex.length === 8) {
+      return parseInt(hex, 16);
+    }
+  }
+  return defaultVal;
+}
 var HexCpuRenderer = class _HexCpuRenderer {
   constructor() {
-    this.ready = false;
+    this.initialized = false;
   }
+  /** Create and initialize renderer */
   static async create() {
-    await ensureWasm();
     const renderer = new _HexCpuRenderer();
-    renderer.ready = true;
+    await renderer.init();
     return renderer;
   }
+  /** Initialize (loads WASM if needed) */
+  async init() {
+    await ensureWasm();
+    this.initialized = true;
+  }
+  /** Check if renderer is ready */
   isReady() {
-    return this.ready && isWasmLoaded();
+    return this.initialized && wasmReady;
   }
+  /** Render hexagonal effect */
   render(input, options = {}) {
-    if (!this.ready || !wasm) {
-      throw new Error("Renderer not initialized");
+    if (!this.initialized || !wasm) {
+      throw new Error("Renderer not initialized. Call init() first or use HexCpuRenderer.create()");
     }
     const data = toUint8Array(input);
     const width = input.width;
     const height = input.height;
     const scale = Math.min(32, Math.max(2, options.scale ?? 16));
-    const orientation = options.orientation === "pointy-top" ? 1 : 0;
-    const ptr = passArray8ToWasm(data);
-    const resultPtr = wasm.hex_upscale_raw(
-      ptr,
-      WASM_VECTOR_LEN,
+    const result = wasm.hex_upscale_config(
+      data,
       width,
       height,
       scale,
-      orientation,
-      options.drawBorders ? 1 : 0,
+      options.orientation === "pointy-top" ? 1 : 0,
+      options.drawBorders ?? false,
       parseColorToU32(options.borderColor, 673720575),
       options.borderThickness ?? 1,
       parseColorToU32(options.backgroundColor, 0)
     );
-    const dims = this.getDimensions(width, height, scale, options.orientation);
-    const outLen = dims.width * dims.height * 4;
     return {
-      data: getOutputData(resultPtr, outLen),
-      width: dims.width,
-      height: dims.height
+      data: getOutputData(result),
+      width: result.width,
+      height: result.height
     };
   }
+  /** Get output dimensions */
   getDimensions(srcWidth, srcHeight, scale, orientation = "flat-top") {
-    const SQRT3 = 1.732050808;
-    scale = Math.min(32, Math.max(2, scale));
-    if (orientation === "flat-top") {
-      const hSpacing = scale * 1.5;
-      const vSpacing = scale * SQRT3;
-      const cellWidth = scale * 2;
-      const cellHeight = scale * SQRT3;
-      return {
-        width: Math.ceil(srcWidth * hSpacing + cellWidth),
-        height: Math.ceil(srcHeight * vSpacing + cellHeight)
-      };
-    } else {
-      const hSpacing = scale * SQRT3;
-      const vSpacing = scale * 1.5;
-      const cellWidth = scale * SQRT3;
-      const cellHeight = scale * 2;
-      return {
-        width: Math.ceil(srcWidth * hSpacing + cellWidth),
-        height: Math.ceil(srcHeight * vSpacing + cellHeight)
-      };
+    if (!this.initialized || !wasm) {
+      throw new Error("Renderer not initialized");
     }
+    const dims = wasm.hex_get_dimensions(srcWidth, srcHeight, scale, orientation === "pointy-top" ? 1 : 0);
+    return { width: dims[0], height: dims[1] };
   }
+  /** Dispose resources */
   dispose() {
-    this.ready = false;
+    this.initialized = false;
   }
 };
 var XbrzCpuRenderer = class _XbrzCpuRenderer {
   constructor() {
-    this.ready = false;
+    this.initialized = false;
   }
+  /** Create and initialize renderer */
   static async create() {
-    await ensureWasm();
     const renderer = new _XbrzCpuRenderer();
-    renderer.ready = true;
+    await renderer.init();
     return renderer;
   }
+  /** Initialize (loads WASM if needed) */
+  async init() {
+    await ensureWasm();
+    this.initialized = true;
+  }
+  /** Check if renderer is ready */
   isReady() {
-    return this.ready && isWasmLoaded();
+    return this.initialized && wasmReady;
   }
+  /** Render xBRZ scaling */
   render(input, options = {}) {
-    if (!this.ready || !wasm) {
-      throw new Error("Renderer not initialized");
+    if (!this.initialized || !wasm) {
+      throw new Error("Renderer not initialized. Call init() first or use XbrzCpuRenderer.create()");
     }
     const data = toUint8Array(input);
     const width = input.width;
     const height = input.height;
     const scale = Math.min(6, Math.max(2, options.scale ?? 2));
-    const ptr = passArray8ToWasm(data);
-    const resultPtr = wasm.xbrz_upscale_raw(
-      ptr,
-      WASM_VECTOR_LEN,
+    const result = wasm.xbrz_upscale_config(
+      data,
       width,
       height,
       scale,
@@ -872,17 +835,15 @@ var XbrzCpuRenderer = class _XbrzCpuRenderer {
       options.dominantDirectionThreshold ?? 4.4,
       options.steepDirectionThreshold ?? 2.2
     );
-    const outWidth = width * scale;
-    const outHeight = height * scale;
-    const outLen = outWidth * outHeight * 4;
     return {
-      data: getOutputData(resultPtr, outLen),
-      width: outWidth,
-      height: outHeight
+      data: getOutputData(result),
+      width: result.width,
+      height: result.height
     };
   }
+  /** Dispose resources */
   dispose() {
-    this.ready = false;
+    this.initialized = false;
   }
 };
 var XBRZ_PRESETS = {
@@ -1077,8 +1038,8 @@ var RenderArt = class _RenderArt {
     return new _RenderArt(true);
   }
   /** Pre-initialize WASM for faster first CPU render */
-  async preloadWasm(wasmUrl2) {
-    await initWasm(wasmUrl2);
+  async preloadWasm(wasmUrl) {
+    await initWasm(wasmUrl);
   }
   get capabilities() {
     return { ...this._capabilities };
@@ -1090,6 +1051,6 @@ var RenderArt = class _RenderArt {
   }
 };
 
-export { CRT_PRESETS, CrtCpuRenderer, CrtEngine, CrtGpuRenderer, HEX_PRESETS, HexCpuRenderer, HexEngine, HexGpuRenderer, RenderArt, XBRZ_PRESETS, XbrzCpuRenderer, XbrzEngine, hexGetDimensions, initWasm, isWasmLoaded, setWasmUrl };
+export { CRT_PRESETS, CrtCpuRenderer, CrtEngine, CrtGpuRenderer, HEX_PRESETS, HexCpuRenderer, HexEngine, HexGpuRenderer, RenderArt, XBRZ_PRESETS, XbrzCpuRenderer, XbrzEngine, getWasmError, hasWasmError, hexGetDimensions, initWasm, isWasmLoaded };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map