From a85500236df867b895d2106d471c52ab1584a2f7 Mon Sep 17 00:00:00 2001
From: Marco Thomas <mail@marco-thomas.net>
Date: Sat, 28 Aug 2021 15:15:04 +0200
Subject: [PATCH] Clean up some things

---
 src/camera_controller.rs |  8 +++++---
 src/main.rs              |  6 +++---
 src/state.rs             | 17 -----------------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/camera_controller.rs b/src/camera_controller.rs
index 5ca1140..cd9b23c 100644
--- a/src/camera_controller.rs
+++ b/src/camera_controller.rs
@@ -2,6 +2,8 @@ use cgmath::Vector2;
 use cgmath::Point3;
 use winit::{dpi::PhysicalPosition, event::*};
 
+const MOUSE_SLOWDOWN: f32 = 100.0;
+
 #[derive(Debug)]
 enum ButtonPress {
     Up(ElementState),
@@ -80,6 +82,7 @@ impl CameraController {
     /// Vectors are casted from (0, 0, 0) to both the target and the eye
     pub fn update_camera(&mut self, camera: &mut crate::camera::Camera) {
         // TODO what about delta time?
+        // TODO this still feels a bit chunky...
         use cgmath::InnerSpace;
         // Casted eye -> target
         let forward = camera.target - camera.eye;
@@ -130,9 +133,8 @@ impl CameraController {
         // mouse movement:
         // target moves
         // eye stays in place
-        let decr = 200.0;
-        camera.target.x += (self.mouse_movement.x as f32) / decr;
-        camera.target.y -= (self.mouse_movement.y as f32) / decr;
+        camera.target.x += (self.mouse_movement.x as f32) / MOUSE_SLOWDOWN;
+        camera.target.y -= (self.mouse_movement.y as f32) / MOUSE_SLOWDOWN;
         self.mouse_movement = Vector2 { x: 0.0, y: 0.0 };
 
         dbg!(&camera.eye);
diff --git a/src/main.rs b/src/main.rs
index f2d6ee2..864e08d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,4 @@
-use winit::{dpi::PhysicalPosition, event::*, event_loop::{ControlFlow, EventLoop}, window::WindowBuilder};
+use winit::{event::*, event_loop::{ControlFlow, EventLoop}, window::WindowBuilder};
 
 mod state;
 mod vertex;
@@ -15,8 +15,8 @@ fn main() {
     let mut window = WindowBuilder::new()
         .build(&event_loop)
         .unwrap();
-    //window.set_cursor_visible(false);
-    //window.set_cursor_grab(true).unwrap();
+    window.set_cursor_visible(false);
+    window.set_cursor_grab(true).unwrap();
 
     // wait until Future is ready
     let mut state = pollster::block_on(State::new(&window));
diff --git a/src/state.rs b/src/state.rs
index ca9ce6a..649d3c3 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -324,23 +324,6 @@ impl State {
             WindowEvent::ScaleFactorChanged {new_inner_size, ..} => {
                 self.resize(**new_inner_size);
             },
-//            WindowEvent::CursorMoved { position, .. } => {
-//                let x = (position.x as f64) / self.size.width as f64;
-//                let y = (position.y as f64) / self.size.height as f64;
-//                self.clear_color = wgpu::Color { r: x, g: x, b: y, a: 1.0};
-//                true
-//            },
-//            WindowEvent::KeyboardInput {
-//                input: KeyboardInput {
-//                    state: ElementState::Pressed,
-//                    virtual_keycode: Some(VirtualKeyCode::Space),
-//                    ..
-//                },
-//                ..
-//            } => {
-//                self.use_pentagon = !self.use_pentagon;
-//                true
-//            }
             _ => self.camera_controller.input(event)
         }
     }