Merge pull request #189: add Windows SpaceMouse navigation

crates/ui-egui/src/lib.rs

@@ -863,6 +863,15 @@ impl SolveApp {
         self.cam_anim = None;
     }
 
+    /// Hand the view to an external navigation device without a pending mouse orbit or spin
+    /// immediately taking it back on the next frame.
+    pub fn begin_external_navigation(&mut self) {
+        self.cancel_view_animation();
+        self.viewport.orbit_snap = None;
+        self.viewport.orbit_free = None;
+        self.viewport.spin = false;
+    }
+
     fn step_view_animation(&mut self, ctx: &egui::Context) {
         let Some(anim) = self.cam_anim else { return };
         let (cam, done) = anim.sample(self.now);

crates/ui-egui/src/prefs.rs

@@ -39,6 +39,10 @@ pub struct Prefs {
     pub zoom_reverse: bool,
     /// Orbit around the point under the cursor (else around the view's centre).
     pub orbit_cursor: bool,
+    /// Whether a connected 3D mouse moves the view.
+    pub space_mouse_enabled: bool,
+    /// Speed multiplier for 3D mouse navigation.
+    pub space_mouse_speed: f32,
     /// Anti-aliasing samples (applies on restart).
     pub msaa: u32,
     /// Decimals shown for lengths and angles.
@@ -68,6 +72,8 @@ impl Default for Prefs {
             nav: "fusion".into(),
             zoom_reverse: false,
             orbit_cursor: false,
+            space_mouse_enabled: true,
+            space_mouse_speed: 1.0,
             msaa: 4,
             length_decimals: 2,
             angle_decimals: 1,
@@ -175,6 +181,8 @@ fn defaults(app: &mut SolveApp, page: usize) {
             p.zoom_reverse = d.zoom_reverse;
             p.zoom_to_cursor = d.zoom_to_cursor;
             p.orbit_cursor = d.orbit_cursor;
+            p.space_mouse_enabled = d.space_mouse_enabled;
+            p.space_mouse_speed = d.space_mouse_speed;
             p.look_at_anim = d.look_at_anim;
             p.look_at_speed = d.look_at_speed;
         }
@@ -577,6 +585,16 @@ fn page(app: &mut SolveApp, ui: &mut egui::Ui, t: &Tokens) {
                 egui::Slider::new(&mut app.preferences.look_at_speed, 0.5..=3.0).step_by(0.25).custom_formatter(|v, _| format!("{v:.2}×")),
             );
             ui.end_row();
+            ui.label("3D mouse (Windows)");
+            ui.checkbox(&mut app.preferences.space_mouse_enabled, "Navigate with SpaceNavigator / SpaceMouse");
+            ui.end_row();
+            ui.label("3D mouse speed");
+            ui.add_enabled(
+                app.preferences.space_mouse_enabled,
+                egui::Slider::new(&mut app.preferences.space_mouse_speed, 0.25..=3.0).step_by(0.05).custom_formatter(|v, _| format!("{v:.2}×")),
+            );
+            ui.end_row();
+            note(ui, "Move and rotate the view together; sketches use pan and zoom only.");
         }
         PAGE_DESIGN => {
             ui.label("Default modelling orientation");

crates/ui-egui/src/viewport.rs

@@ -671,7 +671,7 @@ fn pick_cached(app: &mut SolveApp, proj: &Proj, pos: Pos2) -> Vec<Hit> {
     let mut h = std::collections::hash_map::DefaultHasher::new();
     pos.x.to_bits().hash(&mut h);
     pos.y.to_bits().hash(&mut h);
-    for v in [app.cam.yaw, app.cam.pitch, app.cam.distance, app.cam.target.x, app.cam.target.y, app.cam.target.z] {
+    for v in [app.cam.yaw, app.cam.pitch, app.cam.roll, app.cam.distance, app.cam.target.x, app.cam.target.y, app.cam.target.z] {
         v.to_bits().hash(&mut h);
     }
     app.session.revision.hash(&mut h);
@@ -2241,7 +2241,7 @@ fn cpu_render(app: &mut SolveApp, ctx: &egui::Context, painter: &egui::Painter,
     }
     let mut h = std::collections::hash_map::DefaultHasher::new();
     sketch_scene_key(app, proj).hash(&mut h);
-    for v in [proj.cam.yaw, proj.cam.pitch, proj.cam.distance, proj.cam.target.x, proj.cam.target.y, proj.cam.target.z] {
+    for v in [proj.cam.yaw, proj.cam.pitch, proj.cam.roll, proj.cam.distance, proj.cam.target.x, proj.cam.target.y, proj.cam.target.z] {
         v.to_bits().hash(&mut h);
     }
     (rect.width() as u32, rect.height() as u32).hash(&mut h);