From ceeeb6e268246599e25aa63b6c1f5283ce84deee Mon Sep 17 00:00:00 2001
From: Wynd <wyndmaster@gmail.com>
Date: Wed, 6 Nov 2024 00:49:30 +0200
Subject: [PATCH] Some better code organization for xy movement and camera
 reset key

---
 src/app.rs        |  2 +-
 src/camera.rs     | 19 ++++++++++++++-
 src/controller.rs | 62 ++++++++++++++++++++++++-----------------------
 src/shader.wgsl   |  2 +-
 src/state.rs      | 25 +++++++++++++++++--
 5 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/src/app.rs b/src/app.rs
index 3339973..46a46d8 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -4,7 +4,7 @@ use ashpd::desktop::screenshot::Screenshot;
 use pollster::FutureExt;
 use winit::{
 	application::ApplicationHandler,
-	event::{MouseScrollDelta, WindowEvent},
+	event::WindowEvent,
 	keyboard::{Key, NamedKey},
 	window::{Fullscreen, Window},
 };
diff --git a/src/camera.rs b/src/camera.rs
index f9e029a..41528f6 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -1,3 +1,4 @@
+use cgmath::Point3;
 use wgpu::util::DeviceExt;
 
 #[rustfmt::skip]
@@ -8,6 +9,8 @@ pub const OPENGL_TO_WGPU_MATRIX: cgmath::Matrix4<f32> = cgmath::Matrix4::new(
     0.0, 0.0, 0.0, 1.0,
 );
 
+pub const DEFAULT_CAMERA_ZOOM: f32 = 1.7;
+
 pub struct Camera {
 	pub eye: cgmath::Point3<f32>,
 	pub target: cgmath::Point3<f32>,
@@ -28,7 +31,7 @@ pub struct CameraInfo {
 impl Camera {
 	pub fn new(config: &wgpu::SurfaceConfiguration, device: &wgpu::Device) -> (Self, CameraInfo) {
 		let camera = Self {
-			eye: (0.0, 0.0, 1.7).into(),
+			eye: (0.0, 0.0, DEFAULT_CAMERA_ZOOM).into(),
 			target: (0.0, 0.0, 0.0).into(),
 			up: cgmath::Vector3::unit_y(),
 			aspect: config.width as f32 / config.height as f32,
@@ -84,6 +87,20 @@ impl Camera {
 		let proj = cgmath::perspective(cgmath::Deg(self.fovy), 1.0, self.znear, self.zfar);
 		OPENGL_TO_WGPU_MATRIX * proj * view
 	}
+
+	pub fn reset_camera(&mut self) {
+		self.eye = Point3 {
+			x: 0.0,
+			y: 0.0,
+			z: DEFAULT_CAMERA_ZOOM,
+		};
+
+		self.target = Point3 {
+			x: 0.0,
+			y: 0.0,
+			z: 0.0,
+		};
+	}
 }
 
 #[repr(C)]
diff --git a/src/controller.rs b/src/controller.rs
index 696caf9..e2978e1 100644
--- a/src/controller.rs
+++ b/src/controller.rs
@@ -1,12 +1,7 @@
-use std::sync::Arc;
+use cgmath::Point3;
+use winit::event::{MouseButton, MouseScrollDelta, WindowEvent};
 
-use winit::{
-	dpi::PhysicalSize,
-	event::{MouseButton, MouseScrollDelta, WindowEvent},
-	keyboard::{KeyCode, PhysicalKey},
-};
-
-use crate::camera::Camera;
+use crate::camera::{Camera, DEFAULT_CAMERA_ZOOM};
 
 const MAX_ZOOM_LEVEL: f32 = 15.0;
 
@@ -45,32 +40,34 @@ impl CameraController {
 				false
 			}
 			WindowEvent::CursorMoved { position, .. } => {
-				let mut x = 0.0;
-				let mut y = 0.0;
-
 				if !self.is_moving {
 					self.cursor_start = (position.x as f32, position.y as f32);
-
-					x = match position.x {
-						x if x < 100.0 => -0.0005,
-						x if x > window_size.0 - 100.0 => 0.0005,
-						_ => 0.0,
-					};
-
-					y = match position.y {
-						y if y < 100.0 => 0.0005,
-						y if y > window_size.1 - 100.0 => -0.0005,
-						_ => 0.0,
-					};
-				}
-				else {
-					x = -self.cursor_start.0 + position.x as f32;
-					x *= 0.000001;
-					y = self.cursor_start.1 - position.y as f32;
-					y *= 0.000001;
 				}
 
-				self.movement = (x, y);
+				self.movement = match self.is_moving {
+					true => {
+						let x = -self.cursor_start.0 + position.x as f32;
+						let x = x * 0.000001;
+						let y = self.cursor_start.1 - position.y as f32;
+						let y = y * 0.000001;
+						(x, y)
+					}
+					false => {
+						let x = match position.x {
+							x if x < 100.0 => -0.0005,
+							x if x > window_size.0 - 100.0 => 0.0005,
+							_ => 0.0,
+						};
+
+						let y = match position.y {
+							y if y < 100.0 => 0.0005,
+							y if y > window_size.1 - 100.0 => -0.0005,
+							_ => 0.0,
+						};
+
+						(x, y)
+					}
+				};
 
 				true
 			}
@@ -110,4 +107,9 @@ impl CameraController {
 
 		self.forward = 0.0;
 	}
+
+	pub fn reset_camera(&mut self, camera: &mut Camera) {
+		camera.reset_camera();
+		self.zoom_level = 1.0;
+	}
 }
diff --git a/src/shader.wgsl b/src/shader.wgsl
index 39eeb13..df770d5 100644
--- a/src/shader.wgsl
+++ b/src/shader.wgsl
@@ -36,5 +36,5 @@ var s_diffuse: sampler;
 
 @fragment
 fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
-     return textureSample(t_diffuse, s_diffuse, in.tex_coords);;
+     return textureSample(t_diffuse, s_diffuse, in.tex_coords);
 }
diff --git a/src/state.rs b/src/state.rs
index 835f752..910d736 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -2,7 +2,12 @@ use std::sync::Arc;
 
 use pollster::FutureExt;
 use wgpu::util::DeviceExt;
-use winit::window::Window;
+use winit::{
+	event::{ElementState, WindowEvent},
+	keyboard::{Key, KeyCode, NamedKey},
+	platform::modifier_supplement::KeyEventExtModifierSupplement,
+	window::Window,
+};
 
 use crate::{
 	camera::{Camera, CameraInfo},
@@ -205,7 +210,23 @@ impl<'a> State<'a> {
 
 	pub fn input(&mut self, event: &winit::event::WindowEvent) -> bool {
 		self.camera_controller.process_events(self.wsize, event);
-		false
+		match event {
+			WindowEvent::KeyboardInput {
+				event: key_event, ..
+			} => {
+				if key_event.state == ElementState::Pressed {
+					let key = &key_event.logical_key;
+					if let Key::Character(char) = key {
+						if char == "r" {
+							self.camera_controller.reset_camera(&mut self.camera);
+						}
+					}
+					return true;
+				}
+				false
+			}
+			_ => false,
+		}
 	}
 
 	pub fn update(&mut self) {