@bldrs-ai/conway 0.15.836 → 0.15.839

package/compiled/src/ifc/ifc_geometry_extraction.js

@@ -121,7 +121,6 @@ export class IfcGeometryExtraction {
         this.TWO_DIMENSIONS = 2;
         this.THREE_DIMENSIONS = 3;
         this.circleSegments = 12;
-        this.pointBuffer = null;
         this.csgMemoization = true;
         this.freeVectorPolygonalFaces_ = [];
         this.csgMemoization = !this.lowMemoryMode;
@@ -2418,91 +2417,6 @@ export class IfcGeometryExtraction {
         });
         return flatCoordinates;
     }
-    /**
-     * Efficiently flatten the points into a Float64Array while skipping
-     * consecutive points with the same localID.
-     *
-     * @param points - Array of IfcCartesianPoint
-     * @param dimensions - Number of coordinates per point (e.g. 3 for x,y,z)
-     * @return {Float64Array}
-     */
-    flattenCartesianPointsToFloat64ArrayFiltered(points, dimensions) {
-        // 1) First pass: figure out how many points *actually* get included
-        //    (skipping consecutive duplicates by localID)
-        let uniqueCount = 0;
-        for (let i = 0; i < points.length; i++) {
-            if (i === 0 || points[i].localID !== points[i - 1].localID) {
-                uniqueCount++;
-            }
-        }
-        // 2) Knowing how many we'll include, allocate the final TypedArray
-        const totalCoordinates = uniqueCount * dimensions;
-        const flatCoordinates = new Float64Array(totalCoordinates);
-        // 3) Second pass: populate flatCoordinates
-        let offset = 0;
-        let prevLocalID = -1;
-        for (let i = 0; i < points.length; i++) {
-            const point = points[i];
-            if (i === 0 || point.localID !== prevLocalID) {
-                // Copy only if localID changed
-                flatCoordinates.set(point.Coordinates, offset);
-                offset += point.Coordinates.length; // or offset += dimensions if all are guaranteed
-                prevLocalID = point.localID;
-            }
-        }
-        return flatCoordinates;
-    }
-    /**
-     * Flatten the points into WASM memory (skipping consecutive duplicates).
-     * Reuses an existing WASM buffer if provided and large enough.
-     *
-     * @param points - Array of IfcCartesianPoint
-     * @param dimensions - Number of coordinates per point (e.g. 3 for x,y,z)
-     * @param existingPtr - (Optional) Pointer to an existing WASM buffer
-     * @param existingCapacity - (Optional) Capacity of that buffer in Float64 elements
-     * @return {FlattenedPointsResult} pointer, length used, total capacity
-     */
-    flattenCartesianPointsToWasmFiltered(points, dimensions, existingPtr, existingCapacity) {
-        // The maximum we might need if we do NOT skip duplicates
-        const maxPossibleFloats = points.length * dimensions;
-        const bytesPerElement = 8; // Float64
-        // 1) Allocate or reuse memory in WASM
-        let pointer = existingPtr ?? 0;
-        let capacity = existingCapacity ?? 0;
-        // If we have no existing buffer OR it's too small, allocate a new one
-        if (!pointer || capacity < maxPossibleFloats) {
-            // Free the old buffer if it exists and is too small
-            if (pointer) {
-                this.wasmModule._free(pointer);
-            }
-            const numBytes = maxPossibleFloats * bytesPerElement;
-            pointer = this.wasmModule._malloc(numBytes);
-            capacity = maxPossibleFloats;
-        }
-        // 2) Create a Float64Array view into WASM memory
-        // We only need to create a subarray up to the capacity
-        const wasmFloat64View = this.wasmModule.HEAPF64.subarray(pointer / bytesPerElement, 
-        // eslint-disable-next-line no-mixed-operators
-        pointer / bytesPerElement + capacity);
-        // 3) Single pass to skip consecutive duplicates, fill up the wasm array
-        let offset = 0;
-        let prevLocalID = -1;
-        for (let i = 0; i < points.length; i++) {
-            const point = points[i];
-            if (i === 0 || point.localID !== prevLocalID) {
-                // Copy 'dimensions' values for the current point
-                wasmFloat64View.set(point.Coordinates, offset);
-                offset += dimensions;
-                prevLocalID = point.localID;
-            }
-        }
-        // 4) Return the pointer, the actual usage, and the capacity
-        return {
-            pointer,
-            length: offset,
-            capacity,
-        };
-    }
     /**
      *
      * @param from
@@ -3170,7 +3084,7 @@ export class IfcGeometryExtraction {
                         coordParseBuffer.resize(0);
                     }
                     vec3Array = this.wasmModule.parseVertexVector(coordParseBuffer);
-                    conwayModel.freeParseBuffer(coordParseBuffer);
+                    this.wasmModule.freeParseBuffer(coordParseBuffer);
                 }
                 else if (innerBound instanceof IfcEdgeLoop) {
                     vec3Array = this.nativeVectorGlmdVec3();
@@ -3452,33 +3366,53 @@ export class IfcGeometryExtraction {
     extractFace(from, geometry) {
         if (from.Bounds.length > 0) {
             const bound3DVector = this.nativeBound3DVector();
-            // let pointsPtrs:any[]
             for (let boundIndex = 0; boundIndex < from.Bounds.length; ++boundIndex) {
+                const vec3Array = this.nativeVectorGlmdVec3();
                 const bound = from.Bounds[boundIndex];
-                const innerBound = bound.Bound;
-                if (innerBound instanceof IfcPolyLoop) {
-                    // Attempt to reuse the pointer/capacity from `pointBuffer`
-                    const result = this.flattenCartesianPointsToWasmFiltered(innerBound.Polygon, this.THREE_DIMENSIONS, this.pointBuffer?.pointer, this.pointBuffer?.capacity);
-                    // Now `result.pointer` is your up-to-date pointer (maybe a new allocation).
-                    // `result.length` is how many Float64 coords are valid.
-                    // `result.capacity` is how many Float64 coords that pointer can hold.
-                    // eslint-disable-next-line no-unused-vars
-                    const { pointer, length, capacity } = result;
-                    // Use them in your WASM call
-                    const bound3D = this.wasmModule.createSimpleBound3D(pointer, length, bound.Orientation, bound.type === EntityTypesIfc.IFCFACEOUTERBOUND ? 0 : 1);
-                    // Push your result somewhere
-                    bound3DVector.push_back(bound3D);
-                    // Save the buffer for reuse in the next iteration
-                    this.pointBuffer = result;
+                if (bound.Bound instanceof IfcPolyLoop) {
+                    let prevLocalID = -1;
+                    for (let pointIndex = 0; pointIndex < bound.Bound.Polygon.length; ++pointIndex) {
+                        const vec3 = {
+                            x: bound.Bound.Polygon[pointIndex].Coordinates[0],
+                            y: bound.Bound.Polygon[pointIndex].Coordinates[1],
+                            z: bound.Bound.Polygon[pointIndex].Coordinates[2],
+                        };
+                        const currentLocalID = bound.Bound.Polygon[pointIndex].localID;
+                        if (currentLocalID !== prevLocalID) {
+                            vec3Array.push_back(vec3);
+                            prevLocalID = currentLocalID;
+                        }
+                    }
                 }
+                const edgesDummy = this.nativeVectorCurve();
+                // get curve
+                const parameters = {
+                    points: vec3Array,
+                    edges: edgesDummy,
+                };
+                const curve = this.conwayModel.getLoop(parameters);
+                // create bound vector
+                const parametersCreateBounds3D = {
+                    curve: curve,
+                    orientation: bound.Orientation,
+                    type: (bound.type === EntityTypesIfc.IFCFACEOUTERBOUND) ? 0 : 1,
+                };
+                const bound3D = this.conwayModel.createBound3D(parametersCreateBounds3D);
+                bound3DVector.push_back(bound3D);
+                vec3Array.delete();
+                edgesDummy.delete();
             }
             // add face to geometry
+            const defaultSurface = (new (this.wasmModule.IfcSurface));
             const parameters = {
                 boundsArray: bound3DVector,
+                advancedBrep: false,
+                surface: defaultSurface,
                 scaling: this.getLinearScalingFactor(),
             };
-            this.conwayModel.addFaceToGeometrySimple(parameters, geometry);
+            this.conwayModel.addFaceToGeometry(parameters, geometry);
             bound3DVector.delete();
+            defaultSurface.delete();
         }
     }
     /**
@@ -4432,11 +4366,6 @@ export class IfcGeometryExtraction {
                 this.model.geometry.deleteTemporaries();
                 this.model.voidGeometry.deleteTemporaries();
             }
-            // free buffer at the end if you don't need it anymore
-            if (this.pointBuffer?.pointer) {
-                this.wasmModule._free(this.pointBuffer.pointer);
-                this.pointBuffer = null;
-            }
             result = ExtractResult.COMPLETE;
             return [result, this.scene];
         }

package/compiled/src/ifc/ifc_step_model.d.ts

@@ -25,6 +25,7 @@ export default class IfcStepModel extends StepModelBase<EntityTypesIfc> {
      * Construct this model given a buffer containing the data and the parsed data index on that,
      * adding the typeIndex on top of that.
      *
+     * @param wasmModule
      * @param buffer The buffer to values from.
      * @param elementIndex The parsed index to elements in the STEP.
      */

package/compiled/src/ifc/ifc_step_model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ifc_step_model.d.ts","sourceRoot":"","sources":["../../../src/ifc/ifc_step_model.ts"],"names":[],"mappings":"AAAA,OAAO,cAAqC,MAAM,iCAAiC,CAAA;AACnF,OAAO,aAAa,MAAM,yBAAyB,CAAA;AAEnD,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAA;AAE1D,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,sBAAsB,MAAM,6BAA6B,CAAA;AAChE,OAAO,cAAc,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAKvD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,aAAa,CAAE,cAAc,CAAE;IAEvE,SAAgB,SAAS,EAAE,aAAa,CAAE,cAAc,CAAE,CAAA;IAC1D,SAAgB,mBAAmB,gCAAyB;IAC5D,SAAgB,QAAQ,mBAA+B;IACvD,SAAgB,YAAY,mBAAqC;IACjE,SAAgB,QAAQ,kBAA4B;IACpD,SAAgB,MAAM,iBAA2B;IACjD,SAAgB,aAAa,iBAAuB;IACpD,SAAgB,SAAS,mBAA+B;IACxD,SAAgB,aAAa,mBAAqC;IAElE;;;;;;OAMG;gBAEC,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,cAAc,CAAE,cAAc,CAAE,EAAE;CAKrD"}
+{"version":3,"file":"ifc_step_model.d.ts","sourceRoot":"","sources":["../../../src/ifc/ifc_step_model.ts"],"names":[],"mappings":"AAAA,OAAO,cAAqC,MAAM,iCAAiC,CAAA;AACnF,OAAO,aAAa,MAAM,yBAAyB,CAAA;AAEnD,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAA;AAE1D,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,sBAAsB,MAAM,6BAA6B,CAAA;AAChE,OAAO,cAAc,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAKvD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,aAAa,CAAE,cAAc,CAAE;IAEvE,SAAgB,SAAS,EAAE,aAAa,CAAE,cAAc,CAAE,CAAA;IAC1D,SAAgB,mBAAmB,gCAAyB;IAC5D,SAAgB,QAAQ,mBAA+B;IACvD,SAAgB,YAAY,mBAAqC;IACjE,SAAgB,QAAQ,kBAA4B;IACpD,SAAgB,MAAM,iBAA2B;IACjD,SAAgB,aAAa,iBAAuB;IACpD,SAAgB,SAAS,mBAA+B;IACxD,SAAgB,aAAa,mBAAqC;IAElE;;;;;;;OAOG;gBAEC,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,cAAc,CAAE,cAAc,CAAE,EAAE;CAKrD"}

package/compiled/src/ifc/ifc_step_model.js

@@ -17,6 +17,7 @@ export default class IfcStepModel extends StepModelBase {
      * Construct this model given a buffer containing the data and the parsed data index on that,
      * adding the typeIndex on top of that.
      *
+     * @param wasmModule
      * @param buffer The buffer to values from.
      * @param elementIndex The parsed index to elements in the STEP.
      */

package/compiled/src/ifc/ifc_step_parser.d.ts

@@ -20,6 +20,7 @@ export default class IfcStepParser extends StepParser<EntityTypesIfc> {
     /**
      * Parse data to the model
      *
+     * @param wasmModule A conway-geom wasm module environnment for this.
      * @param input The parsing buffer, set to user data, to read.
      * @return {[ParseResult, IfcStepModel | undefined]} The parse result as well as the model,
      * if it can be extracted.

package/compiled/src/ifc/ifc_step_parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ifc_step_parser.d.ts","sourceRoot":"","sources":["../../../src/ifc/ifc_step_parser.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,2BAA2B,CAAA;AACrD,OAAO,UAAU,EAAE,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAA;AACnE,OAAO,cAAc,MAAM,iCAAiC,CAAA;AAE5D,OAAO,YAAY,MAAM,kBAAkB,CAAA;AAE3C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU,CAAE,cAAc,CAAE;IACrE;;OAEG;;IAKH;;;;;OAKG;IACH,gBAAuB,QAAQ,gBAAsB;IAErD;;;;;;OAMG;IACI,gBAAgB,CACnB,KAAK,EAAE,aAAa,GAAI,CAAC,WAAW,EAAE,YAAY,GAAG,SAAS,CAAC;CAKpE"}
+{"version":3,"file":"ifc_step_parser.d.ts","sourceRoot":"","sources":["../../../src/ifc/ifc_step_parser.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,2BAA2B,CAAA;AACrD,OAAO,UAAU,EAAE,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAA;AACnE,OAAO,cAAc,MAAM,iCAAiC,CAAA;AAE5D,OAAO,YAAY,MAAM,kBAAkB,CAAA;AAE3C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU,CAAE,cAAc,CAAE;IACrE;;OAEG;;IAKH;;;;;OAKG;IACH,gBAAuB,QAAQ,gBAAsB;IAErD;;;;;;;OAOG;IACI,gBAAgB,CACnB,KAAK,EAAE,aAAa,GAAI,CAAC,WAAW,EAAE,YAAY,GAAG,SAAS,CAAC;CAKpE"}

package/compiled/src/ifc/ifc_step_parser.js

@@ -14,6 +14,7 @@ export default class IfcStepParser extends StepParser {
     /**
      * Parse data to the model
      *
+     * @param wasmModule A conway-geom wasm module environnment for this.
      * @param input The parsing buffer, set to user data, to read.
      * @return {[ParseResult, IfcStepModel | undefined]} The parse result as well as the model,
      * if it can be extracted.

package/compiled/src/version/version.js

@@ -1,2 +1,2 @@
-const versionString = 'Conway Web-Ifc Shim v0.15.836';
+const versionString = 'Conway Web-Ifc Shim v0.13.835';
 export { versionString };