Simplify controls (#507)

* Simplify FirstPersonControl * Simplify FlyControl * Simplify OrbitControl * Simplify FreeOrbitControl * Remove CameraControl * Docs
asny · Nov 11, 2024 · 7e7ebf9 · 7e7ebf9
1 parent bf25a5e
commit 7e7ebf9
Show file tree

Hide file tree

Showing 6 changed files with 195 additions and 346 deletions.
diff --git a/src/renderer/control.rs b/src/renderer/control.rs
@@ -2,10 +2,6 @@
 //! A collection of controls for example to control the camera.
 //!
 
-mod camera_control;
-#[doc(inline)]
-pub use camera_control::*;
-
 mod orbit_control;
 #[doc(inline)]
 pub use orbit_control::*;

diff --git a/src/renderer/control/camera_control.rs b/src/renderer/control/camera_control.rs
diff --git a/src/renderer/control/first_person_control.rs b/src/renderer/control/first_person_control.rs
@@ -3,29 +3,49 @@ use crate::renderer::*;
 ///
 /// A control that makes the camera move like it is a person on the ground.
 ///
+#[derive(Clone, Copy, Debug)]
 pub struct FirstPersonControl {
-    control: CameraControl,
+    /// The speed of movements.
+    pub speed: f32,
 }
 
 impl FirstPersonControl {
     /// Creates a new first person control with the given speed of movements.
     pub fn new(speed: f32) -> Self {
-        Self {
-            control: CameraControl {
-                left_drag_horizontal: CameraAction::Yaw {
-                    speed: std::f32::consts::PI / 1800.0,
-                },
-                left_drag_vertical: CameraAction::Pitch {
-                    speed: std::f32::consts::PI / 1800.0,
-                },
-                scroll_vertical: CameraAction::Forward { speed },
-                ..Default::default()
-            },
-        }
+        Self { speed }
     }
 
     /// Handles the events. Must be called each frame.
     pub fn handle_events(&mut self, camera: &mut Camera, events: &mut [Event]) -> bool {
-        self.control.handle_events(camera, events)
+        let mut change = false;
+        for event in events.iter_mut() {
+            match event {
+                Event::MouseMotion {
+                    delta,
+                    button,
+                    handled,
+                    ..
+                } => {
+                    if !*handled {
+                        if Some(MouseButton::Left) == *button {
+                            camera.yaw(radians(delta.0 * std::f32::consts::PI / 1800.0));
+                            camera.pitch(radians(delta.1 * std::f32::consts::PI / 1800.0));
+                            *handled = true;
+                            change = true;
+                        }
+                    }
+                }
+                Event::MouseWheel { delta, handled, .. } => {
+                    if !*handled {
+                        let v = camera.view_direction() * self.speed * delta.1;
+                        camera.translate(&v);
+                        *handled = true;
+                        change = true;
+                    }
+                }
+                _ => {}
+            }
+        }
+        change
     }
 }
diff --git a/src/renderer/control/fly_control.rs b/src/renderer/control/fly_control.rs
@@ -3,31 +3,58 @@ use crate::renderer::*;
 ///
 /// A control that makes the camera fly through the 3D scene.
 ///
+#[derive(Clone, Copy, Debug)]
 pub struct FlyControl {
-    control: CameraControl,
+    /// The speed of movements.
+    pub speed: f32,
 }
 
 impl FlyControl {
     /// Creates a new fly control with the given speed of movements.
     pub fn new(speed: f32) -> Self {
-        Self {
-            control: CameraControl {
-                left_drag_horizontal: CameraAction::Yaw {
-                    speed: std::f32::consts::PI / 1800.0,
-                },
-                left_drag_vertical: CameraAction::Pitch {
-                    speed: std::f32::consts::PI / 1800.0,
-                },
-                scroll_vertical: CameraAction::Forward { speed },
-                right_drag_horizontal: CameraAction::Left { speed },
-                right_drag_vertical: CameraAction::Up { speed },
-                ..Default::default()
-            },
-        }
+        Self { speed }
     }
 
     /// Handles the events. Must be called each frame.
     pub fn handle_events(&mut self, camera: &mut Camera, events: &mut [Event]) -> bool {
-        self.control.handle_events(camera, events)
+        let mut change = false;
+        for event in events.iter_mut() {
+            match event {
+                Event::MouseMotion {
+                    delta,
+                    button,
+                    handled,
+                    ..
+                } => {
+                    if !*handled {
+                        if Some(MouseButton::Left) == *button {
+                            camera.yaw(radians(delta.0 * std::f32::consts::PI / 1800.0));
+                            camera.pitch(radians(delta.1 * std::f32::consts::PI / 1800.0));
+                            *handled = true;
+                            change = true;
+                        }
+                        if Some(MouseButton::Right) == *button {
+                            let right = camera.right_direction();
+                            let up = right.cross(camera.view_direction());
+                            camera.translate(
+                                &(-right * delta.0 * self.speed + up * delta.1 * self.speed),
+                            );
+                            *handled = true;
+                            change = true;
+                        }
+                    }
+                }
+                Event::MouseWheel { delta, handled, .. } => {
+                    if !*handled {
+                        let v = camera.view_direction() * self.speed * delta.1;
+                        camera.translate(&v);
+                        *handled = true;
+                        change = true;
+                    }
+                }
+                _ => {}
+            }
+        }
+        change
     }
 }