Expose Extrude Method (#905)

* add new argument to extrude endpoint

* switch over to enum for method

* serde enum to snake_case

* change Add to Merge

* fix tests

* spelling and improving comment of api

---------

Co-authored-by: Adam Chalmers <[email protected]>

Author: benjamaan476

modeling-cmds/src/def_enum.rs

@@ -28,7 +28,7 @@ define_modeling_cmd_enum! {
                 CutType,
                 CutStrategy,
                 CameraMovement,
-                ExtrudedFaceInfo,
+                ExtrudedFaceInfo, ExtrudeMethod,
                 AnnotationOptions, AnnotationType, CameraDragInteractionType, Color, DistanceType, EntityType,
                 PathComponentConstraintBound, PathComponentConstraintType, PathSegment, PerspectiveCameraParameters,
                 Point2d, Point3d, SceneSelectionType, SceneToolType, Opposite,
@@ -123,6 +123,10 @@ define_modeling_cmd_enum! {
             /// If so, this specifies its distance.
             #[serde(default)]
             pub opposite: Opposite<LengthUnit>,
+            /// Should the extrusion create a new object or be part of the existing object. If a
+            /// new object is created, the command id will be the id of the newly created object.
+            #[serde(default)]
+            pub extrude_method: ExtrudeMethod,
         }
 
         fn default_twist_extrude_section_interval() -> Angle {

modeling-cmds/src/shared.rs

@@ -728,6 +728,22 @@ impl From<EngineErrorCode> for http::StatusCode {
     }
 }
 
+/// Extrusion method determining if the extrusion will be part of the existing object or an
+/// entirely new object.
+#[derive(Default, Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
+#[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 ExtrudeMethod {
+    /// Create a new object that is not connected to the object it is extruded from. This will
+    /// result in two objects after the operation.
+    New,
+    /// This extrusion will be part of object it is extruded from. This will result in one object
+    /// after the operation.
+    #[default]
+    Merge,
+}
+
 /// IDs for the extruded faces.
 #[derive(Debug, PartialEq, Serialize, Deserialize, JsonSchema, Clone)]
 #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]

modeling-session/examples/cube_png.rs

@@ -109,6 +109,7 @@ async fn main() -> Result<()> {
                 target: path,
                 faces: None,
                 opposite: Default::default(),
+                extrude_method: Default::default(),
             }
             .into(),
         )

modeling-session/examples/cube_png_batch.rs

@@ -100,6 +100,7 @@ async fn main() -> Result<()> {
             target: path,
             faces: None,
             opposite: Default::default(),
+            extrude_method: Default::default(),
         }),
         cmd_id: random_id(),
     });

modeling-session/examples/lsystem_png_batch.rs

@@ -139,6 +139,7 @@ async fn main() -> Result<()> {
             target: path,
             faces: None,
             opposite: Default::default(),
+            extrude_method: Default::default(),
         }),
         cmd_id: random_id(),
     });