From 6f746798f9e488cfab48ec108390cedafaec99a4 Mon Sep 17 00:00:00 2001 From: Lizzy Fleckenstein Date: Mon, 8 May 2023 22:39:21 +0200 Subject: Fix yaw --- src/gfx.rs | 3 +-- src/gfx/state.rs | 9 ++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gfx.rs b/src/gfx.rs index c86b351..385291f 100644 --- a/src/gfx.rs +++ b/src/gfx.rs @@ -6,7 +6,6 @@ use winit::{ event::{DeviceEvent::*, Event::*, WindowEvent::*}, event_loop::ControlFlow::ExitWithCode, platform::run_return::EventLoopExtRunReturn, - window::CursorGrabMode, }; mod map; @@ -106,7 +105,7 @@ pub async fn run( .. } => { if !game_paused { - state.camera.update_mouse(delta.0 as f32, delta.1 as f32); + state.camera.update_mouse(-delta.0 as f32, delta.1 as f32); window .set_cursor_position(winit::dpi::PhysicalPosition::new( state.config.width / 2, diff --git a/src/gfx/state.rs b/src/gfx/state.rs index 9d1cfd1..43ac41c 100644 --- a/src/gfx/state.rs +++ b/src/gfx/state.rs @@ -177,10 +177,17 @@ impl State { } pub fn update(&mut self, dt: Duration) { + self.camera.yaw += Rad::from(Deg(180.0)).0; + self.camera.yaw *= -1.0; + let cam = self.camera.camera(dt.as_secs_f32()); + + self.camera.yaw *= -1.0; + self.camera.yaw -= Rad::from(Deg(180.0)).0; + self.camera.position = cam.position; - self.view = Matrix4::from(cam.orthogonal()); + self.view = Matrix4::from(cam.orthogonal()); self.camera_uniform.set(&self.queue, self.proj * self.view); } -- cgit v1.2.3