Zoom to fit rust side (#2195)

* zoom to fit

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* zoom to fit

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* docs

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

---------

Signed-off-by: Jess Frazelle <github@jessfraz.com>

src/wasm-lib/Cargo.lock

@@ -927,7 +927,7 @@ dependencies = [
 
 [[package]]
 name = "derive-docs"
-version = "0.1.14"
+version = "0.1.15"
 dependencies = [
  "Inflector",
  "anyhow",
@@ -1854,7 +1854,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-lib"
-version = "0.1.47"
+version = "0.1.48"
 dependencies = [
  "anyhow",
  "approx 0.5.1",
@@ -1921,9 +1921,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.2.67"
+version = "0.2.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc460442c165c8e707b1154551cefd08938d10bb80c78940e10cd9869487c325"
+checksum = "f14a17cc3c056804ad287f698ba54e569e0133b8e728fb18ec73e23a8bdad951"
 dependencies = [
  "anyhow",
  "async-trait",

src/wasm-lib/Cargo.toml

@@ -61,7 +61,7 @@ members = [
 ]
 
 [workspace.dependencies]
-kittycad = { version = "0.2.67", default-features = false, features = ["js", "requests"] }
+kittycad = { version = "0.2.69", default-features = false, features = ["js", "requests"] }
 kittycad-execution-plan = "0.1.4"
 kittycad-execution-plan-macros = "0.1.9"
 kittycad-execution-plan-traits = "0.1.14"

src/wasm-lib/derive-docs/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "derive-docs"
 description = "A tool for generating documentation from Rust derive macros"
-version = "0.1.14"
+version = "0.1.15"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"

src/wasm-lib/derive-docs/src/lib.rs

@@ -788,17 +788,14 @@ fn generate_code_block_test(
 
             ctx.run(program, None).await.unwrap();
 
-            let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
-
+            // Zoom to fit.
             ctx.engine
                 .send_modeling_cmd(
                     uuid::Uuid::new_v4(),
                     crate::executor::SourceRange::default(),
-                    kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                        center: kittycad::types::Point3D { x: 0.0, y: 0.0, z: 0.0 },
-                        up: kittycad::types::Point3D { x: 0.0, y: 0.0, z: 1.0 },
-                        vantage: kittycad::types::Point3D { x: 0.0, y: -x, z: y },
-                        sequence: None,
+                    kittycad::types::ModelingCmd::ZoomToFit {
+                        object_ids: Some(Default::default()),
+                        padding: 0.1,
                     },
                 )
                 .await.unwrap();

src/wasm-lib/derive-docs/tests/array.gen

@@ -33,28 +33,13 @@ mod test_examples_show {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await
@@ -125,28 +110,13 @@ mod test_examples_show {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/box.gen

@@ -33,28 +33,13 @@ mod test_examples_show {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/doc_comment_with_code.gen

@@ -34,28 +34,13 @@ mod test_examples_my_func {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await
@@ -126,28 +111,13 @@ mod test_examples_my_func {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/doc_comment_with_code_on_ignored_function.gen

@@ -35,28 +35,13 @@ mod test_examples_import {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await
@@ -128,28 +113,13 @@ mod test_examples_import {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/lineTo.gen

@@ -34,28 +34,13 @@ mod test_examples_line_to {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await
@@ -126,28 +111,13 @@ mod test_examples_line_to {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/min.gen

@@ -33,28 +33,13 @@ mod test_examples_min {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await
@@ -125,28 +110,13 @@ mod test_examples_min {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/option.gen

@@ -33,28 +33,13 @@ mod test_examples_show {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/option_input_format.gen

@@ -33,28 +33,13 @@ mod test_examples_import {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/return_vec_box_sketch_group.gen

@@ -33,28 +33,13 @@ mod test_examples_import {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/return_vec_sketch_group.gen

@@ -33,28 +33,13 @@ mod test_examples_import {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/show.gen

@@ -33,28 +33,13 @@ mod test_examples_show {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                    center: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
+                kittycad::types::ModelingCmd::ZoomToFit {
+                    object_ids: Some(Default::default()),
+                    padding: 0.1,
                 },
             )
             .await

src/wasm-lib/kcl/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.1.47"
+version = "0.1.48"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
@@ -19,7 +19,7 @@ chrono = "0.4.38"
 clap = { version = "4.5.4", features = ["cargo", "derive", "env", "unicode"], optional = true }
 dashmap = "5.5.3"
 databake = { version = "0.1.7", features = ["derive"] }
-derive-docs = { version = "0.1.14",  path = "../derive-docs" }
+derive-docs = { version = "0.1.15",  path = "../derive-docs" }
 form_urlencoded = "1.2.1"
 futures = { version = "0.3.30" }
 git_rev = "0.1.0"

src/wasm-lib/kcl/src/engine/mod.rs

@@ -365,6 +365,7 @@ pub fn is_cmd_with_return_values(cmd: &kittycad::types::ModelingCmd) -> bool {
     | kittycad::types::ModelingCmd::EntityGetDistance { .. }
     | kittycad::types::ModelingCmd::EntityLinearPattern { .. }
     | kittycad::types::ModelingCmd::EntityCircularPattern { .. }
+    | kittycad::types::ModelingCmd::ZoomToFit { .. }
     | kittycad::types::ModelingCmd::Solid3DGetExtrusionFaceInfo { .. }) = cmd
     else {
         return false;

src/wasm-lib/kcl/src/std/utils.rs

@@ -838,24 +838,3 @@ pub fn get_tangent_point_from_previous_arc(
         tangential_angle.to_radians().sin() * 10.0 + last_arc_end[1],
     ]
 }
-
-fn unit_length_to_mm(base_unit: kittycad::types::UnitLength) -> f64 {
-    match base_unit {
-        kittycad::types::UnitLength::Mm => 1.0,
-        kittycad::types::UnitLength::Cm => 10.0,
-        kittycad::types::UnitLength::M => 1000.0,
-        kittycad::types::UnitLength::In => 25.4,
-        kittycad::types::UnitLength::Ft => 304.8,
-        kittycad::types::UnitLength::Yd => 914.4,
-    }
-}
-
-pub fn get_camera_zoom_magnitude_per_unit_length(unit: kittycad::types::UnitLength) -> (f64, f64) {
-    let base_radius = 5.6_f64;
-    let cam_height_distance_ratio = 0.5_f64;
-    let length = unit_length_to_mm(unit) * base_radius * 20.0;
-    let ang = cam_height_distance_ratio.atan();
-    let x = ang.cos() * length;
-    let y = ang.sin() * length;
-    (x, y)
-}

src/wasm-lib/tests/executor/main.rs

@@ -42,17 +42,14 @@ async fn execute_and_snapshot(code: &str, units: kittycad::types::UnitLength) ->
 
     let _ = ctx.run(program, None).await?;
 
-    let (x, y) = kcl_lib::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
-
+    // Zoom to fit.
     ctx.engine
         .send_modeling_cmd(
             uuid::Uuid::new_v4(),
             kcl_lib::executor::SourceRange::default(),
-            kittycad::types::ModelingCmd::DefaultCameraLookAt {
-                center: kittycad::types::Point3D { x: 0.0, y: 0.0, z: 0.0 },
-                up: kittycad::types::Point3D { x: 0.0, y: 0.0, z: 1.0 },
-                vantage: kittycad::types::Point3D { x: 0.0, y: -x, z: y },
-                sequence: None,
+            kittycad::types::ModelingCmd::ZoomToFit {
+                object_ids: Some(Default::default()),
+                padding: 0.1,
             },
         )
         .await?;