wip memory management

Author: matas-bitbybit-dev

src/lib/api/bitbybit/occt/shapes/face.ts

@@ -10,7 +10,6 @@ export class OCCTFace {
         private readonly occWorkerManager: OCCTWorkerManager,
     ) {
     }
-
     /**
      * Creates a face from wire
      * <div>

src/lib/workers/occ/occ-helper.ts

@@ -3,8 +3,8 @@ import * as Inputs from '../../api/inputs/inputs';
 import { OccHelper } from './occ-helper';
 import { OCCTBooleans } from './services/booleans';
 import { OCCTGeom } from './services/geom/geom';
-// import { OCCTAdvanced } from './services/advanced/advanced';
-import { OCCTAdvanced } from './services/advanced-mock/advanced';
+import { OCCTAdvanced } from './services/advanced/advanced';
+// import { OCCTAdvanced } from './services/advanced-mock/advanced';
 import { OCCTIO } from './services/io';
 import { OCCTOperations } from './services/operations';
 import { OCCTShapes } from './services/shapes/shapes';

src/lib/workers/occ/occ-service.ts

@@ -1,15 +1,15 @@
-// import { OpenCascadeInstance } from '../../../../../bitbybit-dev-occt/bitbybit-dev-occt';
-// import { OccHelper } from '../../occ-helper';
-// import { OCCTIntersections } from './intersections';
+import { OpenCascadeInstance } from '../../../../../bitbybit-dev-occt/bitbybit-dev-occt';
+import { OccHelper } from '../../occ-helper';
+import { OCCTIntersections } from './intersections';
 
-// export class OCCTAdvanced {
-//     public readonly intersections: OCCTIntersections;
+export class OCCTAdvanced {
+    public readonly intersections: OCCTIntersections;
 
-//     constructor(
-//         occ: OpenCascadeInstance,
-//         och: OccHelper
-//     ) {
-//         this.intersections = new OCCTIntersections(occ, och);
-//     }
+    constructor(
+        occ: OpenCascadeInstance,
+        och: OccHelper
+    ) {
+        this.intersections = new OCCTIntersections(occ, och);
+    }
 
-// }
+}

src/lib/workers/occ/services/advanced/advanced.ts

@@ -1,22 +1,23 @@
-// import { OpenCascadeInstance, TopoDS_Shape } from '../../../../../bitbybit-dev-occt/bitbybit-dev-occt';
-// import { OccHelper } from '../../occ-helper';
-// import * as Inputs from '../../../../api/inputs/inputs';
-// // import { AdvIntersections } from 'projects/bitbybit-advanced/src/adv-intersections';
+import { OpenCascadeInstance, TopoDS_Shape } from '../../../../../bitbybit-dev-occt/bitbybit-dev-occt';
+import { OccHelper } from '../../occ-helper';
+import * as Inputs from '../../../../api/inputs/inputs';
+import { AdvIntersections } from 'projects/bitbybit-advanced/src/adv-intersections';
+import { TopoDS_Compound } from 'opencascade.js';
 
-// export class OCCTIntersections {
+export class OCCTIntersections {
 
-//     private readonly advIntersections: AdvIntersections;
+    private readonly advIntersections: AdvIntersections;
 
-//     constructor(
-//         private readonly occ: OpenCascadeInstance,
-//         private readonly och: OccHelper
-//     ) {
-//         this.advIntersections = new AdvIntersections(occ, och);
-//     }
+    constructor(
+        private readonly occ: OpenCascadeInstance,
+        private readonly och: OccHelper
+    ) {
+        this.advIntersections = new AdvIntersections(occ, och);
+    }
 
-//     // Source code of this method is only available in proprietary bitbybit library that is not opensourced
-//     slice(inputs: Inputs.OCCT.SliceDto<TopoDS_Shape>): TopoDS_Shape[] {
-//         return this.advIntersections.slice(inputs);
-//     }
+    // Source code of this method is only available in proprietary bitbybit library that is not opensourced
+    slice(inputs: Inputs.OCCT.SliceDto<TopoDS_Shape>): TopoDS_Compound {
+        return this.advIntersections.slice(inputs);
+    }
 
-// }
+}

src/lib/workers/occ/services/advanced/intersections.ts

@@ -13,15 +13,21 @@ export class OCCTBooleans {
     union(inputs: Inputs.OCCT.UnionDto<TopoDS_Shape>): TopoDS_Shape {
         let combined = inputs.shapes[0];
         for (let i = 0; i < inputs.shapes.length; i++) {
-            const combinedFuse = new this.occ.BRepAlgoAPI_Fuse_3(combined, inputs.shapes[i], new this.occ.Message_ProgressRange_1());
-            combinedFuse.Build(new this.occ.Message_ProgressRange_1());
+            const messageProgress1 = new this.occ.Message_ProgressRange_1();
+            const combinedFuse = new this.occ.BRepAlgoAPI_Fuse_3(combined, inputs.shapes[i], messageProgress1);
+            const messageProgress2 = new this.occ.Message_ProgressRange_1()
+            combinedFuse.Build(messageProgress2);
             combined = combinedFuse.Shape();
+            messageProgress1.delete();
+            messageProgress2.delete();
+            combinedFuse.delete();
         }
 
         if (!inputs.keepEdges) {
             const fusor = new this.occ.ShapeUpgrade_UnifySameDomain_2(combined, true, true, false);
             fusor.Build();
             combined = fusor.Shape();
+            fusor.delete();
         }
 
         return combined;
@@ -32,25 +38,35 @@ export class OCCTBooleans {
         const objectsToSubtract = inputs.shapes;
         for (let i = 0; i < objectsToSubtract.length; i++) {
             if (!objectsToSubtract[i] || objectsToSubtract[i].IsNull()) { console.error('Tool in Difference is null!'); }
-            const differenceCut = new this.occ.BRepAlgoAPI_Cut_3(difference, objectsToSubtract[i], new this.occ.Message_ProgressRange_1());
-            differenceCut.Build(new this.occ.Message_ProgressRange_1());
+            const messageProgress1 = new this.occ.Message_ProgressRange_1();
+            const differenceCut = new this.occ.BRepAlgoAPI_Cut_3(difference, objectsToSubtract[i], messageProgress1);
+            const messageProgress2 = new this.occ.Message_ProgressRange_1();
+            differenceCut.Build(messageProgress2);
             difference = differenceCut.Shape();
+            messageProgress1.delete();
+            messageProgress2.delete();
+            differenceCut.delete();
         }
 
         if (!inputs.keepEdges) {
             const fusor = new this.occ.ShapeUpgrade_UnifySameDomain_2(difference, true, true, false);
             fusor.Build();
-            difference = fusor.Shape();
+            let fusedShape = fusor.Shape();
+            difference.delete();
+            difference = fusedShape;
+            fusor.delete();
         }
 
         if (this.och.getNumSolidsInCompound(difference) === 1) {
-            difference = this.och.getSolidFromCompound(difference, 0);
+            let solid = this.och.getSolidFromCompound(difference, 0);
+            difference.delete();
+            difference = solid;
         }
 
         return difference;
     }
 
-    intersection(inputs: Inputs.OCCT.IntersectionDto<TopoDS_Shape>): TopoDS_Shape {
+    intersection(inputs: Inputs.OCCT.IntersectionDto<TopoDS_Shape>): TopoDS_Shape[] {
         return this.och.intersection(inputs);
     }
 

src/lib/workers/occ/services/booleans.ts

@@ -19,13 +19,18 @@ export class OCCTFillets {
                 inputs.shape, (this.occ.TopAbs_ShapeEnum.TopAbs_EDGE as TopAbs_ShapeEnum),
                 (this.occ.TopAbs_ShapeEnum.TopAbs_SHAPE as TopAbs_ShapeEnum)
             );
+            let edges = [];
             while (anEdgeExplorer.More()) {
                 const anEdge = this.occ.TopoDS.Edge_1(anEdgeExplorer.Current());
+                edges.push(anEdge);
                 mkFillet.Add_2(inputs.radius, anEdge);
                 anEdgeExplorer.Next();
             }
-            inputs.shape = mkFillet.Shape();
-            return inputs.shape;
+            const result = mkFillet.Shape();
+            mkFillet.delete();
+            anEdgeExplorer.delete();
+            edges.forEach(e => e.delete());
+            return result;
         } else if (inputs.indexes && inputs.indexes.length > 0) {
             const mkFillet = new this.occ.BRepFilletAPI_MakeFillet(
                 inputs.shape, (this.occ.ChFi3d_FilletShape.ChFi3d_Rational as ChFi3d_FilletShape)
@@ -50,7 +55,10 @@ export class OCCTFillets {
             else {
                 curFillet = mkFillet.Shape();
             }
-            return this.och.getActualTypeOfShape(curFillet);
+            mkFillet.delete();
+            let result = this.och.getActualTypeOfShape(curFillet);
+            curFillet.delete();
+            return result;
         }
         return undefined;
     }
@@ -64,19 +72,24 @@ export class OCCTFillets {
                 inputs.shape, (this.occ.TopAbs_ShapeEnum.TopAbs_EDGE as TopAbs_ShapeEnum),
                 (this.occ.TopAbs_ShapeEnum.TopAbs_SHAPE as TopAbs_ShapeEnum)
             );
+            const edges = [];
             while (anEdgeExplorer.More()) {
                 const anEdge = this.occ.TopoDS.Edge_1(anEdgeExplorer.Current());
+                edges.push(anEdge);
                 mkChamfer.Add_2(inputs.distance, anEdge);
                 anEdgeExplorer.Next();
             }
-            inputs.shape = mkChamfer.Shape();
-            return inputs.shape;
+            const result = mkChamfer.Shape();
+            mkChamfer.delete();
+            anEdgeExplorer.delete();
+            edges.forEach(e => e.delete());
+            return result;
         } else if (inputs.indexes && inputs.indexes.length > 0) {
             const mkChamfer = new this.occ.BRepFilletAPI_MakeChamfer(
                 inputs.shape
             );
             let foundEdges = 0;
-            let curFillet;
+            let curChamfer;
             let distanceIndex = 0;
             this.och.forEachEdge(inputs.shape, (index, edge) => {
                 if (inputs.indexes.includes(index)) {
@@ -90,13 +103,16 @@ export class OCCTFillets {
                 }
             });
             if (foundEdges === 0) {
-                console.error('Fillet Edges Not Found!  Make sure you are looking at the object _before_ the Fillet is applied!');
-                curFillet = inputs.shape;
+                console.error('Chamfer Edges Not Found!  Make sure you are looking at the object _before_ the Fillet is applied!');
+                curChamfer = inputs.shape;
             }
             else {
-                curFillet = mkChamfer.Shape();
+                curChamfer = mkChamfer.Shape();
             }
-            return this.och.getActualTypeOfShape(curFillet);
+            mkChamfer.delete();
+            let result = this.och.getActualTypeOfShape(curChamfer);
+            curChamfer.delete();
+            return result;
         }
         return undefined;
     }
@@ -115,7 +131,14 @@ export class OCCTFillets {
         }
         const filletedEdge = fil.Result(pt, edge1, edge2, solution);
 
-        return this.och.combineEdgesAndWiresIntoAWire({ shapes: [edge1, filletedEdge, edge2] });
+        let result = this.och.combineEdgesAndWiresIntoAWire({ shapes: [edge1, filletedEdge, edge2] });
+        fil.delete();
+        pt.delete();
+        pln.delete();
+        edge1.delete();
+        edge2.delete();
+        filletedEdge.delete();
+        return result;
     }
 
     fillet2d(inputs: Inputs.OCCT.FilletDto<TopoDS_Wire | TopoDS_Face>): TopoDS_Face | TopoDS_Wire {
@@ -129,8 +152,13 @@ export class OCCTFillets {
             isShapeFace = true;
         } else if (inputs.shape.ShapeType() === this.occ.TopAbs_ShapeEnum.TopAbs_WIRE) {
             const faceBuilder = new this.occ.BRepBuilderAPI_MakeFace_15(inputs.shape, true);
-            faceBuilder.Build(new this.occ.Message_ProgressRange_1());
-            face = this.och.getActualTypeOfShape(faceBuilder.Shape());
+            const messageProgress = new this.occ.Message_ProgressRange_1();
+            faceBuilder.Build(messageProgress);
+            let shape = faceBuilder.Shape();
+            face = this.och.getActualTypeOfShape(shape);
+            shape.delete();
+            messageProgress.delete();
+            faceBuilder.delete();
         } else {
             throw new Error(`You can only fillet a 2d wire or a 2d face.`);
         }
@@ -165,18 +193,25 @@ export class OCCTFillets {
                 radiusAddedCounter++;
             }
         })
-        filletMaker.Build(new this.occ.Message_ProgressRange_1());
+        const messageProgress = new this.occ.Message_ProgressRange_1();
+        filletMaker.Build(messageProgress);
+        let result;
         if (isShapeFace) {
-            return filletMaker.Shape();
+            result = filletMaker.Shape();
         } else {
             const filletedWires = this.och.getWires({ shape: filletMaker.Shape() });
             if (filletedWires.length === 1) {
-                return filletedWires[0];
+                result = filletedWires[0];
             }
             else {
                 throw new Error('There was an error when computing fillet.')
             }
         }
+        anVertexExplorer.delete();
+        filletMaker.delete();
+        messageProgress.delete();
+        cornerVertices.forEach(cvx => cvx.delete());
+        return result;
     }
 
     private applyRadiusToVertex(inputs: Inputs.OCCT.FilletDto<TopoDS_Shape>, filletMaker: BRepFilletAPI_MakeFillet2d_2, cvx: TopoDS_Vertex, index: number) {

src/lib/workers/occ/services/fillets.ts

@@ -12,30 +12,43 @@ export class OCCTCurves {
 
     geom2dEllipse(inputs: Inputs.OCCT.Geom2dEllipseDto) {
         const axis2d = this.och.gpAx2d(inputs.center, inputs.direction);
-        return new this.occ.Geom2d_Ellipse_2(axis2d, inputs.radiusMajor, inputs.radiusMinor, inputs.sense);
+        let res = new this.occ.Geom2d_Ellipse_2(axis2d, inputs.radiusMajor, inputs.radiusMinor, inputs.sense);
+        axis2d.delete();
+        return res;
     }
 
     geom2dCircle(inputs: Inputs.OCCT.Geom2dCircleDto) {
         const axis2d = this.och.gpAx2d(inputs.center, inputs.direction);
-        return new this.occ.Geom2d_Circle_2(axis2d, inputs.radius, inputs.sense);
+        let res = new this.occ.Geom2d_Circle_2(axis2d, inputs.radius, inputs.sense);
+        axis2d.delete();
+        return res;
     }
 
     geom2dTrimmedCurve(inputs: Inputs.OCCT.Geom2dTrimmedCurveDto<Geom2d_Curve>) {
         const handleCurve = new this.occ.Handle_Geom2d_Curve_2(inputs.shape);
         const trimmed = new this.occ.Geom2d_TrimmedCurve(handleCurve, inputs.u1, inputs.u2, inputs.sense, inputs.theAdjustPeriodic);
+        handleCurve.delete();
         return trimmed;
     }
 
     geom2dSegment(inputs: Inputs.OCCT.Geom2dSegmentDto) {
         const pt1 = this.och.gpPnt2d(inputs.start);
         const pt2 = this.och.gpPnt2d(inputs.end);
         const res = new this.occ.GCE2d_MakeSegment_1(pt1, pt2);
-        return res.Value().get();
+        let resValue = res.Value();
+        let r = resValue.get();
+        pt1.delete();
+        pt2.delete();
+        resValue.delete();
+        res.delete();
+        return r;
     }
 
     get2dPointFrom2dCurveOnParam(inputs: Inputs.OCCT.DataOnGeometryAtParamDto<Geom2d_Curve>) {
         const pt2d = inputs.shape.Value(inputs.param);
-        return { result: [pt2d.X(), pt2d.Y()] };
+        const pt = [pt2d.X(), pt2d.Y()] 
+        pt2d.delete();
+        return { result: pt};
     }
 
     geomCircleCurve(inputs: Inputs.OCCT.CircleDto): any {

src/lib/workers/occ/services/geom/curves.ts

@@ -12,7 +12,9 @@ export class OCCTSurfaces {
 
     cylindricalSurface(inputs: Inputs.OCCT.GeomCylindricalSurfaceDto) {
         const ax = this.och.gpAx3(inputs.center, inputs.direction);
-        return new this.occ.Geom_CylindricalSurface_1(ax, inputs.radius);
+        let res = new this.occ.Geom_CylindricalSurface_1(ax, inputs.radius);
+        ax.delete();
+        return res;
     }
 
     surfaceFromFace(inputs: Inputs.OCCT.ShapeDto<TopoDS_Face>) {