Merge remote-tracking branch 'origin/main' into ben/chamfer_angle

Author: benjamaan476

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "kittycad-modeling-cmds"
-version = "0.2.133"
+version = "0.2.139"
 edition = "2021"
 authors = ["KittyCAD, Inc."]
 description = "Commands in the KittyCAD Modeling API"

modeling-cmds/Cargo.toml

@@ -31,7 +31,7 @@ define_modeling_cmd_enum! {
                 ExtrudedFaceInfo, ExtrudeMethod,
                 AnnotationOptions, AnnotationType, CameraDragInteractionType, Color, DistanceType, EntityType,
                 PathComponentConstraintBound, PathComponentConstraintType, PathSegment, PerspectiveCameraParameters,
-                Point2d, Point3d, SceneSelectionType, SceneToolType, Opposite,
+                Point2d, Point3d, ExtrudeReference, SceneSelectionType, SceneToolType, Opposite,
             },
             units,
         };
@@ -100,9 +100,11 @@ define_modeling_cmd_enum! {
             /// Segment to append to the path.
             /// This segment will implicitly begin at the current "pen" location.
             pub segment: PathSegment,
+            /// Optional label to associate with the new path segment.
+            #[serde(default, skip_serializing_if = "Option::is_none")]
+            pub label: Option<String>,
         }
 
-
         /// Command for extruding a solid 2d.
         #[derive(
             Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant,
@@ -128,6 +130,28 @@ define_modeling_cmd_enum! {
             pub extrude_method: ExtrudeMethod,
         }
 
+        /// Command for extruding a solid 2d to a reference geometry.
+        #[derive(
+            Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant,
+        )]
+        #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+        #[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
+        pub struct ExtrudeToReference {
+            /// Which sketch to extrude.
+            /// Must be a closed 2D solid.
+            pub target: ModelingCmdId,
+            /// Reference to extrude to.
+            /// Extrusion occurs along the target's normal until it is as close to the reference as possible.
+            pub reference: ExtrudeReference,
+            /// Which IDs should the new faces have?
+            /// If this isn't given, the engine will generate IDs.
+            #[serde(default)]
+            pub faces: Option<ExtrudedFaceInfo>,
+            /// Should the extrusion create a new object or be part of the existing object.
+            #[serde(default)]
+            pub extrude_method: ExtrudeMethod,
+        }
+
         fn default_twist_extrude_section_interval() -> Angle {
             Angle::from_degrees(15.0)
         }
@@ -568,8 +592,8 @@ define_modeling_cmd_enum! {
             pub start_angle: Angle,
             /// Is the helix rotation clockwise?
             pub is_clockwise: bool,
-            /// Length of the helix.
-            pub length: LengthUnit,
+            /// Length of the helix. If None, the length of the cylinder will be used instead.
+            pub length: Option<LengthUnit>,
         }
 
         /// Create a helix using the specified parameters.

modeling-cmds/src/def_enum.rs

@@ -49,6 +49,11 @@ define_ok_modeling_cmd_response_enum! {
         pub struct Extrude {
         }
 
+        /// The response from the `ExtrudeToReference` endpoint.
+        #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, ModelingCmdOutput)]
+        pub struct ExtrudeToReference {
+        }
+
         /// The response from the `TwistExtrude` endpoint.
         #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, ModelingCmdOutput)]
         pub struct TwistExtrude {

modeling-cmds/src/ok_response.rs

@@ -824,6 +824,34 @@ pub enum ExtrudeMethod {
     Merge,
 }
 
+/// Type of reference geometry to extrude to.
+#[derive(Clone, Copy, Debug, 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 ExtrudeReference {
+    /// Extrudes along the normal of the top face until it is as close to the entity as possible.
+    /// An entity can be a solid, a path, a face, etc.
+    EntityReference {
+        /// The UUID of the entity to extrude to.
+        entity_id: Uuid,
+    },
+    /// Extrudes until the top face is as close as possible to this given axis.
+    Axis {
+        /// The axis to extrude to.
+        axis: Point3d<f64>,
+        /// Point the axis goes through.
+        /// Defaults to (0, 0, 0).
+        #[serde(default)]
+        point: Point3d<LengthUnit>,
+    },
+    /// Extrudes until the top face is as close as possible to this given point.
+    Point {
+        /// The point to extrude to.
+        point: Point3d<LengthUnit>,
+    },
+}
+
 /// IDs for the extruded faces.
 #[derive(Debug, PartialEq, Serialize, Deserialize, JsonSchema, Clone)]
 #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]

modeling-cmds/src/shared.rs

@@ -70,6 +70,7 @@ impl UnitLength {
 
 /// The valid types of angle formats.
 #[derive(
+    Default,
     Display,
     FromStr,
     Copy,
@@ -83,6 +84,7 @@ impl UnitLength {
     Ord,
     PartialOrd,
     UnitConversion,
+    Hash,
 )]
 #[cfg_attr(feature = "tabled", derive(tabled::Tabled))]
 #[serde(rename_all = "snake_case")]
@@ -92,8 +94,11 @@ impl UnitLength {
 #[cfg_attr(feature = "python", pyo3::pyclass, pyo3_stub_gen::derive::gen_stub_pyclass_enum)]
 pub enum UnitAngle {
     /// Degrees <https://en.wikipedia.org/wiki/Degree_(angle)>
+    #[default]
+    #[display("deg")]
     Degrees,
     /// Radians <https://en.wikipedia.org/wiki/Radian>
+    #[display("rad")]
     Radians,
 }
 

modeling-cmds/src/units.rs

@@ -37,8 +37,6 @@ fn print_duplicate_stub_names() {
         .map(|(n, c)| (n.to_string(), c))
         .collect();
 
-    eprintln!("duplicate classes: {:?}", dup_classes);
-    eprintln!("duplicate enums: {:?}", dup_enums);
-
-    // This is informational; do not fail test. If we decide to enforce, we can assert emptiness.
+    assert!(dup_classes.is_empty(), "Duplicate class names: {dup_classes:?}");
+    assert!(dup_enums.is_empty(), "Duplicate enum names: {dup_enums:?}");
 }

modeling-cmds/tests/python_stub_dupes.rs

@@ -90,6 +90,7 @@ async fn main() -> Result<()> {
                         end: point,
                         relative: false,
                     },
+                    label: Default::default(),
                 }
                 .into(),
             )

modeling-session/examples/cube_png.rs

@@ -87,6 +87,7 @@ async fn main() -> Result<()> {
             cmd: ModelingCmd::ExtendPath(ExtendPath {
                 path,
                 segment: PathSegment::Line { end, relative: false },
+                label: Default::default(),
             }),
         }),
     );

modeling-session/examples/cube_png_batch.rs

@@ -121,6 +121,7 @@ async fn main() -> Result<()> {
                             },
                             relative: false,
                         },
+                        label: Default::default(),
                     }),
                 });
             }