✨ feat: add toShell/toSolid

Author: xiangechen

cpp/src/factory.cpp

@@ -188,12 +188,6 @@ class ShapeFactory
         return ShapeResult{solidBuilder.Solid(), true, ""};
     }
 
-    static ShapeResult facesToSolid(const FaceArray &faces)
-    {
-        auto facesVec = vecFromJSArray<TopoDS_Face>(faces);
-        return facesToSolid(facesVec);
-    }
-
     static ShapeResult cylinder(const Vector3 &normal, const Vector3 &center, double radius, double height)
     {
         gp_Ax2 ax2(Vector3::toPnt(center), Vector3::toDir(normal));
@@ -400,6 +394,33 @@ class ShapeFactory
         return ShapeResult{makeFace.Face(), true, ""};
     }
 
+    static ShapeResult shell(const FaceArray& faces) {
+        std::vector<TopoDS_Face> facesVec = vecFromJSArray<TopoDS_Face>(faces);
+        
+        TopoDS_Shell shell;
+        BRep_Builder shellBuilder;
+        shellBuilder.MakeShell(shell);
+        for (const auto &face : facesVec)
+        {
+            shellBuilder.Add(shell, face);
+        }
+
+        return ShapeResult{shell, true, ""};
+    }
+
+    static ShapeResult solid(const ShellArray& shells) {
+        std::vector<TopoDS_Shell> shellsVec = vecFromJSArray<TopoDS_Shell>(shells);
+
+        BRepBuilderAPI_MakeSolid makeSolid;
+        for (auto shell : shellsVec) {
+            makeSolid.Add(shell);
+        }
+        if (!makeSolid.IsDone()) {
+            return ShapeResult{TopoDS_Shape(), false, "Failed to create solid"};
+        }
+        return ShapeResult{makeSolid.Solid(), true, ""};
+    }
+
     static ShapeResult makeThickSolidBySimple(const TopoDS_Shape &shape, double thickness) {
         BRepOffsetAPI_MakeThickSolid makeThickSolid;
         makeThickSolid.MakeThickSolidBySimple(shape, thickness);
@@ -530,6 +551,8 @@ EMSCRIPTEN_BINDINGS(ShapeFactory)
         .class_function("line", &ShapeFactory::line)
         .class_function("wire", &ShapeFactory::wire)
         .class_function("face", &ShapeFactory::face)
+        .class_function("shell", &ShapeFactory::shell)
+        .class_function("solid", &ShapeFactory::solid)
         .class_function("makeThickSolidBySimple", &ShapeFactory::makeThickSolidBySimple)
         .class_function("makeThickSolidByJoin", &ShapeFactory::makeThickSolidByJoin)
         .class_function("booleanCommon", &ShapeFactory::booleanCommon)

cpp/src/shape.cpp

@@ -39,6 +39,8 @@
 #include <TopoDS.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopExp_Explorer.hxx>
+#include <BRepPrim_Builder.hxx>
+#include <BRepBuilderAPI_Sewing.hxx>
 
 
 using namespace emscripten;
@@ -185,6 +187,15 @@ class Shape {
         return fixer.Shape();
     }
 
+    static TopoDS_Shape sewing(const TopoDS_Shape& shape1, const TopoDS_Shape& shape2) {
+        BRepBuilderAPI_Sewing sewing;
+        sewing.Add(shape1);
+        sewing.Add(shape2);
+
+        sewing.Perform();
+        return sewing.SewedShape();
+    }
+
 };
 
 class Vertex {
@@ -337,6 +348,7 @@ EMSCRIPTEN_BINDINGS(Shape) {
         .class_function("removeFeature", &Shape::removeFeature)
         .class_function("removeSubShape", &Shape::removeSubShape)
         .class_function("replaceSubShape", &Shape::replaceSubShape)
+        .class_function("sewing", &Shape::sewing)
     ;
 
     class_<Vertex>("Vertex")

cpp/src/shared.cpp

@@ -26,6 +26,7 @@ EMSCRIPTEN_BINDINGS(Shared) {
     register_type<EdgeArray>("Array<TopoDS_Edge>");
     register_type<FaceArray>("Array<TopoDS_Face>");
     register_type<WireArray>("Array<TopoDS_Wire>");
+    register_type<ShellArray>("Array<TopoDS_Shell>");
     register_type<PntArray>("Array<gp_Pnt>");
 
     register_optional<double>();

cpp/src/shared.hpp

@@ -185,6 +185,7 @@ EMSCRIPTEN_DECLARE_VAL_TYPE(NumberArray)
 EMSCRIPTEN_DECLARE_VAL_TYPE(EdgeArray)
 EMSCRIPTEN_DECLARE_VAL_TYPE(WireArray)
 EMSCRIPTEN_DECLARE_VAL_TYPE(FaceArray)
+EMSCRIPTEN_DECLARE_VAL_TYPE(ShellArray)
 EMSCRIPTEN_DECLARE_VAL_TYPE(ShapeArray)
 EMSCRIPTEN_DECLARE_VAL_TYPE(PointAndParameterArray)
 EMSCRIPTEN_DECLARE_VAL_TYPE(PntArray)

packages/chili-builder/src/ribbon.ts

@@ -25,19 +25,19 @@ export const DefaultRibbon: RibbonTab[] = [
                     "modify.move",
                     "modify.rotate",
                     "modify.mirror",
-                    ["modify.explode", "modify.break", "modify.trim"],
-                    ["modify.fillet", "modify.chamfer", "modify.split"],
+                    ["modify.split", "modify.break", "modify.trim"],
+                    ["modify.fillet", "modify.chamfer", "modify.explode"],
                     ["modify.delete", "modify.removeSubShapes", "modify.removeFeature"],
                 ],
             },
             {
                 groupName: "ribbon.group.converter",
                 items: [
-                    "convert.toWire",
-                    "convert.toFace",
                     "convert.prism",
                     "convert.sweep",
                     "convert.revol",
+                    "convert.toWire",
+                    ["convert.toFace", "convert.toShell", "convert.toSolid"],
                 ],
             },
             {

packages/chili-core/src/command/commandKeys.ts

@@ -11,6 +11,8 @@ const COMMAND_KEYS = [
     "convert.sweep",
     "convert.toFace",
     "convert.toWire",
+    "convert.toShell",
+    "convert.toSolid",
     "create.arc",
     "create.bezier",
     "create.box",

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

@@ -96,6 +96,8 @@ export default {
         "command.thickSolid": "Thick Solid",
         "command.toFace": "To Face",
         "command.toWire": "To Wire",
+        "command.toShell": "To Shell",
+        "command.toSolid": "To Solid",
         "command.trim": "Trim",
         "command.undo": "Undo",
         "common.angle": "Angle",

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

@@ -90,6 +90,8 @@ const I18N_KEYS = [
     "command.thickSolid",
     "command.toFace",
     "command.toWire",
+    "command.toShell",
+    "command.toSolid",
     "command.trim",
     "command.undo",
     "common.angle",

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

@@ -95,6 +95,8 @@ export default {
         "command.thickSolid": "抽壳",
         "command.toFace": "转面",
         "command.toWire": "转多段线",
+        "command.toShell": "转壳体",
+        "command.toSolid": "转实体",
         "command.trim": "修剪",
         "command.undo": "撤销",
         "common.angle": "角度",

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

@@ -3,13 +3,15 @@
 
 import { Result } from "../foundation";
 import { Plane, Ray, XYZ, XYZLike } from "../math";
-import { ICompound, IEdge, IFace, IShape, ISolid, IVertex, IWire } from "./shape";
+import { ICompound, IEdge, IFace, IShape, IShell, ISolid, IVertex, IWire } from "./shape";
 import { IShapeConverter } from "./shapeConverter";
 
 export interface IShapeFactory {
     readonly kernelName: string;
     readonly converter: IShapeConverter;
     face(wire: IWire[]): Result<IFace>;
+    shell(faces: IFace[]): Result<IShell>;
+    solid(shells: IShell[]): Result<ISolid>;
     bezier(points: XYZLike[], weights?: number[]): Result<IEdge>;
     point(point: XYZLike): Result<IVertex>;
     line(start: XYZLike, end: XYZLike): Result<IEdge>;

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

@@ -601,7 +601,9 @@ interface EmbindModule {
         wire(_0: Array<TopoDS_Edge>): ShapeResult;
         fillet(_0: TopoDS_Shape, _1: Array<TopoDS_Edge>, _2: number): ShapeResult;
         chamfer(_0: TopoDS_Shape, _1: Array<TopoDS_Edge>, _2: number): ShapeResult;
+        shell(_0: Array<TopoDS_Face>): ShapeResult;
         face(_0: Array<TopoDS_Wire>): ShapeResult;
+        solid(_0: Array<TopoDS_Shell>): ShapeResult;
         cone(_0: Vector3, _1: Vector3, _2: number, _3: number, _4: number): ShapeResult;
         sphere(_0: Vector3, _1: number): ShapeResult;
         ellipsoid(_0: Vector3, _1: Vector3, _2: Vector3, _3: number, _4: number, _5: number): ShapeResult;
@@ -779,6 +781,7 @@ interface EmbindModule {
         sectionSS(_0: TopoDS_Shape, _1: TopoDS_Shape): TopoDS_Shape;
         isClosed(_0: TopoDS_Shape): boolean;
         replaceSubShape(_0: TopoDS_Shape, _1: TopoDS_Shape, _2: TopoDS_Shape): TopoDS_Shape;
+        sewing(_0: TopoDS_Shape, _1: TopoDS_Shape): TopoDS_Shape;
         findAncestor(_0: TopoDS_Shape, _1: TopoDS_Shape, _2: TopAbs_ShapeEnum): Array<TopoDS_Shape>;
         findSubShapes(_0: TopoDS_Shape, _1: TopAbs_ShapeEnum): Array<TopoDS_Shape>;
         iterShape(_0: TopoDS_Shape): Array<TopoDS_Shape>;

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

@@ -5244,27 +5244,27 @@ var Module = (() => {
             w: __embind_register_enum,
             h: __embind_register_enum_value,
             C: __embind_register_float,
-            q: __embind_register_integer,
-            j: __embind_register_memory_view,
+            r: __embind_register_integer,
+            l: __embind_register_memory_view,
             v: __embind_register_optional,
             fa: __embind_register_std_string,
             z: __embind_register_std_wstring,
-            k: __embind_register_user_type,
+            j: __embind_register_user_type,
             p: __embind_register_value_object,
             m: __embind_register_value_object_field,
             ha: __embind_register_void,
             G: __emscripten_lookup_name,
             K: __emscripten_runtime_keepalive_clear,
-            u: __emval_as,
-            s: __emval_call_method,
+            q: __emval_as,
+            t: __emval_call_method,
             d: __emval_decref,
-            r: __emval_get_method_caller,
+            s: __emval_get_method_caller,
             E: __emval_get_property,
             f: __emval_incref,
-            t: __emval_new_array,
+            u: __emval_new_array,
             B: __emval_new_array_from_memory_view,
             ia: __emval_new_cstring,
-            l: __emval_run_destructors,
+            k: __emval_run_destructors,
             n: __emval_take_value,
             O: __localtime_js,
             F: __setitimer_js,

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

@@ -8,6 +8,7 @@ import {
     IShape,
     IShapeConverter,
     IShapeFactory,
+    IShell,
     ISolid,
     IVertex,
     IWire,
@@ -209,6 +210,12 @@ export class ShapeFactory implements IShapeFactory {
     wire(edges: IEdge[]): Result<IWire> {
         return convertShapeResult(wasm.ShapeFactory.wire(ensureOccShape(edges))) as Result<IWire>;
     }
+    shell(faces: IFace[]): Result<IShell> {
+        return convertShapeResult(wasm.ShapeFactory.shell(ensureOccShape(faces))) as Result<IShell>;
+    }
+    solid(shells: IShell[]): Result<ISolid> {
+        return convertShapeResult(wasm.ShapeFactory.solid(ensureOccShape(shells))) as Result<ISolid>;
+    }
     prism(shape: IShape, vec: XYZ): Result<IShape> {
         if (vec.length() === 0) {
             return Result.err(`The vector length is 0, the prism cannot be created.`);

packages/chili-wasm/src/factory.ts

@@ -4,11 +4,15 @@
 import {
     AsyncController,
     CancelableCommand,
+    EditableShapeNode,
     GeometryNode,
     IDocument,
     IEdge,
+    IFace,
     INode,
+    IShape,
     IShapeFilter,
+    IShell,
     PubSub,
     Result,
     ShapeNode,
@@ -36,15 +40,21 @@ abstract class ConvertCommand extends CancelableCommand {
                 this.document.visual.update();
                 PubSub.default.pub("showToast", "toast.success");
             }
+
+            models.forEach((x) => x.parent?.remove(x));
         });
     }
 
     protected abstract create(document: IDocument, models: INode[]): Result<GeometryNode>;
+    protected shapeFilter(): IShapeFilter {
+        return {
+            allow: (shape: IShape) =>
+                shape.shapeType === ShapeType.Edge || shape.shapeType === ShapeType.Wire,
+        };
+    }
 
     async getOrPickModels(document: IDocument) {
-        const filter: IShapeFilter = {
-            allow: (shape) => shape.shapeType === ShapeType.Edge || shape.shapeType === ShapeType.Wire,
-        };
+        const filter = this.shapeFilter();
         let models = this._getSelectedModels(document, filter);
         document.selection.clearSelection();
         if (models.length > 0) return models;
@@ -82,7 +92,6 @@ export class ConvertToWire extends ConvertCommand {
         const shape = wireBody.generateShape();
         if (!shape.isOk) return Result.err(shape.error);
 
-        models.forEach((x) => x.parent?.remove(x));
         return Result.ok(wireBody);
     }
 }
@@ -99,7 +108,50 @@ export class ConvertToFace extends ConvertCommand {
         const shape = wireBody.generateShape();
         if (!shape.isOk) return Result.err(shape.error);
 
-        models.forEach((x) => x.parent?.remove(x));
         return Result.ok(wireBody);
     }
 }
+
+@command({
+    name: "convert.toShell",
+    display: "command.toShell",
+    icon: "icon-toShell",
+})
+export class ConvertToShell extends ConvertCommand {
+    protected override shapeFilter(): IShapeFilter {
+        return {
+            allow: (shape: IShape) => shape.shapeType === ShapeType.Face,
+        };
+    }
+
+    protected override create(document: IDocument, models: ShapeNode[]): Result<GeometryNode> {
+        const faces = models.map((x) => x.shape.value.copy()) as IFace[];
+        const shape = this.application.shapeFactory.shell(faces);
+        if (!shape.isOk) return Result.err(shape.error);
+
+        const shell = new EditableShapeNode(document, "shell", shape);
+        return Result.ok(shell);
+    }
+}
+
+@command({
+    name: "convert.toSolid",
+    display: "command.toSolid",
+    icon: "icon-toSolid",
+})
+export class ConvertToSolid extends ConvertCommand {
+    protected override shapeFilter(): IShapeFilter {
+        return {
+            allow: (shape: IShape) => shape.shapeType === ShapeType.Shell,
+        };
+    }
+
+    protected override create(document: IDocument, models: ShapeNode[]): Result<GeometryNode> {
+        const faces = models.map((x) => x.shape.value.copy()) as IShell[];
+        const shape = this.application.shapeFactory.solid(faces);
+        if (!shape.isOk) return Result.err(shape.error);
+
+        const solid = new EditableShapeNode(document, "solid", shape);
+        return Result.ok(solid);
+    }
+}