✨ feat: add loft

Author: xiangechen

cpp/src/factory.cpp

@@ -22,6 +22,7 @@
 #include <BRepOffsetAPI_MakePipe.hxx>
 #include <BRepOffsetAPI_MakePipeShell.hxx>
 #include <BRepOffsetAPI_MakeThickSolid.hxx>
+#include <BRepOffsetAPI_ThruSections.hxx>
 #include <BRepPrimAPI_MakeBox.hxx>
 #include <BRepPrimAPI_MakeCone.hxx>
 #include <BRepPrimAPI_MakeCylinder.hxx>
@@ -529,6 +530,35 @@ class ShapeFactory {
         return ShapeResult { makeChamfer.Shape(), true, "" };
     }
 
+    static ShapeResult loft(const ShapeArray& sections, bool isSolid, bool isRuled, GeomAbs_Shape continuity)
+    {
+        std::vector<TopoDS_Shape> shapeVector = emscripten::vecFromJSArray<TopoDS_Shape>(sections);
+        if (shapeVector.size() < 2) {
+            return ShapeResult { TopoDS_Shape(), false, "Failed to loft: at least 2 sections are required" };
+        }
+        if (shapeVector.size() == 2 && shapeVector[0].ShapeType() == TopAbs_VERTEX && shapeVector[1].ShapeType() == TopAbs_VERTEX) {
+            return ShapeResult { TopoDS_Shape(), false, "Failed to loft: must have at least 1 wires" };
+        }
+
+        BRepOffsetAPI_ThruSections loftBuilder(isSolid, isRuled);
+        if (!isRuled) {
+            loftBuilder.SetContinuity(continuity);
+        }
+
+        for (auto& profile : shapeVector) {
+            if (profile.ShapeType() == TopAbs_WIRE) {
+                loftBuilder.AddWire(TopoDS::Wire(profile));
+            } else if (profile.ShapeType() == TopAbs_VERTEX) {
+                loftBuilder.AddVertex(TopoDS::Vertex(profile));
+            }
+        }
+        loftBuilder.Build();
+        if (!loftBuilder.IsDone()) {
+            return ShapeResult { TopoDS_Shape(), false, "Failed to loft" };
+        }
+        return ShapeResult { loftBuilder.Shape(), true, "" };
+    }
+
     static ShapeResult curveProjection(const TopoDS_Shape& curve, const TopoDS_Shape& targetFace, const gp_Dir& dir)
     {
         BRepProj_Projection curveProjection(curve, targetFace, dir);
@@ -577,5 +607,6 @@ EMSCRIPTEN_BINDINGS(ShapeFactory)
         .class_function("combine", &ShapeFactory::combine)
         .class_function("fillet", &ShapeFactory::fillet)
         .class_function("chamfer", &ShapeFactory::chamfer)
+        .class_function("loft", &ShapeFactory::loft)
         .class_function("curveProjection", &ShapeFactory::curveProjection);
 }

packages/chili-builder/src/ribbon.ts

@@ -11,9 +11,9 @@ export const DefaultRibbon: RibbonTab[] = [
                 groupName: "ribbon.group.draw",
                 items: [
                     "create.line",
-                    "create.arc",
-                    "create.rect",
-                    "create.circle",
+                    "create.extrude",
+                    ["create.arc", "create.rect", "create.circle"],
+                    ["create.loft", "create.sweep", "create.revol"],
                     ["create.ellipse", "create.bezier", "create.polygon"],
                     ["create.box", "create.pyramid", "create.cylinder"],
                     ["create.cone", "create.sphere", "create.thickSolid"],
@@ -23,9 +23,7 @@ export const DefaultRibbon: RibbonTab[] = [
                 groupName: "ribbon.group.modify",
                 items: [
                     "modify.move",
-                    "modify.rotate",
-                    "modify.mirror",
-                    "modify.array",
+                    ["modify.rotate", "modify.mirror", "modify.array"],
                     ["modify.split", "modify.break", "modify.trim"],
                     ["modify.fillet", "modify.chamfer", "modify.explode"],
                     ["modify.deleteNode", "modify.removeShapes", "modify.removeFeature"],
@@ -34,14 +32,7 @@ export const DefaultRibbon: RibbonTab[] = [
             },
             {
                 groupName: "ribbon.group.converter",
-                items: [
-                    "create.extrude",
-                    "convert.sweep",
-                    "convert.revol",
-                    "convert.toWire",
-                    "convert.curveProjection",
-                    ["convert.toFace", "convert.toShell", "convert.toSolid"],
-                ],
+                items: ["convert.toWire", ["convert.toFace", "convert.toShell", "convert.toSolid"]],
             },
             {
                 groupName: "ribbon.group.boolean",
@@ -56,7 +47,11 @@ export const DefaultRibbon: RibbonTab[] = [
             },
             {
                 groupName: "ribbon.group.tools",
-                items: ["create.group", ["create.section", "create.offset", "create.copyShape"]],
+                items: [
+                    "convert.curveProjection",
+                    "create.group",
+                    ["create.section", "create.offset", "create.copyShape"],
+                ],
             },
             {
                 groupName: "ribbon.group.measure",

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

@@ -50,8 +50,8 @@ export default {
         "command.boolean.cut": "Cut",
         "command.boolean.join": "Join",
         "command.convert.fuse": "Fuse",
-        "command.convert.revol": "Revolve",
-        "command.convert.sweep": "Sweep",
+        "command.create.revol": "Revolve",
+        "command.create.sweep": "Sweep",
         "command.convert.toFace": "To Face",
         "command.convert.toShell": "To Shell",
         "command.convert.toSolid": "To Solid",
@@ -70,6 +70,7 @@ export default {
         "command.create.folder": "Folder",
         "command.create.group": "Group",
         "command.create.line": "Line",
+        "command.create.loft": "Loft",
         "command.create.offset": "Offset",
         "command.create.polygon": "Pline",
         "command.create.pyramid": "Pyramid",
@@ -181,9 +182,12 @@ export default {
         "material.metalnessMap": "Metalness Map",
         "material.roughness": "Roughness",
         "model.visible": "Visible",
+        "option.command.continuity": "Continuity",
         "option.command.circularPattern": "Circular Pattern",
         "option.command.repeat": "Repeat",
         "option.command.isFace": "Face",
+        "option.command.isSolid": "Solid",
+        "option.command.isRuled": "Ruled",
         "option.command.isRoundCorner": "Round Corner",
         "option.command.thickness": "Thickness",
         "option.command.isConnected": "Connected",

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

@@ -45,8 +45,8 @@ const I18N_KEYS = [
     "command.boolean.cut",
     "command.boolean.join",
     "command.convert.fuse",
-    "command.convert.revol",
-    "command.convert.sweep",
+    "command.create.revol",
+    "command.create.sweep",
     "command.convert.toFace",
     "command.convert.toShell",
     "command.convert.toSolid",
@@ -65,6 +65,7 @@ const I18N_KEYS = [
     "command.create.folder",
     "command.create.group",
     "command.create.line",
+    "command.create.loft",
     "command.create.offset",
     "command.create.polygon",
     "command.create.pyramid",
@@ -181,8 +182,11 @@ const I18N_KEYS = [
     "prompt.pickNextPoint",
     "prompt.pickRadius",
     "option.command.circularPattern",
+    "option.command.continuity",
     "option.command.repeat",
     "option.command.isFace",
+    "option.command.isSolid",
+    "option.command.isRuled",
     "option.command.isRoundCorner",
     "option.command.thickness",
     "option.command.isConnected",