Integrate more builder API from kcmc

Author: adamchalmers

Cargo.lock

@@ -118,5 +118,8 @@ incremental = true
 # Set this to 1 or 2 to get more useful backtraces in debugger.
 debug = 0
 
-# [patch.crates-io]
+[patch.crates-io]
+kittycad-modeling-cmds = { git = "https://github.com/KittyCAD/modeling-api", branch = "achalmers/more-builders" }
+kcl-lib = { git = "https://github.com/KittyCAD/modeling-app", branch = "achalmers/integrate-builder" }
+kcl-test-server = { git = "https://github.com/KittyCAD/modeling-app", branch = "achalmers/integrate-builder" }
 # kcl-lib = { path = "../modeling-app/rust/kcl-lib" }

Cargo.toml

@@ -1,38 +1,35 @@
+use kcmc::shared::Point3d;
 use kittycad_modeling_cmds as kcmc;
 
+const Z_UP: Point3d = Point3d { x: 0.0, y: 0.0, z: 1.0 };
+const ZERO: Point3d = Point3d { x: 0.0, y: 0.0, z: 0.0 };
+
 pub(crate) fn front() -> kcmc::ModelingCmd {
     kcmc::ModelingCmd::DefaultCameraLookAt(
         kcmc::DefaultCameraLookAt::builder()
-            .up(kcmc::shared::Point3d { x: 0.0, y: 0.0, z: 1.0 })
-            .vantage(kcmc::shared::Point3d {
-                x: 0.0,
-                y: -1.0,
-                z: 0.0,
-            })
-            .center(kcmc::shared::Point3d { x: 0.0, y: 0.0, z: 0.0 })
-            .maybe_sequence(None)
+            .up(Z_UP)
+            .vantage(Point3d::only_y(-1.0))
+            .center(ZERO)
             .build(),
     )
 }
 
 pub(crate) fn right_side() -> kcmc::ModelingCmd {
     kcmc::ModelingCmd::DefaultCameraLookAt(
         kcmc::DefaultCameraLookAt::builder()
-            .up(kcmc::shared::Point3d { x: 0.0, y: 0.0, z: 1.0 })
-            .vantage(kcmc::shared::Point3d { x: 1.0, y: 0.0, z: 0.0 })
-            .center(kcmc::shared::Point3d { x: 0.0, y: 0.0, z: 0.0 })
-            .maybe_sequence(None)
+            .up(Z_UP)
+            .vantage(Point3d::only_x(1.0))
+            .center(ZERO)
             .build(),
     )
 }
 
 pub(crate) fn top() -> kcmc::ModelingCmd {
     kcmc::ModelingCmd::DefaultCameraLookAt(
         kcmc::DefaultCameraLookAt::builder()
-            .up(kcmc::shared::Point3d { x: 0.0, y: 1.0, z: 0.0 })
-            .vantage(kcmc::shared::Point3d { x: 0.0, y: 0.0, z: 1.0 })
-            .center(kcmc::shared::Point3d { x: 0.0, y: 0.0, z: 0.0 })
-            .maybe_sequence(None)
+            .up(Point3d::only_y(1.0))
+            .vantage(Z_UP)
+            .center(ZERO)
             .build(),
     )
 }

src/cmd_kcl/camera_angles.rs

@@ -362,10 +362,10 @@ async fn get_image_bytes(
             kcl_lib::SourceRange::default(),
             &ModelingCmd::from(
                 mcmd::ImportFiles::builder()
-                    .files(vec![ImportFile {
-                        path: "model.gltf".to_string(),
-                        data: gltf_bytes.to_vec(),
-                    }])
+                    .files(vec![ImportFile::builder()
+                        .path("model.gltf".to_string())
+                        .data(gltf_bytes.to_vec())
+                        .build()])
                     .format(InputFormat3d::Gltf(Default::default()))
                     .build(),
             ),