Merge branch 'main' into kurt-selections-refactor

src-tauri/Cargo.toml

@@ -20,7 +20,7 @@ kittycad = "0.2.59"
 oauth2 = "4.4.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tauri = { version = "1.6.0", features = [ "os-all", "dialog-all", "fs-all", "http-request", "path-all", "shell-open", "shell-open-api", "devtools"] }
+tauri = { version = "1.6.1", features = [ "os-all", "dialog-all", "fs-all", "http-request", "path-all", "shell-open", "shell-open-api", "devtools"] }
 tauri-plugin-fs-extra = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tokio = { version = "1.36.0", features = ["time"] }
 toml = "0.8.2"

src/clientSideScene/CameraControls.ts

@@ -731,6 +731,7 @@ export class CameraControls {
 
   async tweenCameraToQuaternion(
     targetQuaternion: Quaternion,
+    targetPosition = new Vector3(),
     duration = 500,
     toOrthographic = true
   ): Promise<void> {
@@ -750,43 +751,50 @@ export class CameraControls {
     }
     await this._tweenCameraToQuaternion(
       targetQuaternion,
+      targetPosition,
       remainingDuration,
       toOrthographic
     )
   }
   _tweenCameraToQuaternion(
     targetQuaternion: Quaternion,
+    targetPosition: Vector3,
     duration = 500,
     toOrthographic = false
   ): Promise<void> {
     return new Promise((resolve) => {
       const camera = this.camera
       this._isCamMovingCallback(true, true)
       const initialQuaternion = camera.quaternion.clone()
+      const initialTarget = this.target.clone()
       const isVertical = isQuaternionVertical(targetQuaternion)
       let tweenEnd = isVertical ? 0.99 : 1
-      const controlsTarget = this.target.clone()
-      const initialDistance = controlsTarget.distanceTo(camera.position.clone())
+      const tempVec = new Vector3()
+      const initialDistance = initialTarget.distanceTo(camera.position.clone())
 
       const cameraAtTime = (animationProgress: number /* 0 - 1 */) => {
         const currentQ = tempQuaternion.slerpQuaternions(
           initialQuaternion,
           targetQuaternion,
           animationProgress
         )
+        const currentTarget = tempVec.lerpVectors(
+          initialTarget,
+          targetPosition,
+          animationProgress
+        )
         if (this.camera instanceof PerspectiveCamera)
           // changing the camera position back when it's orthographic doesn't do anything
           // and it messes up animating back to perspective later
           this.camera.position
             .set(0, 0, 1)
             .applyQuaternion(currentQ)
             .multiplyScalar(initialDistance)
-            .add(controlsTarget)
+            .add(currentTarget)
 
         this.camera.up.set(0, 1, 0).applyQuaternion(currentQ).normalize()
         this.camera.quaternion.copy(currentQ)
-        this.target.copy(controlsTarget)
-        // this.controls.update()
+        this.target.copy(currentTarget)
         this.camera.updateProjectionMatrix()
         this.update()
         this.onCameraChange()

src/wasm-lib/Cargo.toml

@@ -37,7 +37,7 @@ wasm-bindgen-futures = { version = "0.4.41", features = ["futures-core-03-stream
 wasm-streams = "0.4.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]
-version = "0.3.68"
+version = "0.3.69"
 features = [
   "console",
   "HtmlTextAreaElement",

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.8"
+version = "0.1.9"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"

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

@@ -197,6 +197,7 @@ fn do_stdlib_inner(
         let (ty_string, ty_ident) = clean_ty_string(ty.to_string().as_str());
 
         let ty_string = rust_type_to_openapi_type(&ty_string);
+        let required = !ty_ident.to_string().starts_with("Option <");
 
         if ty_string != "Args" {
             let schema = if ty_ident.to_string().starts_with("Vec < ")
@@ -216,7 +217,7 @@ fn do_stdlib_inner(
                     name: #arg_name.to_string(),
                     type_: #ty_string.to_string(),
                     schema: #schema,
-                    required: true,
+                    required: #required,
                 }
             });
         }

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

@@ -44,7 +44,7 @@ impl crate::docs::StdLibFn for Show {
             name: "args".to_string(),
             type_: "number".to_string(),
             schema: <Option<f64>>::json_schema(&mut generator),
-            required: true,
+            required: false,
         }]
     }
 

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

@@ -44,7 +44,7 @@ impl crate::docs::StdLibFn for Import {
             name: "args".to_string(),
             type_: "kittycad::types::InputFormat".to_string(),
             schema: <Option<kittycad::types::InputFormat>>::json_schema(&mut generator),
-            required: true,
+            required: false,
         }]
     }
 

src/wasm-lib/kcl/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.1.42"
+version = "0.1.44"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
@@ -17,7 +17,7 @@ async-trait = "0.1.77"
 clap = { version = "4.5.1", features = ["cargo", "derive", "env", "unicode"], optional = true }
 dashmap = "5.5.3"
 databake = { version = "0.1.7", features = ["derive"] }
-derive-docs = { version = "0.1.8" }
+derive-docs = { version = "0.1.9" }
 #derive-docs = { path = "../derive-docs" }
 futures = { version = "0.3.30" }
 gltf-json = "1.4.0"
@@ -41,7 +41,7 @@ js-sys = { version = "0.3.69" }
 tower-lsp = { version = "0.20.0", default-features = false, features = ["runtime-agnostic"] }
 wasm-bindgen = "0.2.91"
 wasm-bindgen-futures = "0.4.41"
-web-sys = { version = "0.3.68", features = ["console"] }
+web-sys = { version = "0.3.69", features = ["console"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 approx = "0.5"
@@ -65,7 +65,7 @@ debug = true # Flamegraphs of benchmarks require accurate debug symbols
 [dev-dependencies]
 criterion = "0.5.1"
 expectorate = "1.1.0"
-insta = { version = "1.34.0", features = ["json"] }
+insta = { version = "1.36.1", features = ["json"] }
 itertools = "0.12.1"
 pretty_assertions = "1.4.0"
 tokio = { version = "1.36.0", features = ["rt-multi-thread", "macros", "time"] }