StrafesNET/strafe-client
5
Fork 4
Code Issues 2 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

update code for winit 0.29.2

Browse Source
This commit is contained in:
Quaternions 2023-10-23 16:48:59 -07:00
parent 4cad20da09
commit f6f2995ae0
1 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/graphics_context.rs
View File

@ -161,7 +161,6 @@ impl GraphicsContextPartial4{
GraphicsContext{ GraphicsContext{
instance:self.instance, instance:self.instance,
surface:self.surface, surface:self.surface,
adapter:self.adapter,
device:self.device, device:self.device,
queue:self.queue, queue:self.queue,
config, config,
@ -171,14 +170,13 @@ impl GraphicsContextPartial4{
pub struct GraphicsContext{ pub struct GraphicsContext{
pub instance:wgpu::Instance, pub instance:wgpu::Instance,
pub surface:wgpu::Surface, pub surface:wgpu::Surface,
pub adapter:wgpu::Adapter,
pub device:wgpu::Device, pub device:wgpu::Device,
pub queue:wgpu::Queue, pub queue:wgpu::Queue,
pub config:wgpu::SurfaceConfiguration, pub config:wgpu::SurfaceConfiguration,
} }
pub fn setup(title:&str)->GraphicsContextSetup{ pub fn setup(title:&str)->GraphicsContextSetup{
let event_loop=winit::event_loop::EventLoop::new(); let event_loop=winit::event_loop::EventLoop::new().unwrap();
let window=crate::window::WindowState::create_window(title,&event_loop).unwrap(); let window=crate::window::WindowState::create_window(title,&event_loop).unwrap();
@ -272,58 +270,49 @@ impl GraphicsContextSetup{
println!("Entering render loop..."); println!("Entering render loop...");
let root_time=std::time::Instant::now(); let root_time=std::time::Instant::now();
event_loop.run(move |event,_,control_flow|{ event_loop.run(move |event,elwt|{
let time=crate::integer::Time::from_nanos(root_time.elapsed().as_nanos() as i64); let time=crate::integer::Time::from_nanos(root_time.elapsed().as_nanos() as i64);
*control_flow=if cfg!(feature="metal-auto-capture"){ // *control_flow=if cfg!(feature="metal-auto-capture"){
winit::event_loop::ControlFlow::Exit // winit::event_loop::ControlFlow::Exit
}else{ // }else{
winit::event_loop::ControlFlow::Poll // winit::event_loop::ControlFlow::Poll
}; // };
match event{ match event{
winit::event::Event::RedrawEventsCleared=>{ winit::event::Event::AboutToWait=>{
window.request_redraw(); window.request_redraw();
} }
winit::event::Event::WindowEvent { winit::event::Event::WindowEvent {
event: event:
winit::event::WindowEvent::Resized(size) // WindowEvent::Resized(size)
| winit::event::WindowEvent::ScaleFactorChanged { // | WindowEvent::ScaleFactorChanged {
new_inner_size:&mut size, // new_inner_size: &mut size,
scale_factor:_, // ..
}, // },
winit::event::WindowEvent::Resized(size),//ignoring scale factor changed for now because mutex bruh
window_id:_, window_id:_,
} => { } => {
// Once winit is fixed, the detection conditions here can be removed. println!("Resizing to {:?}",size);
// https://github.com/rust-windowing/winit/issues/2876 run_thread.send(TimedInstruction{time,instruction:RunInstruction::Resize(size)});
// this has been fixed if I update winit (remove the if statement and only use the else case)
//drop adapter when you delete this
let max_dimension=graphics_context.adapter.limits().max_texture_dimension_2d;
if max_dimension<size.width||max_dimension<size.height{
println!(
"The resizing size {:?} exceeds the limit of {}.",
size,
max_dimension
);
}else{
println!("Resizing to {:?}",size);
run_thread.send(TimedInstruction{time,instruction:RunInstruction::Resize(size)});
}
} }
winit::event::Event::WindowEvent{event,..}=>match event{ winit::event::Event::WindowEvent{event,..}=>match event{
winit::event::WindowEvent::KeyboardInput{ winit::event::WindowEvent::KeyboardInput{
input: event:
winit::event::KeyboardInput{ winit::event::KeyEvent {
virtual_keycode:Some(winit::event::VirtualKeyCode::Escape), logical_key: winit::keyboard::Key::Named(winit::keyboard::NamedKey::Escape),
state: winit::event::ElementState::Pressed, state: winit::event::ElementState::Pressed,
.. ..
}, },
.. ..
} }
|winit::event::WindowEvent::CloseRequested=>{ |winit::event::WindowEvent::CloseRequested=>{
*control_flow=winit::event_loop::ControlFlow::Exit; elwt.exit();
} }
_=>{ _=>{
run_thread.send(TimedInstruction{time,instruction:RunInstruction::WindowEvent(event)}); run_thread.send(TimedInstruction{time,instruction:RunInstruction::WindowEvent(event)});
} }
winit::event::WindowEvent::RedrawRequested=>{
run_thread.send(TimedInstruction{time,instruction:RunInstruction::Render});
}
}, },
winit::event::Event::DeviceEvent{ winit::event::Event::DeviceEvent{
event, event,
@ -331,11 +320,8 @@ impl GraphicsContextSetup{
} => { } => {
run_thread.send(TimedInstruction{time,instruction:RunInstruction::DeviceEvent(event)}); run_thread.send(TimedInstruction{time,instruction:RunInstruction::DeviceEvent(event)});
}, },
winit::event::Event::RedrawRequested(_)=>{
//send
}
_=>{} _=>{}
} }
}); }).unwrap();
} }
} }