Convert all lengths to mm for engine calls

Signed-off-by: Nick Cameron <[email protected]>

Author: nrc

docs/kcl/fromCm.md

@@ -8,7 +8,7 @@ layout: manual
 
 Converts a number from centimeters to the current default unit.
 
-*DEPRECATED* prefer using explicit numberic suffixes (e.g., `42cm`) or the `to...` conversion functions.
+*DEPRECATED* prefer using explicit numeric suffixes (e.g., `42cm`) or the `to...` conversion functions.
 
 No matter what units the current file uses, this function will always return a number equivalent to the input in centimeters.
 

docs/kcl/fromFt.md

@@ -8,7 +8,7 @@ layout: manual
 
 Converts a number from feet to the current default unit.
 
-*DEPRECATED* prefer using explicit numberic suffixes (e.g., `42ft`) or the `to...` conversion functions.
+*DEPRECATED* prefer using explicit numeric suffixes (e.g., `42ft`) or the `to...` conversion functions.
 
 No matter what units the current file uses, this function will always return a number equivalent to the input in feet.
 

docs/kcl/fromInches.md

@@ -8,7 +8,7 @@ layout: manual
 
 Converts a number from inches to the current default unit.
 
-*DEPRECATED* prefer using explicit numberic suffixes (e.g., `42inch`) or the `to...` conversion functions.
+*DEPRECATED* prefer using explicit numeric suffixes (e.g., `42inch`) or the `to...` conversion functions.
 
 No matter what units the current file uses, this function will always return a number equivalent to the input in inches.
 

docs/kcl/fromM.md

@@ -8,7 +8,7 @@ layout: manual
 
 Converts a number from meters to the current default unit.
 
-*DEPRECATED* prefer using explicit numberic suffixes (e.g., `42m`) or the `to...` conversion functions.
+*DEPRECATED* prefer using explicit numeric suffixes (e.g., `42m`) or the `to...` conversion functions.
 
 No matter what units the current file uses, this function will always return a number equivalent to the input in meters.
 

docs/kcl/fromMm.md

@@ -8,7 +8,7 @@ layout: manual
 
 Converts a number from mm to the current default unit.
 
-*DEPRECATED* prefer using explicit numberic suffixes (e.g., `42mm`) or the `to...` conversion functions.
+*DEPRECATED* prefer using explicit numeric suffixes (e.g., `42mm`) or the `to...` conversion functions.
 
 No matter what units the current file uses, this function will always return a number equivalent to the input in millimeters.
 

docs/kcl/fromYd.md

@@ -8,7 +8,7 @@ layout: manual
 
 Converts a number from yards to the current default unit.
 
-*DEPRECATED* prefer using explicit numberic suffixes (e.g., `42yd`) or the `to...` conversion functions.
+*DEPRECATED* prefer using explicit numeric suffixes (e.g., `42yd`) or the `to...` conversion functions.
 
 No matter what units the current file uses, this function will always return a number equivalent to the input in yards.
 

docs/kcl/std.json

@@ -61,16 +61,6 @@ impl ExecutorContext {
                     if exec_state.mod_local.settings.update_from_annotation(annotation)? {
                         exec_state.mod_local.explicit_length_units = true;
                     }
-                    let new_units = exec_state.length_unit();
-                    if !self.engine.execution_kind().await.is_isolated() {
-                        self.engine
-                            .set_units(
-                                new_units.into(),
-                                annotation.as_source_range(),
-                                exec_state.id_generator(),
-                            )
-                            .await?;
-                    }
                 } else {
                     exec_state.err(CompilationError::err(
                         annotation.as_source_range(),
@@ -107,7 +97,6 @@ impl ExecutorContext {
     ) -> Result<(Option<KclValue>, EnvironmentRef, Vec<String>), KclError> {
         crate::log::log(format!("enter module {path} {} {exec_kind:?}", exec_state.stack()));
 
-        let old_units = exec_state.length_unit();
         let original_execution = self.engine.replace_execution_kind(exec_kind).await;
 
         let mut local_state = ModuleState::new(path.std_path(), exec_state.stack().memory.clone(), Some(module_id));
@@ -127,7 +116,6 @@ impl ExecutorContext {
             .exec_block(program, exec_state, crate::execution::BodyType::Root)
             .await;
 
-        let new_units = exec_state.length_unit();
         let env_ref = if preserve_mem {
             exec_state.mut_stack().pop_and_preserve_env()
         } else {
@@ -137,15 +125,6 @@ impl ExecutorContext {
             std::mem::swap(&mut exec_state.mod_local, &mut local_state);
         }
 
-        // We only need to reset the units if we are not on the Main path.
-        // If we reset at the end of the main path, then we just add on an extra
-        // command and we'd need to flush the batch again.
-        // This avoids that.
-        if !exec_kind.is_isolated() && new_units != old_units && *path != ModulePath::Main {
-            self.engine
-                .set_units(old_units.into(), Default::default(), exec_state.id_generator())
-                .await?;
-        }
         self.engine.replace_execution_kind(original_execution).await;
 
         crate::log::log(format!("leave {path}"));

rust/kcl-lib/src/execution/exec_ast.rs

@@ -625,12 +625,6 @@ impl SketchSurface {
             SketchSurface::Face(face) => face.z_axis,
         }
     }
-    pub(crate) fn units(&self) -> UnitLen {
-        match self {
-            SketchSurface::Plane(plane) => plane.units,
-            SketchSurface::Face(face) => face.units,
-        }
-    }
 }
 
 #[derive(Debug, Clone)]
@@ -741,6 +735,10 @@ impl Solid {
     pub(crate) fn get_all_edge_cut_ids(&self) -> impl Iterator<Item = uuid::Uuid> + '_ {
         self.edge_cuts.iter().map(|foc| foc.id())
     }
+
+    pub(crate) fn height_in_mm(&self) -> f64 {
+        self.units.adjust_to(self.height, UnitLen::Mm).0
+    }
 }
 
 /// A fillet or a chamfer.
@@ -803,6 +801,7 @@ pub struct Point2d {
 
 impl From<[TyF64; 2]> for Point2d {
     fn from(p: [TyF64; 2]) -> Self {
+        // TODO should combine not just use x's type
         Self {
             x: p[0].n,
             y: p[1].n,
@@ -813,12 +812,14 @@ impl From<[TyF64; 2]> for Point2d {
 
 impl From<Point2d> for [f64; 2] {
     fn from(p: Point2d) -> Self {
+        // TODO should take into account units
         [p.x, p.y]
     }
 }
 
 impl From<Point2d> for Point2D {
     fn from(p: Point2d) -> Self {
+        // TODO should take into account units
         Self { x: p.x, y: p.y }
     }
 }
@@ -833,6 +834,14 @@ impl Point2d {
     pub fn new(x: f64, y: f64, units: UnitLen) -> Self {
         Self { x, y, units }
     }
+
+    pub fn into_x(self) -> TyF64 {
+        TyF64::new(self.x, self.units.into())
+    }
+
+    pub fn into_y(self) -> TyF64 {
+        TyF64::new(self.y, self.units.into())
+    }
 }
 
 #[derive(Debug, Deserialize, Serialize, PartialEq, Clone, Copy, ts_rs::TS, JsonSchema, Default)]
@@ -880,9 +889,9 @@ impl From<Point3d> for Point3D {
 impl From<Point3d> for kittycad_modeling_cmds::shared::Point3d<LengthUnit> {
     fn from(p: Point3d) -> Self {
         Self {
-            x: LengthUnit(p.x),
-            y: LengthUnit(p.y),
-            z: LengthUnit(p.z),
+            x: LengthUnit(p.units.adjust_to(p.x, UnitLen::Mm).0),
+            y: LengthUnit(p.units.adjust_to(p.y, UnitLen::Mm).0),
+            z: LengthUnit(p.units.adjust_to(p.z, UnitLen::Mm).0),
         }
     }
 }
@@ -1230,9 +1239,9 @@ impl Path {
                 ccw: *ccw,
             },
             Path::ArcThreePoint { p1, p2, p3, .. } => {
-                let circle_center = crate::std::utils::calculate_circle_from_3_points([*p1, *p2, *p3]);
+                let circle = crate::std::utils::calculate_circle_from_3_points([*p1, *p2, *p3]);
                 GetTangentialInfoFromPathsResult::Arc {
-                    center: circle_center.center,
+                    center: circle.center,
                     ccw: crate::std::utils::is_points_ccw(&[*p1, *p2, *p3]) > 0,
                 }
             }
@@ -1244,14 +1253,13 @@ impl Path {
                 radius: *radius,
             },
             Path::CircleThreePoint { p1, p2, p3, .. } => {
-                let circle_center = crate::std::utils::calculate_circle_from_3_points([*p1, *p2, *p3]);
-                let radius = linear_distance(&[circle_center.center[0], circle_center.center[1]], p1);
-                let center_point = [circle_center.center[0], circle_center.center[1]];
+                let circle = crate::std::utils::calculate_circle_from_3_points([*p1, *p2, *p3]);
+                let center_point = [circle.center[0], circle.center[1]];
                 GetTangentialInfoFromPathsResult::Circle {
                     center: center_point,
                     // Note: a circle is always ccw regardless of the order of points
                     ccw: true,
-                    radius,
+                    radius: circle.radius,
                 }
             }
             Path::ToPoint { .. } | Path::Horizontal { .. } | Path::AngledLineTo { .. } | Path::Base { .. } => {

rust/kcl-lib/src/execution/geometry.rs

@@ -593,12 +593,12 @@ impl NumericType {
     }
 
     fn is_unknown(&self) -> bool {
-        match self {
+        matches!(
+            self,
             NumericType::Unknown
-            | NumericType::Known(UnitType::Angle(UnitAngle::Unknown))
-            | NumericType::Known(UnitType::Length(UnitLen::Unknown)) => true,
-            _ => false,
-        }
+                | NumericType::Known(UnitType::Angle(UnitAngle::Unknown))
+                | NumericType::Known(UnitType::Length(UnitLen::Unknown))
+        )
     }
 
     fn example_ty(&self) -> Option<String> {
@@ -764,7 +764,7 @@ pub enum UnitLen {
 }
 
 impl UnitLen {
-    fn adjust_to(self, value: f64, to: UnitLen) -> (f64, UnitLen) {
+    pub fn adjust_to(self, value: f64, to: UnitLen) -> (f64, UnitLen) {
         use UnitLen::*;
 
         if self == to {
@@ -887,7 +887,7 @@ pub enum UnitAngle {
 }
 
 impl UnitAngle {
-    fn adjust_to(self, value: f64, to: UnitAngle) -> (f64, UnitAngle) {
+    pub fn adjust_to(self, value: f64, to: UnitAngle) -> (f64, UnitAngle) {
         use std::f64::consts::PI;
 
         use UnitAngle::*;
@@ -1042,8 +1042,7 @@ impl KclValue {
                         y_axis,
                         z_axis,
                         value: super::PlaneType::Uninit,
-                        // TODO use length unit from origin
-                        units: exec_state.length_unit(),
+                        units: origin.units,
                         meta: meta.clone(),
                     };