From: Lizzy Fleckenstein Date: Mon, 8 May 2023 20:39:21 +0000 (+0200) Subject: Fix yaw X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=6f746798f9e488cfab48ec108390cedafaec99a4;p=mt_client.git Fix yaw --- diff --git a/.gitignore b/.gitignore index bf05131..5a648b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /target config.yml -/flamegraph.svg -/perf.data -/perf.data.old +flamegraph.svg +perf.data +perf.data.old diff --git a/Cargo.lock b/Cargo.lock index 73e08c8..4914157 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1082,7 +1082,7 @@ dependencies = [ [[package]] name = "mt_net" version = "0.1.0" -source = "git+https://github.com/minetest-rust/mt_net#2bf4f75254ddfca9ef13c6a1b2a8e6210f298ab5" +source = "git+https://github.com/minetest-rust/mt_net#ea1983ec93aa6db9dc2486713a6d974aaf3780e0" dependencies = [ "async-trait", "cgmath", 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); }