@ifc-lite/wasm 2.8.0 → 2.8.1

package/package.json

@@ -5,7 +5,7 @@
     "IFC-Lite Contributors"
   ],
   "description": "WebAssembly bindings for IFC-Lite",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "license": "MPL-2.0",
   "repository": {
     "type": "git",

package/pkg/ifc-lite.d.ts

@@ -91,7 +91,7 @@ export class IfcAPI {
    * Process geometry for a subset of pre-scanned entities.
    * Takes raw bytes and pre-pass data from buildPrePassOnce.
    */
-  processGeometryBatch(data: Uint8Array, jobs_flat: Uint32Array, unit_scale: number, rtc_x: number, rtc_y: number, rtc_z: number, needs_shift: boolean, void_keys: Uint32Array, void_counts: Uint32Array, void_values: Uint32Array, style_ids: Uint32Array, style_colors: Uint8Array): MeshCollection;
+  processGeometryBatch(data: Uint8Array, jobs_flat: Uint32Array, unit_scale: number, rtc_x: number, rtc_y: number, rtc_z: number, needs_shift: boolean, void_keys: Uint32Array, void_counts: Uint32Array, void_values: Uint32Array, style_ids: Uint32Array, style_colors: Uint8Array, plane_angle_to_radians?: number | null, material_element_ids?: Uint32Array | null, material_color_counts?: Uint32Array | null, material_colors_rgba?: Uint8Array | null): MeshCollection;
   /**
    * Streaming pre-pass: emits geometry jobs in chunks via a JS callback
    * instead of waiting for the full file scan to complete.
@@ -117,7 +117,7 @@ export class IfcAPI {
    *   `{ type: "jobs", jobs: Uint32Array }`     // [id, start, end] triples
    *   `{ type: "complete", totalJobs }`
    */
-  buildPrePassStreaming(data: Uint8Array, on_event: Function, chunk_size: number): any;
+  buildPrePassStreaming(data: Uint8Array, on_event: Function, chunk_size: number, disabled_type_names: string[] | null | undefined, skip_type_geometry: boolean): any;
   /**
    * Parse the file and return structured per-axis data (tag + endpoints) in
    * the renderer's Y-up world space (RTC-subtracted, metres). Use this when
@@ -306,9 +306,19 @@ export class MeshCollection {
    */
   hasRtcOffset(): boolean;
   /**
-   * Get mesh at index
+   * Get mesh at index (clones — non-destructive). Prefer `takeMesh` on the
+   * hot streaming path; this stays for callers that read meshes more than once.
    */
   get(index: number): MeshDataJs | undefined;
+  /**
+   * #1097 perf: MOVE the mesh at `index` out of the collection (the Vec
+   * buffers are `std::mem::take`-n, leaving an empty stub). The streaming
+   * worker reads each mesh exactly once, so moving avoids the full vertex-
+   * data clone `get` pays — one fewer copy of positions/normals/indices/uvs/
+   * texture per mesh (the JS getters still do the single Rust→JS copy). Calling
+   * it twice for the same index yields the second call an empty mesh.
+   */
+  takeMesh(index: number): MeshDataJs | undefined;
   /**
    * Get RTC offset X (for converting local coords back to world coords)
    * Add this to local X coordinates to get world X coordinates
@@ -413,6 +423,12 @@ export class MeshDataJs {
    * Get color as [r, g, b, a] array
    */
   readonly color: Float32Array;
+  /**
+   * Per-element local-frame origin (Float64Array[3], WebGL Y-up, metres):
+   * world position of vertex i = `origin + positions[3i..3i+3]`. Returns
+   * [0,0,0] when positions are absolute (legacy / local frame off).
+   */
+  readonly origin: Float64Array;
   /**
    * Get indices as Uint32Array (copy to JS)
    */
@@ -835,7 +851,7 @@ export interface InitOutput {
   readonly gridaxisjs_start: (a: number) => number;
   readonly gridaxisjs_tag: (a: number, b: number) => void;
   readonly ifcapi_buildPrePassOnce: (a: number, b: number, c: number) => number;
-  readonly ifcapi_buildPrePassStreaming: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+  readonly ifcapi_buildPrePassStreaming: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => void;
   readonly ifcapi_clearPrePassCache: (a: number) => void;
   readonly ifcapi_extractProfiles: (a: number, b: number, c: number, d: number) => number;
   readonly ifcapi_getMemory: (a: number) => number;
@@ -845,7 +861,7 @@ export interface InitOutput {
   readonly ifcapi_parseGridAxes: (a: number, b: number, c: number) => number;
   readonly ifcapi_parseGridLines: (a: number, b: number, c: number) => number;
   readonly ifcapi_parseSymbolicRepresentations: (a: number, b: number, c: number) => number;
-  readonly ifcapi_processGeometryBatch: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number, n: number, o: number, p: number, q: number, r: number, s: number, t: number) => number;
+  readonly ifcapi_processGeometryBatch: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number, n: number, o: number, p: number, q: number, r: number, s: number, t: number, u: number, v: number, w: number, x: number, y: number, z: number, a1: number, b1: number) => number;
   readonly ifcapi_scanEntitiesFast: (a: number, b: number, c: number) => number;
   readonly ifcapi_scanEntitiesFastBytes: (a: number, b: number, c: number) => number;
   readonly ifcapi_scanGeometryEntitiesFast: (a: number, b: number, c: number) => number;
@@ -865,6 +881,7 @@ export interface InitOutput {
   readonly meshcollection_rtcOffsetX: (a: number) => number;
   readonly meshcollection_rtcOffsetY: (a: number) => number;
   readonly meshcollection_rtcOffsetZ: (a: number) => number;
+  readonly meshcollection_takeMesh: (a: number, b: number) => number;
   readonly meshcollection_totalTriangles: (a: number) => number;
   readonly meshcollection_totalVertices: (a: number) => number;
   readonly meshdatajs_color: (a: number, b: number) => void;
@@ -874,6 +891,7 @@ export interface InitOutput {
   readonly meshdatajs_ifcType: (a: number, b: number) => void;
   readonly meshdatajs_indices: (a: number) => number;
   readonly meshdatajs_normals: (a: number) => number;
+  readonly meshdatajs_origin: (a: number) => number;
   readonly meshdatajs_positions: (a: number) => number;
   readonly meshdatajs_shadingColor: (a: number, b: number) => void;
   readonly meshdatajs_textureHeight: (a: number) => number;
@@ -890,7 +908,6 @@ export interface InitOutput {
   readonly meshoutlinejs_contourCount: (a: number) => number;
   readonly profilecollection_get: (a: number, b: number) => number;
   readonly profilecollection_length: (a: number) => number;
-  readonly profileentryjs_expressId: (a: number) => number;
   readonly profileentryjs_extrusionDepth: (a: number) => number;
   readonly profileentryjs_extrusionDir: (a: number) => number;
   readonly profileentryjs_holeCounts: (a: number) => number;
@@ -966,6 +983,7 @@ export interface InitOutput {
   readonly init: () => void;
   readonly symbolicpolyline_pointCount: (a: number) => number;
   readonly get_memory: () => number;
+  readonly profileentryjs_expressId: (a: number) => number;
   readonly symbolicfillarea_expressId: (a: number) => number;
   readonly symbolicpolyline_worldY: (a: number) => number;
   readonly symbolictext_colorB: (a: number) => number;

package/pkg/ifc-lite.js

@@ -146,6 +146,16 @@ function passArrayF64ToWasm0(arg, malloc) {
     return ptr;
 }
 
+function passArrayJsValueToWasm0(array, malloc) {
+    const ptr = malloc(array.length * 4, 4) >>> 0;
+    const mem = getDataViewMemory0();
+    for (let i = 0; i < array.length; i++) {
+        mem.setUint32(ptr + 4 * i, addHeapObject(array[i]), true);
+    }
+    WASM_VECTOR_LEN = array.length;
+    return ptr;
+}
+
 function passStringToWasm0(arg, malloc, realloc) {
     if (realloc === undefined) {
         const buf = cachedTextEncoder.encode(arg);
@@ -641,9 +651,13 @@ export class IfcAPI {
      * @param {Uint32Array} void_values
      * @param {Uint32Array} style_ids
      * @param {Uint8Array} style_colors
+     * @param {number | null} [plane_angle_to_radians]
+     * @param {Uint32Array | null} [material_element_ids]
+     * @param {Uint32Array | null} [material_color_counts]
+     * @param {Uint8Array | null} [material_colors_rgba]
      * @returns {MeshCollection}
      */
-    processGeometryBatch(data, jobs_flat, unit_scale, rtc_x, rtc_y, rtc_z, needs_shift, void_keys, void_counts, void_values, style_ids, style_colors) {
+    processGeometryBatch(data, jobs_flat, unit_scale, rtc_x, rtc_y, rtc_z, needs_shift, void_keys, void_counts, void_values, style_ids, style_colors, plane_angle_to_radians, material_element_ids, material_color_counts, material_colors_rgba) {
         const ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_export);
         const len0 = WASM_VECTOR_LEN;
         const ptr1 = passArray32ToWasm0(jobs_flat, wasm.__wbindgen_export);
@@ -658,7 +672,13 @@ export class IfcAPI {
         const len5 = WASM_VECTOR_LEN;
         const ptr6 = passArray8ToWasm0(style_colors, wasm.__wbindgen_export);
         const len6 = WASM_VECTOR_LEN;
-        const ret = wasm.ifcapi_processGeometryBatch(this.__wbg_ptr, ptr0, len0, ptr1, len1, unit_scale, rtc_x, rtc_y, rtc_z, needs_shift, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5, ptr6, len6);
+        var ptr7 = isLikeNone(material_element_ids) ? 0 : passArray32ToWasm0(material_element_ids, wasm.__wbindgen_export);
+        var len7 = WASM_VECTOR_LEN;
+        var ptr8 = isLikeNone(material_color_counts) ? 0 : passArray32ToWasm0(material_color_counts, wasm.__wbindgen_export);
+        var len8 = WASM_VECTOR_LEN;
+        var ptr9 = isLikeNone(material_colors_rgba) ? 0 : passArray8ToWasm0(material_colors_rgba, wasm.__wbindgen_export);
+        var len9 = WASM_VECTOR_LEN;
+        const ret = wasm.ifcapi_processGeometryBatch(this.__wbg_ptr, ptr0, len0, ptr1, len1, unit_scale, rtc_x, rtc_y, rtc_z, needs_shift, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5, ptr6, len6, !isLikeNone(plane_angle_to_radians), isLikeNone(plane_angle_to_radians) ? 0 : plane_angle_to_radians, ptr7, len7, ptr8, len8, ptr9, len9);
         return MeshCollection.__wrap(ret);
     }
     /**
@@ -688,14 +708,18 @@ export class IfcAPI {
      * @param {Uint8Array} data
      * @param {Function} on_event
      * @param {number} chunk_size
+     * @param {string[] | null | undefined} disabled_type_names
+     * @param {boolean} skip_type_geometry
      * @returns {any}
      */
-    buildPrePassStreaming(data, on_event, chunk_size) {
+    buildPrePassStreaming(data, on_event, chunk_size, disabled_type_names, skip_type_geometry) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
             const ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_export);
             const len0 = WASM_VECTOR_LEN;
-            wasm.ifcapi_buildPrePassStreaming(retptr, this.__wbg_ptr, ptr0, len0, addBorrowedObject(on_event), chunk_size);
+            var ptr1 = isLikeNone(disabled_type_names) ? 0 : passArrayJsValueToWasm0(disabled_type_names, wasm.__wbindgen_export);
+            var len1 = WASM_VECTOR_LEN;
+            wasm.ifcapi_buildPrePassStreaming(retptr, this.__wbg_ptr, ptr0, len0, addBorrowedObject(on_event), chunk_size, ptr1, len1, skip_type_geometry);
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
@@ -1124,7 +1148,8 @@ export class MeshCollection {
         return takeObject(ret);
     }
     /**
-     * Get mesh at index
+     * Get mesh at index (clones — non-destructive). Prefer `takeMesh` on the
+     * hot streaming path; this stays for callers that read meshes more than once.
      * @param {number} index
      * @returns {MeshDataJs | undefined}
      */
@@ -1140,6 +1165,20 @@ export class MeshCollection {
         const ret = wasm.meshcollection_length(this.__wbg_ptr);
         return ret >>> 0;
     }
+    /**
+     * #1097 perf: MOVE the mesh at `index` out of the collection (the Vec
+     * buffers are `std::mem::take`-n, leaving an empty stub). The streaming
+     * worker reads each mesh exactly once, so moving avoids the full vertex-
+     * data clone `get` pays — one fewer copy of positions/normals/indices/uvs/
+     * texture per mesh (the JS getters still do the single Rust→JS copy). Calling
+     * it twice for the same index yields the second call an empty mesh.
+     * @param {number} index
+     * @returns {MeshDataJs | undefined}
+     */
+    takeMesh(index) {
+        const ret = wasm.meshcollection_takeMesh(this.__wbg_ptr, index);
+        return ret === 0 ? undefined : MeshDataJs.__wrap(ret);
+    }
 }
 if (Symbol.dispose) MeshCollection.prototype[Symbol.dispose] = MeshCollection.prototype.free;
 
@@ -1292,6 +1331,16 @@ export class MeshDataJs {
             wasm.__wbindgen_add_to_stack_pointer(16);
         }
     }
+    /**
+     * Per-element local-frame origin (Float64Array[3], WebGL Y-up, metres):
+     * world position of vertex i = `origin + positions[3i..3i+3]`. Returns
+     * [0,0,0] when positions are absolute (legacy / local frame off).
+     * @returns {Float64Array}
+     */
+    get origin() {
+        const ret = wasm.meshdatajs_origin(this.__wbg_ptr);
+        return takeObject(ret);
+    }
     /**
      * Get indices as Uint32Array (copy to JS)
      * @returns {Uint32Array}
@@ -1473,7 +1522,7 @@ export class ProfileEntryJs {
      * @returns {number}
      */
     get expressId() {
-        const ret = wasm.profileentryjs_expressId(this.__wbg_ptr);
+        const ret = wasm.meshdatajs_textureWidth(this.__wbg_ptr);
         return ret >>> 0;
     }
     /**
@@ -1996,7 +2045,7 @@ export class SymbolicFillArea {
      * @returns {number}
      */
     get expressId() {
-        const ret = wasm.profileentryjs_expressId(this.__wbg_ptr);
+        const ret = wasm.meshdatajs_textureWidth(this.__wbg_ptr);
         return ret >>> 0;
     }
     /**
@@ -2404,7 +2453,7 @@ export class SymbolicText {
      * @returns {number}
      */
     get expressId() {
-        const ret = wasm.profileentryjs_expressId(this.__wbg_ptr);
+        const ret = wasm.meshdatajs_textureWidth(this.__wbg_ptr);
         return ret >>> 0;
     }
     /**
@@ -2694,6 +2743,14 @@ function __wbg_get_imports() {
         const ret = wasm.memory;
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg___wbindgen_string_get_a2a31e16edf96e42 = function(arg0, arg1) {
+        const obj = getObject(arg1);
+        const ret = typeof(obj) === 'string' ? obj : undefined;
+        var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        var len1 = WASM_VECTOR_LEN;
+        getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+        getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+    };
     imports.wbg.__wbg___wbindgen_throw_dd24417ed36fc46e = function(arg0, arg1) {
         throw new Error(getStringFromWasm0(arg0, arg1));
     };
@@ -2735,6 +2792,10 @@ function __wbg_get_imports() {
         const ret = new BigUint64Array(getArrayU64FromWasm0(arg0, arg1));
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_new_from_slice_9a48ef80d2a51f94 = function(arg0, arg1) {
+        const ret = new Float64Array(getArrayF64FromWasm0(arg0, arg1));
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbg_new_from_slice_db0691b69e9d3891 = function(arg0, arg1) {
         const ret = new Uint32Array(getArrayU32FromWasm0(arg0, arg1));
         return addHeapObject(ret);
@@ -2751,10 +2812,6 @@ function __wbg_get_imports() {
         const ret = new Float64Array(arg0 >>> 0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_new_with_length_aa5eaf41d35235e5 = function(arg0) {
-        const ret = new Uint8Array(arg0 >>> 0);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbg_set_3f1d0b984ed272ed = function(arg0, arg1, arg2) {
         getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
     };
@@ -2768,9 +2825,6 @@ function __wbg_get_imports() {
     imports.wbg.__wbg_set_index_021489b2916af13e = function(arg0, arg1, arg2) {
         getObject(arg0)[arg1 >>> 0] = arg2;
     };
-    imports.wbg.__wbg_set_index_04c4b93e64d08a52 = function(arg0, arg1, arg2) {
-        getObject(arg0)[arg1 >>> 0] = arg2;
-    };
     imports.wbg.__wbg_set_index_42abe35f117e614e = function(arg0, arg1, arg2) {
         getObject(arg0)[arg1 >>> 0] = arg2 >>> 0;
     };