From 0985661e45a98ebc8dd1fc4d0631e0d306f4d414 Mon Sep 17 00:00:00 2001 From: Quaternions Date: Mon, 5 Aug 2024 13:35:54 -0700 Subject: [PATCH] move mouse and physics types to common --- src/bot_worker.rs | 2 +- src/window.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bot_worker.rs b/src/bot_worker.rs index 6857558..f4226c0 100644 --- a/src/bot_worker.rs +++ b/src/bot_worker.rs @@ -5,7 +5,7 @@ pub enum Instruction{ Create, Delete, Push{ - ins:strafesnet_common::instruction::TimedInstruction, + ins:strafesnet_common::instruction::TimedInstruction, }, } diff --git a/src/window.rs b/src/window.rs index a75fa3f..1413227 100644 --- a/src/window.rs +++ b/src/window.rs @@ -13,7 +13,7 @@ pub enum WindowInstruction{ //holds thread handles to dispatch to struct WindowContext<'a>{ manual_mouse_lock:bool, - mouse:crate::physics::MouseState,//std::sync::Arc> + mouse:strafesnet_common::mouse::MouseState,//std::sync::Arc> screen_size:glam::UVec2, user_settings:crate::settings::UserSettings, window:&'a winit::window::Window, @@ -113,7 +113,7 @@ impl WindowContext<'_>{ "z"=>Some(InputInstruction::Zoom(s)), "r"=>if s{ //mouse needs to be reset since the position is absolute - self.mouse=crate::physics::MouseState::default(); + self.mouse=strafesnet_common::mouse::MouseState::default(); Some(InputInstruction::Restart) }else{None}, "f"=>if s{Some(InputInstruction::PracticeFly)}else{None}, @@ -200,7 +200,7 @@ impl<'a> WindowContextSetup<'a>{ let graphics_thread=crate::graphics_worker::new(self.graphics,setup_context.config,setup_context.surface,setup_context.device,setup_context.queue); WindowContext{ manual_mouse_lock:false, - mouse:crate::physics::MouseState::default(), + mouse:strafesnet_common::mouse::MouseState::default(), //make sure to update this!!!!! screen_size, user_settings:self.user_settings,