feat(sweep): enhance sweep functionality to support round corners

Author: xiangechen

cpp/src/factory.cpp

@@ -10,6 +10,7 @@
 #include <BRepFilletAPI_MakeFillet.hxx>
 #include <BRepFilletAPI_MakeChamfer.hxx>
 #include <BRepOffsetAPI_MakePipe.hxx>
+#include <BRepOffsetAPI_MakePipeShell.hxx>
 #include <BRepPrimAPI_MakeBox.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <BRepPrimAPI_MakePrism.hxx>
@@ -200,9 +201,29 @@ class ShapeFactory
         return ShapeResult{cylinder.Solid(), true, ""};
     }
 
-    static ShapeResult sweep(const TopoDS_Shape &profile, const TopoDS_Wire &wire)
+    static ShapeResult sweep(const ShapeArray &sections, const TopoDS_Wire &path, bool isFrenet, bool isForceC1)
     {
-        BRepOffsetAPI_MakePipe pipe(wire, profile);
+        BRepOffsetAPI_MakePipeShell pipe(path);
+        if (isFrenet) {
+            pipe.SetMode(isFrenet);
+        }
+        
+        if (isForceC1) {
+            pipe.SetTransitionMode(BRepBuilderAPI_RoundCorner);
+            pipe.SetForceApproxC1(isForceC1);
+        } else {
+            pipe.SetTransitionMode(BRepBuilderAPI_RightCorner);
+        }
+
+        std::vector<TopoDS_Shape> shapesVec = vecFromJSArray<TopoDS_Shape>(sections);
+        for (const auto &shape : shapesVec)
+        {
+            pipe.Add(shape);
+        }
+
+        pipe.Build();
+        pipe.MakeSolid();
+
         if (!pipe.IsDone())
         {
             return ShapeResult{TopoDS_Shape(), false, "Failed to sweep profile"};
@@ -445,6 +466,9 @@ class ShapeFactory
     }
 
     static ShapeResult booleanOperate(BRepAlgoAPI_BooleanOperation& boolOperater, const ShapeArray &args, const ShapeArray& tools) {
+        boolOperater.SetRunParallel(true);
+        boolOperater.SetFuzzyValue(1e-6);
+        boolOperater.SetToFillHistory(false);
         std::vector<TopoDS_Shape> argsVec = vecFromJSArray<TopoDS_Shape>(args);
         TopTools_ListOfShape argsList;
         for (auto shape : argsVec) {
@@ -463,24 +487,22 @@ class ShapeFactory
         if (!boolOperater.IsDone()) {
             return ShapeResult{TopoDS_Shape(), false, "Failed to build boolean operation"};
         }
+        boolOperater.SimplifyResult();
         return ShapeResult{boolOperater.Shape(), true, ""};
     }
 
     static ShapeResult booleanCommon(const ShapeArray &args, const ShapeArray& tools) {
         BRepAlgoAPI_Common api;
-        api.SetRunParallel(true);
         return booleanOperate(api, args, tools);
     }
 
     static ShapeResult booleanCut(const ShapeArray &args, const ShapeArray& tools) {
         BRepAlgoAPI_Cut api;
-        api.SetRunParallel(true);
         return booleanOperate(api, args, tools);
     }
 
     static ShapeResult booleanFuse(const ShapeArray &args, const ShapeArray& tools) {
         BRepAlgoAPI_Fuse api;
-        api.SetRunParallel(true);
         return booleanOperate(api, args, tools);
     }
 

packages/chili-core/src/i18n/en.ts

@@ -170,6 +170,7 @@ export default {
         "model.visible": "Visible",
         "option.command.repeat": "Repeat",
         "option.command.isFace": "Face",
+        "option.command.isRoundCorner": "Round Corner",
         "option.command.thickness": "Thickness",
         "option.command.isConnected": "Connected",
         "option.command.isConvertInstance": "Convert Instance",
@@ -188,8 +189,10 @@ export default {
         "prompt.select.faces": "Please select faces",
         "prompt.select.models": "Please select models",
         "prompt.select.noModelSelected": "No model selected",
+        "prompt.select.section": "Please select section",
         "prompt.select.shape": "Please select shape",
         "prompt.select.solids": "Please select solids",
+        "prompt.select.path": "Please select path",
         "prompt.select.vertexes": "Please select vertexes",
         "prompt.select.wires": "Please select wires",
         "toast.snap.notFoundValidPoint": "No valid point",

packages/chili-core/src/i18n/keys.ts

@@ -169,6 +169,7 @@ const I18N_KEYS = [
     "prompt.pickRadius",
     "option.command.repeat",
     "option.command.isFace",
+    "option.command.isRoundCorner",
     "option.command.thickness",
     "option.command.isConnected",
     "option.command.isConvertInstance",
@@ -182,8 +183,10 @@ const I18N_KEYS = [
     "prompt.select.faces",
     "prompt.select.models",
     "prompt.select.noModelSelected",
+    "prompt.select.section",
     "prompt.select.shape",
     "prompt.select.solids",
+    "prompt.select.path",
     "prompt.select.vertexes",
     "prompt.select.wires",
     "properties.group.transform",

packages/chili-core/src/i18n/zh-cn.ts

@@ -171,6 +171,7 @@ export default {
         "option.command.repeat": "重复",
         "option.command.isFace": "面",
         "option.command.thickness": "厚度",
+        "option.command.isRoundCorner": "圆角",
         "option.command.isConnected": "相连",
         "option.command.isConvertInstance": "转为实例",
         "option.command.insertPoint": "插入点",
@@ -187,8 +188,10 @@ export default {
         "prompt.select.faces": "请选择面",
         "prompt.select.models": "请选择模型",
         "prompt.select.noModelSelected": "未选择任何模型",
+        "prompt.select.section": "请选择截面",
         "prompt.select.shape": "选择形状",
         "prompt.select.solids": "请选择实体",
+        "prompt.select.path": "请选择路径",
         "prompt.select.vertexes": "请选择点",
         "prompt.select.wires": "请选择线",
         "toast.snap.notFoundValidPoint": "未找到有效的点",

packages/chili-core/src/shape/shapeFactory.ts

@@ -34,7 +34,7 @@ export interface IShapeFactory {
     wire(edges: IEdge[]): Result<IWire>;
     prism(shape: IShape, vec: XYZ): Result<IShape>;
     fuse(bottom: IShape, top: IShape): Result<IShape>;
-    sweep(profile: IShape, path: IWire): Result<IShape>;
+    sweep(profile: IShape[], path: IWire, isRoundCorner: boolean): Result<IShape>;
     revolve(profile: IShape, axis: Ray, angle: number): Result<IShape>;
     booleanCommon(shape1: IShape, shape2: IShape): Result<IShape>;
     booleanCut(shape1: IShape, shape2: IShape): Result<IShape>;

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

@@ -585,11 +585,11 @@ interface EmbindModule {
     ShapeResult: {};
     ShapeFactory: {
         makeThickSolidBySimple(_0: TopoDS_Shape, _1: number): ShapeResult;
-        sweep(_0: TopoDS_Shape, _1: TopoDS_Wire): ShapeResult;
         polygon(_0: Array<Vector3>): ShapeResult;
         bezier(_0: Array<Vector3>, _1: Array<number>): ShapeResult;
         fillet(_0: TopoDS_Shape, _1: Array<number>, _2: number): ShapeResult;
         chamfer(_0: TopoDS_Shape, _1: Array<number>, _2: number): ShapeResult;
+        sweep(_0: Array<TopoDS_Shape>, _1: TopoDS_Wire, _2: boolean, _3: boolean): ShapeResult;
         makeThickSolidByJoin(_0: TopoDS_Shape, _1: Array<TopoDS_Shape>, _2: number): ShapeResult;
         booleanCommon(_0: Array<TopoDS_Shape>, _1: Array<TopoDS_Shape>): ShapeResult;
         booleanCut(_0: Array<TopoDS_Shape>, _1: Array<TopoDS_Shape>): ShapeResult;

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

@@ -236,9 +236,9 @@ export class ShapeFactory implements IShapeFactory {
             wasm.ShapeFactory.booleanFuse(ensureOccShape(bottom), ensureOccShape(top)),
         );
     }
-    sweep(profile: IShape, path: IWire): Result<IShape> {
+    sweep(profile: IShape[], path: IWire, isRound: boolean): Result<IShape> {
         return convertShapeResult(
-            wasm.ShapeFactory.sweep(ensureOccShape(profile)[0], ensureOccShape(path)[0]),
+            wasm.ShapeFactory.sweep(ensureOccShape(profile), ensureOccShape(path)[0], true, isRound),
         );
     }
     revolve(profile: IShape, axis: Ray, angle: number): Result<IShape> {

packages/chili-wasm/src/factory.ts

@@ -13,7 +13,7 @@ import {
     ShapeType,
 } from "chili-core";
 
-@Serializer.register(["document", "profile", "path"])
+@Serializer.register(["document", "profile", "path", "round"])
 export class SweepedNode extends ParameterShapeNode {
     override display(): I18nKeys {
         return "body.sweep";
@@ -23,7 +23,7 @@ export class SweepedNode extends ParameterShapeNode {
     get profile() {
         return this.getPrivateValue("profile");
     }
-    set profile(value: IShape) {
+    set profile(value: IShape[]) {
         this.setPropertyEmitShapeChanged("profile", value);
     }
 
@@ -35,10 +35,22 @@ export class SweepedNode extends ParameterShapeNode {
         this.setPropertyEmitShapeChanged("path", value);
     }
 
-    constructor(document: IDocument, profile: IShape, path: IWire | IEdge) {
+    @Serializer.serialze()
+    get round() {
+        return this.getPrivateValue("round");
+    }
+    set round(value: boolean) {
+        this.setPropertyEmitShapeChanged("round", value);
+    }
+
+    constructor(document: IDocument, profile: (IWire | IEdge)[], path: IWire | IEdge, round: boolean) {
         super(document);
-        this.setPrivateValue("profile", profile);
+        this.setPrivateValue(
+            "profile",
+            profile.map((p) => this.ensureWire(p)),
+        );
         this.setPrivateValue("path", this.ensureWire(path));
+        this.setPrivateValue("round", round);
     }
 
     private ensureWire(path: IEdge | IWire) {
@@ -50,6 +62,6 @@ export class SweepedNode extends ParameterShapeNode {
     }
 
     override generateShape(): Result<IShape> {
-        return this.document.application.shapeFactory.sweep(this.profile, this.path);
+        return this.document.application.shapeFactory.sweep(this.profile, this.path, this.round);
     }
 }

packages/chili/src/bodys/sweep.ts

@@ -1,7 +1,7 @@
 // Part of the Chili3d Project, under the AGPL-3.0 License.
 // See LICENSE file in the project root for full license information.
 
-import { GeometryNode, IWire, ShapeType, command } from "chili-core";
+import { GeometryNode, IWire, Property, ShapeType, command } from "chili-core";
 import { SweepedNode } from "../../bodys";
 import { IStep } from "../../step";
 import { SelectShapeStep } from "../../step/selectStep";
@@ -12,16 +12,27 @@ import { CreateCommand } from "../createCommand";
     icon: "icon-sweep",
 })
 export class Sweep extends CreateCommand {
+    @Property.define("option.command.isRoundCorner")
+    get round() {
+        return this.getPrivateValue("round", false);
+    }
+
+    set round(value: boolean) {
+        this.setProperty("round", value);
+    }
+
     protected override geometryNode(): GeometryNode {
-        const shape = this.transformdFirstShape(this.stepDatas[0], false);
+        const shape = this.transformdShapes(this.stepDatas[0], false) as IWire[];
         const path = this.transformdFirstShape(this.stepDatas[1], false) as IWire;
-        return new SweepedNode(this.document, shape, path);
+        return new SweepedNode(this.document, shape, path, this.round);
     }
 
     protected override getSteps(): IStep[] {
         return [
-            new SelectShapeStep(ShapeType.Edge | ShapeType.Wire | ShapeType.Face, "prompt.select.shape"),
-            new SelectShapeStep(ShapeType.Edge | ShapeType.Wire, "prompt.select.edges", {
+            new SelectShapeStep(ShapeType.Edge | ShapeType.Wire, "prompt.select.section", {
+                multiple: true,
+            }),
+            new SelectShapeStep(ShapeType.Edge | ShapeType.Wire, "prompt.select.path", {
                 keepSelection: true,
             }),
         ];

packages/chili/src/commands/create/sweep.ts

@@ -119,6 +119,14 @@ export abstract class MultistepCommand extends CancelableCommand {
         return shape;
     }
 
+    protected transformdShapes(step: SnapResult, shouldDispose = true) {
+        return step.shapes.map((s) => {
+            const shape = s.shape.transformedMul(s.transform);
+            if (shouldDispose) this.disposeStack.add(shape);
+            return shape;
+        });
+    }
+
     protected abstract getSteps(): IStep[];
 
     protected abstract executeMainTask(): void;