Merge branch 'main' into serena/orient-to-face

KittyCAD · Dec 9, 2024 · 02f3b69 · 02f3b69
2 parents 0f7b405 + 2a16360
commit 02f3b69
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 156 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ missing_docs = "deny"
 dbg_macro = "deny"
 
 [workspace.dependencies]
-kittycad = { version = "0.3.22", features = ["requests"] }
+kittycad = { version = "0.3.28", features = ["requests"] }
 kittycad-modeling-cmds = { path = "modeling-cmds", version = "0.2.0" }
 kittycad-modeling-cmds-macros = { path = "modeling-cmds-macros", version = "0.1.11" }
 kittycad-modeling-cmds-macros-impl = { path = "modeling-cmds-macros-impl", version = "0.1.12" }

diff --git a/bumper/Cargo.toml b/bumper/Cargo.toml
@@ -10,8 +10,8 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.93"
-clap = { version = "4.5.21", features = ["derive"] }
+anyhow = "1.0.94"
+clap = { version = "4.5.23", features = ["derive"] }
 semver = "1.0.22"
 serde = "1.0.215"
 toml_edit = "0.22.16"

diff --git a/modeling-cmds-macros-impl/Cargo.toml b/modeling-cmds-macros-impl/Cargo.toml
@@ -16,7 +16,7 @@ quote = { workspace = true }
 syn = { workspace = true, features = ["extra-traits", "full"] }
 
 [dev-dependencies]
-anyhow = "1.0.93"
+anyhow = "1.0.94"
 criterion = { version = "0.5", features = ["html_reports"] }
 insta = "1.41.1"
 regex = "1.11.1"

diff --git a/modeling-cmds-macros/Cargo.toml b/modeling-cmds-macros/Cargo.toml
@@ -20,7 +20,7 @@ syn = { workspace = true, features = ["extra-traits", "full"] }
 proc-macro = true
 
 [dev-dependencies]
-anyhow = "1.0.93"
+anyhow = "1.0.94"
 insta = "1.41.1"
 regex = "1.11.1"
 rustfmt-wrapper = "0.2.1"

diff --git a/modeling-cmds/Cargo.toml b/modeling-cmds/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kittycad-modeling-cmds"
-version = "0.2.77"
+version = "0.2.78"
 edition = "2021"
 authors = ["KittyCAD, Inc."]
 description = "Commands in the KittyCAD Modeling API"
@@ -11,15 +11,15 @@ license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.93"
-chrono = "0.4.35"
+anyhow = "1.0.94"
+chrono = "0.4.39"
 cxx = { version = "1.0", optional = true }
 data-encoding = "2.5.0"
 enum-iterator = "2.1.0"
 enum-iterator-derive = "1.2.1"
 euler = "0.4.1"
-http = "1.1.0"
-kittycad = { version = "0.3.22", optional = true }
+http = "1.2.0"
+kittycad = { version = "0.3.28", optional = true }
 kittycad-modeling-cmds-macros = { workspace = true }
 kittycad-unit-conversion-derive = "0.1.0"
 measurements = "0.11.0"
@@ -37,7 +37,7 @@ serde_json = { version = "1.0.133", optional = true }
 slog = { version = "2.7.0", optional = true }
 tabled = { version = "0.17", optional = true }
 uuid = { version = "1.11.0", features = ["serde", "v4", "js"] }
-webrtc = { version = "0.11", optional = true }
+webrtc = { version = "0.12", optional = true }
 
 [lints]
 workspace = true

diff --git a/modeling-cmds/src/shared.rs b/modeling-cmds/src/shared.rs
@@ -218,8 +218,10 @@ pub enum AnnotationType {
 pub enum CameraDragInteractionType {
     /// Camera pan
     Pan,
-    /// Camera rotate (revolve/orbit)
+    /// Camera rotate (spherical camera revolve/orbit)
     Rotate,
+    /// Camera rotate (trackball with 3 degrees of freedom)
+    RotateTrackball,
     /// Camera zoom (increase or decrease distance to reference point center)
     Zoom,
 }

diff --git a/modeling-session/Cargo.toml b/modeling-session/Cargo.toml
@@ -17,7 +17,7 @@ kittycad-modeling-cmds = { workspace = true, features = ["websocket"] }
 lsystem = "0.2.1"
 reqwest = "0.12.9"
 serde_json = "1.0.133"
-thiserror = "2.0.4"
+thiserror = "2.0.6"
 tokio = { version = "1", features = ["sync"] }
 tokio-tungstenite = "0.24.0"
 uuid = { version = "1.11.0", features = ["v4"] }