Allow CSG fillets and chamfers (#873)

Author: adamchalmers

modeling-cmds/src/def_enum.rs

@@ -25,6 +25,7 @@ define_modeling_cmd_enum! {
                 Angle,
                 ComponentTransform,
                 CutType,
+                CutStrategy,
                 CameraMovement,
                 ExtrudedFaceInfo,
                 AnnotationOptions, AnnotationType, CameraDragInteractionType, Color, DistanceType, EntityType,
@@ -841,14 +842,30 @@ define_modeling_cmd_enum! {
             /// Which object is being filletted.
             pub object_id: Uuid,
             /// Which edge you want to fillet.
-            pub edge_id: Uuid,
+            #[serde(default)]
+            pub edge_id: Option<Uuid>,
+            /// Which edges you want to fillet.
+            #[serde(default)]
+            pub edge_ids: Vec<Uuid>,
             /// The radius of the fillet. Measured in length (using the same units that the current sketch uses). Must be positive (i.e. greater than zero).
             pub radius: LengthUnit,
             /// The maximum acceptable surface gap computed between the filleted surfaces. Must be positive (i.e. greater than zero).
             pub tolerance: LengthUnit,
             /// How to apply the cut.
             #[serde(default)]
             pub cut_type: CutType,
+            /// Which cutting algorithm to use.
+            #[serde(default)]
+            pub strategy: CutStrategy,
+            /// What IDs should the resulting faces have?
+            /// If you've only passed one edge ID, its ID will
+            /// be the command ID used to send this command, and this
+            /// field should be empty.
+            /// If you've passed `n` IDs (to fillet `n` edges), then
+            /// this should be length `n-1`, and the first edge will use
+            /// the command ID used to send this command.
+            #[serde(default)]
+            pub extra_face_ids: Vec<Uuid>,
         }
 
         /// Determines whether a brep face is planar and returns its surface-local planar axes if so

modeling-cmds/src/shared.rs

@@ -1134,3 +1134,21 @@ impl<T: JsonSchema> JsonSchema for Opposite<T> {
         .into()
     }
 }
+
+/// What strategy (algorithm) should be used for cutting?
+/// Defaults to Automatic.
+#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize, JsonSchema, Default)]
+#[serde(rename_all = "snake_case")]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
+pub enum CutStrategy {
+    /// Basic fillet cut. This has limitations, like the filletted edges
+    /// can't touch each other. But it's very fast and simple.
+    Basic,
+    /// More complicated fillet cut. It works for more use-cases, like
+    /// edges that touch each other. But it's slower than the Basic method.
+    Csg,
+    /// Tries the Basic method, and if that doesn't work, tries the CSG strategy.
+    #[default]
+    Automatic,
+}