From 6377885d6dd0c8edbf88058e31746dcae6779e78 Mon Sep 17 00:00:00 2001 From: Quaternions Date: Wed, 25 Oct 2023 14:07:52 -0700 Subject: [PATCH] rename run to window --- src/main.rs | 4 ++-- src/setup.rs | 20 +++++++++---------- src/{run.rs => window.rs} | 42 +++++++++++++++++++-------------------- 3 files changed, 33 insertions(+), 33 deletions(-) rename src/{run.rs => window.rs} (90%) diff --git a/src/main.rs b/src/main.rs index cbf1f91..5c0ef27 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,8 @@ mod bvh; -mod run; mod aabb; mod model; mod setup; +mod window; mod worker; mod zeroes; mod integer; @@ -120,5 +120,5 @@ pub fn default_models()->model::IndexedModelInstances{ fn main(){ let context=setup::setup(format!("Strafe Client v{}",env!("CARGO_PKG_VERSION")).as_str()); - context.start();//creates and runs a run context + context.start();//creates and runs a window context } diff --git a/src/setup.rs b/src/setup.rs index c119bee..1c05ef4 100644 --- a/src/setup.rs +++ b/src/setup.rs @@ -1,5 +1,5 @@ use crate::instruction::TimedInstruction; -use crate::run::RunInstruction; +use crate::window::WindowInstruction; fn optional_features()->wgpu::Features{ wgpu::Features::TEXTURE_COMPRESSION_ASTC @@ -230,19 +230,19 @@ impl SetupContextSetup{ //dedicated thread to ping request redraw back and resize the window doesn't seem logical - let run=crate::run::RunContextSetup::new(&setup_context,window); + let window=crate::window::WindowContextSetup::new(&setup_context,window); //the thread that spawns the physics thread - let run_thread=run.into_worker(setup_context); + let window_thread=window.into_worker(setup_context); println!("Entering event loop..."); let root_time=std::time::Instant::now(); - run_event_loop(event_loop,run_thread,root_time).unwrap(); + run_event_loop(event_loop,window_thread,root_time).unwrap(); } } fn run_event_loop( event_loop:winit::event_loop::EventLoop<()>, - mut run_thread:crate::compat_worker::QNWorker>, + mut window_thread:crate::compat_worker::QNWorker>, root_time:std::time::Instant )->Result<(),winit::error::EventLoopError>{ event_loop.run(move |event,elwt|{ @@ -254,7 +254,7 @@ fn run_event_loop( // }; match event{ winit::event::Event::AboutToWait=>{ - run_thread.send(TimedInstruction{time,instruction:RunInstruction::RequestRedraw}).unwrap(); + window_thread.send(TimedInstruction{time,instruction:WindowInstruction::RequestRedraw}).unwrap(); } winit::event::Event::WindowEvent { event: @@ -266,7 +266,7 @@ fn run_event_loop( winit::event::WindowEvent::Resized(size),//ignoring scale factor changed for now because mutex bruh window_id:_, } => { - run_thread.send(TimedInstruction{time,instruction:RunInstruction::Resize(size)}).unwrap(); + window_thread.send(TimedInstruction{time,instruction:WindowInstruction::Resize(size)}).unwrap(); } winit::event::Event::WindowEvent{event,..}=>match event{ winit::event::WindowEvent::KeyboardInput{ @@ -282,17 +282,17 @@ fn run_event_loop( elwt.exit(); } winit::event::WindowEvent::RedrawRequested=>{ - run_thread.send(TimedInstruction{time,instruction:RunInstruction::Render}).unwrap(); + window_thread.send(TimedInstruction{time,instruction:WindowInstruction::Render}).unwrap(); } _=>{ - run_thread.send(TimedInstruction{time,instruction:RunInstruction::WindowEvent(event)}).unwrap(); + window_thread.send(TimedInstruction{time,instruction:WindowInstruction::WindowEvent(event)}).unwrap(); } }, winit::event::Event::DeviceEvent{ event, .. } => { - run_thread.send(TimedInstruction{time,instruction:RunInstruction::DeviceEvent(event)}).unwrap(); + window_thread.send(TimedInstruction{time,instruction:WindowInstruction::DeviceEvent(event)}).unwrap(); }, _=>{} } diff --git a/src/run.rs b/src/window.rs similarity index 90% rename from src/run.rs rename to src/window.rs index a3e0fc9..a5b34e2 100644 --- a/src/run.rs +++ b/src/window.rs @@ -1,7 +1,7 @@ use crate::instruction::TimedInstruction; use crate::physics_worker::InputInstruction; -pub enum RunInstruction{ +pub enum WindowInstruction{ Resize(winit::dpi::PhysicalSize), WindowEvent(winit::event::WindowEvent), DeviceEvent(winit::event::DeviceEvent), @@ -10,7 +10,7 @@ pub enum RunInstruction{ } //holds thread handles to dispatch to -struct RunContext<'a>{ +struct WindowContext<'a>{ manual_mouse_lock:bool, mouse:crate::physics::MouseState,//std::sync::Arc> screen_size:glam::UVec2, @@ -19,7 +19,7 @@ struct RunContext<'a>{ physics_thread:crate::compat_worker::QNWorker<'a, TimedInstruction>, } -impl RunContext<'_>{ +impl WindowContext<'_>{ fn get_middle_of_screen(&self)->winit::dpi::PhysicalPosition{ winit::dpi::PhysicalPosition::new(self.screen_size.x as f32/2.0, self.screen_size.y as f32/2.0) } @@ -161,14 +161,14 @@ impl RunContext<'_>{ } } -pub struct RunContextSetup{ +pub struct WindowContextSetup{ user_settings:crate::settings::UserSettings, window:winit::window::Window, physics:crate::physics::PhysicsState, graphics:crate::graphics::GraphicsState, } -impl RunContextSetup{ +impl WindowContextSetup{ pub fn new(context:&crate::setup::SetupContext,window:winit::window::Window)->Self{ //wee let user_settings=crate::settings::read_user_settings(); @@ -197,10 +197,10 @@ impl RunContextSetup{ } } - fn into_context<'a>(self,setup_context:crate::setup::SetupContext)->RunContext<'a>{ + fn into_context<'a>(self,setup_context:crate::setup::SetupContext)->WindowContext<'a>{ let screen_size=glam::uvec2(setup_context.config.width,setup_context.config.height); let graphics_thread=crate::graphics_worker::new(self.graphics,setup_context.config,setup_context.surface,setup_context.device,setup_context.queue); - RunContext{ + WindowContext{ manual_mouse_lock:false, mouse:crate::physics::MouseState::default(), //make sure to update this!!!!! @@ -211,29 +211,29 @@ impl RunContextSetup{ } } - pub fn into_worker<'a>(self,setup_context:crate::setup::SetupContext)->crate::compat_worker::QNWorker<'a,TimedInstruction>{ - let mut run_context=self.into_context(setup_context); - crate::compat_worker::QNWorker::new(move |ins:TimedInstruction|{ + pub fn into_worker<'a>(self,setup_context:crate::setup::SetupContext)->crate::compat_worker::QNWorker<'a,TimedInstruction>{ + let mut window_context=self.into_context(setup_context); + crate::compat_worker::QNWorker::new(move |ins:TimedInstruction|{ match ins.instruction{ - RunInstruction::RequestRedraw=>{ - run_context.window.request_redraw(); + WindowInstruction::RequestRedraw=>{ + window_context.window.request_redraw(); } - RunInstruction::WindowEvent(window_event)=>{ - run_context.window_event(ins.time,window_event); + WindowInstruction::WindowEvent(window_event)=>{ + window_context.window_event(ins.time,window_event); }, - RunInstruction::DeviceEvent(device_event)=>{ - run_context.device_event(ins.time,device_event); + WindowInstruction::DeviceEvent(device_event)=>{ + window_context.device_event(ins.time,device_event); }, - RunInstruction::Resize(size)=>{ - run_context.physics_thread.send( + WindowInstruction::Resize(size)=>{ + window_context.physics_thread.send( TimedInstruction{ time:ins.time, - instruction:crate::physics_worker::Instruction::Resize(size,run_context.user_settings.clone()) + instruction:crate::physics_worker::Instruction::Resize(size,window_context.user_settings.clone()) } ).unwrap(); } - RunInstruction::Render=>{ - run_context.physics_thread.send( + WindowInstruction::Render=>{ + window_context.physics_thread.send( TimedInstruction{ time:ins.time, instruction:crate::physics_worker::Instruction::Render