Skip to content

SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.

view.apply: keep the camera's roll, and refuse an up axis (#5087) (#5094)

raykholodbbad6d4ee1d
diff --git a/crates/engine/src/cmd/browser.rs b/crates/engine/src/cmd/browser.rs
index dadd216509..3015a8460c 100644
--- a/crates/engine/src/cmd/browser.rs
+++ b/crates/engine/src/cmd/browser.rs
@@ -34,7 +34,7 @@ pub static COMMANDS: &[CommandSpec] = &[
CommandSpec::new("view.delete", "Delete Named View", view_delete).icon("delete").params("view: name"),
CommandSpec::new("view.list", "List Named Views", view_list).icon("list").noundo().doc_only(),
CommandSpec::new("view.apply", "Restore Named View", view_apply).icon("camera").noundo().params(
- "view?: front|back|top|bottom|left|right|iso|home (frames the model) | a named view's name; or camera?: {target: [x,y,z], yaw, pitch, distance, fov?} (radians, mm) → camera. The viewport (and the MCP screenshot) moves there. View state: not saved, not an undo step",
+ "view?: front|back|top|bottom|left|right|iso|home (frames the model) | a named view's name; or camera?: {target: [x,y,z], yaw, pitch, distance, fov?, roll?} (radians, mm; roll defaults to 0, must be finite and is clamped to ±π; up is refused: the up axis comes from the design settings) → camera. The viewport (and the MCP screenshot) moves there. View state: not saved, not an undo step",
),
CommandSpec::new("browser.order", "Order Browser Items", order).icon("reorder").params("folder, component?, order: [keys] (the folder's items in display order)"),
CommandSpec::new("browser.visibility", "Show/Hide", visibility).icon("eye").noundo().params(
@@ -453,8 +453,17 @@ fn view_apply(s: &mut Session, p: &Value) -> Result<Value> {
(Some(_), Some(_)) => return Err(bad(cmd, "give `view` or `camera`, not both")),
(None, None) => return Err(bad(cmd, "`view` (a name) or `camera` is required")),
(None, Some(c)) => {
+ if c.get("up").is_some() {
+ return Err(bad(cmd, "camera `up` is not supported: the up axis comes from the design settings"));
+ }
+ let roll = match c.get("roll") {
+ Some(value) => {
+ value.as_f64().filter(|r| r.is_finite()).ok_or_else(|| bad(cmd, "camera `roll` must be a finite number in radians"))?
+ }
+ None => 0.0,
+ };
let v: solidcraft_doc::NamedView = serde_json::from_value(c.clone()).map_err(|e| bad(cmd, format!("bad camera: {e}")))?;
- camera_of(&v)
+ crate::render::Camera { roll: roll.clamp(-std::f64::consts::PI, std::f64::consts::PI), ..camera_of(&v) }
}
// Standard view names come first, as in the browser's Named Views folder.
(Some(name), None) => match crate::render::StandardView::parse(name) {
@@ -985,8 +994,14 @@ mod tests {
run(&mut s, "view.apply", json!({"view": "top"}));
let c = s.camera.expect("a camera for the top view");
assert!((c.pitch - std::f64::consts::FRAC_PI_2).abs() < 1e-3 && (c.target.x - 20.0).abs() < 1e-6, "{c:?}");
- run(&mut s, "view.apply", json!({"camera": {"target": [0, 0, 0], "yaw": 1, "pitch": 0.2, "distance": 80, "fov": 0.5}}));
- assert_eq!(s.camera.map(|c| (c.yaw, c.distance, c.fov)), Some((1.0, 80.0, 0.5)));
+ let r = run(&mut s, "view.apply", json!({"camera": {"target": [0, 0, 0], "yaw": 1, "pitch": 0.2, "distance": 80, "fov": 0.5, "roll": 1.0}}));
+ assert_eq!(s.camera.map(|c| (c.yaw, c.distance, c.fov, c.roll)), Some((1.0, 80.0, 0.5, 1.0)));
+ assert_eq!(r["camera"]["roll"], 1.0);
+ for (roll, expected) in [(f64::MAX, std::f64::consts::PI), (-f64::MAX, -std::f64::consts::PI)] {
+ let r = run(&mut s, "view.apply", json!({"camera": {"target": [0, 0, 0], "yaw": 0, "pitch": 0, "distance": 80, "roll": roll}}));
+ assert_eq!(r["camera"]["roll"], expected);
+ assert_eq!(s.camera.map(|c| c.roll), Some(expected));
+ }
assert_eq!(s.undo.len(), undo, "view state, not an undo step");
for p in [
json!({}),
@@ -999,6 +1014,31 @@ mod tests {
}
}
+ #[test]
+ fn applying_a_camera_rejects_up() {
+ let mut s = Session::default();
+ run(&mut s, "view.apply", json!({"view": "front"}));
+ let before = serde_json::to_value(s.camera).unwrap();
+ let err = s.execute("view.apply", &json!({"camera": {"target": [0, 0, 0], "yaw": 0, "pitch": 0, "distance": 80, "up": "y"}})).unwrap_err();
+ let message = err.to_string();
+ assert!(message.contains("up") && message.contains("design") && message.contains("settings"), "{message}");
+ assert_eq!(serde_json::to_value(s.camera).unwrap(), before);
+ }
+
+ #[test]
+ fn applying_a_camera_rejects_invalid_roll() {
+ let mut s = Session::default();
+ run(&mut s, "view.apply", json!({"view": "front"}));
+ let before = serde_json::to_value(s.camera).unwrap();
+ // Non-finite floating-point values serialize as null in JSON.
+ for roll in [json!(f64::NAN), json!(f64::INFINITY), json!(f64::NEG_INFINITY), json!("NaN"), json!(true)] {
+ let err =
+ s.execute("view.apply", &json!({"camera": {"target": [0, 0, 0], "yaw": 0, "pitch": 0, "distance": 80, "roll": roll}})).unwrap_err();
+ assert!(err.to_string().contains("roll"), "{err}");
+ assert_eq!(serde_json::to_value(s.camera).unwrap(), before);
+ }
+ }
+
#[test]
fn named_views_are_saved_renamed_and_deleted() {
let mut s = Session::default();