✨ feat: add simplifyShape

Author: xiangechen

cpp/src/factory.cpp

@@ -32,6 +32,7 @@
 #include <Geom_BezierCurve.hxx>
 #include <ShapeAnalysis_Edge.hxx>
 #include <ShapeAnalysis_WireOrder.hxx>
+#include <ShapeUpgrade_UnifySameDomain.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 #include <gp_Ax2.hxx>
@@ -429,6 +430,21 @@ class ShapeFactory {
         return ShapeResult { makeThickSolid.Shape(), true, "" };
     }
 
+    static ShapeResult simplifyShape(
+        const TopoDS_Shape& shape,
+        const Standard_Boolean theUnifyEdges,
+        const Standard_Boolean theUnifyFaces)
+    {
+        if (!theUnifyEdges && !theUnifyFaces) {
+            return ShapeResult { shape, true, "" };
+        }
+
+        ShapeUpgrade_UnifySameDomain anUnifier(shape, theUnifyEdges, theUnifyFaces, Standard_True);
+        anUnifier.Build();
+
+        return ShapeResult { anUnifier.Shape(), true, "" };
+    }
+
     static ShapeResult booleanOperate(BRepAlgoAPI_BooleanOperation& boolOperater, const ShapeArray& args,
         const ShapeArray& tools)
     {
@@ -442,7 +458,6 @@ class ShapeFactory {
         if (!boolOperater.IsDone()) {
             return ShapeResult { TopoDS_Shape(), false, "Failed to build boolean operation" };
         }
-        boolOperater.SimplifyResult();
 
         return ShapeResult { boolOperater.Shape(), true, "" };
     }
@@ -555,6 +570,7 @@ EMSCRIPTEN_BINDINGS(ShapeFactory)
         .class_function("solid", &ShapeFactory::solid)
         .class_function("makeThickSolidBySimple", &ShapeFactory::makeThickSolidBySimple)
         .class_function("makeThickSolidByJoin", &ShapeFactory::makeThickSolidByJoin)
+        .class_function("simplifyShape", &ShapeFactory::simplifyShape)
         .class_function("booleanCommon", &ShapeFactory::booleanCommon)
         .class_function("booleanCut", &ShapeFactory::booleanCut)
         .class_function("booleanFuse", &ShapeFactory::booleanFuse)

packages/chili-wasm/lib/chili-wasm.d.ts

@@ -586,6 +586,7 @@ interface EmbindModule {
     ShapeResult: {};
     ShapeFactory: {
         makeThickSolidBySimple(_0: TopoDS_Shape, _1: number): ShapeResult;
+        simplifyShape(_0: TopoDS_Shape, _1: boolean, _2: boolean): ShapeResult;
         curveProjection(_0: TopoDS_Shape, _1: TopoDS_Shape, _2: gp_Dir): ShapeResult;
         polygon(_0: Array<Vector3>): ShapeResult;
         bezier(_0: Array<Vector3>, _1: Array<number>): ShapeResult;

packages/chili-wasm/lib/chili-wasm.wasm

@@ -274,9 +274,12 @@ export class ShapeFactory implements IShapeFactory {
         );
     }
     booleanFuse(shape1: IShape[], shape2: IShape[]): Result<IShape> {
-        return convertShapeResult(
-            wasm.ShapeFactory.booleanFuse(ensureOccShape(shape1), ensureOccShape(shape2)),
-        );
+        const fused = wasm.ShapeFactory.booleanFuse(ensureOccShape(shape1), ensureOccShape(shape2));
+        if (!fused.isOk) {
+            return Result.err(fused.error);
+        }
+
+        return convertShapeResult(wasm.ShapeFactory.simplifyShape(fused.shape, true, true));
     }
     combine(shapes: IShape[]): Result<ICompound> {
         return convertShapeResult(wasm.ShapeFactory.combine(ensureOccShape(shapes))) as Result<ICompound>;