_/minecrab
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 1 Wiki Activity

Clean up main.rs event handling a little

Browse source
This commit is contained in:
Sijmen 2021-06-02 17:21:03 +02:00
parent d2ff642b3b
commit c22409bd54
Signed by: vijfhoek
GPG key ID: 82D05C89B28B0DAE
1 changed files with 64 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
src/main.rs
View file

@ -18,11 +18,70 @@ use winit::{
dpi::{PhysicalSize, Size}, dpi::{PhysicalSize, Size},
event::{ElementState, Event, KeyboardInput, MouseButton, VirtualKeyCode, WindowEvent}, event::{ElementState, Event, KeyboardInput, MouseButton, VirtualKeyCode, WindowEvent},
event_loop::{ControlFlow, EventLoop}, event_loop::{ControlFlow, EventLoop},
window::WindowBuilder, window::{Window, WindowBuilder},
}; };
use crate::state::State; use crate::state::State;
fn handle_window_event(
event: &WindowEvent,
state: &mut State,
window: &Window,
) -> Option<ControlFlow> {
match event {
WindowEvent::CloseRequested => Some(ControlFlow::Exit),
WindowEvent::KeyboardInput {
input:
KeyboardInput {
state: ElementState::Pressed,
virtual_keycode: Some(VirtualKeyCode::Escape),
..
},
..
} => {
let _ = window.set_cursor_grab(false);
window.set_cursor_visible(true);
state.mouse_grabbed = false;
None
}
WindowEvent::Resized(physical_size) => {
state.resize(*physical_size);
None
}
WindowEvent::ScaleFactorChanged { new_inner_size, .. } => {
state.resize(**new_inner_size);
None
}
WindowEvent::MouseInput {
state: mouse_state,
button,
..
} => {
if !state.mouse_grabbed
&& *button == MouseButton::Left
&& *mouse_state == ElementState::Pressed
{
let _ = window.set_cursor_grab(true);
window.set_cursor_visible(false);
state.mouse_grabbed = true;
} else {
state.window_event(event);
}
None
}
WindowEvent::Focused(false) => {
let _ = window.set_cursor_grab(false);
window.set_cursor_visible(true);
state.mouse_grabbed = false;
None
}
event => {
state.window_event(event);
None
}
}
}
fn main() { fn main() {
env_logger::init(); env_logger::init();
let event_loop = EventLoop::new(); let event_loop = EventLoop::new();
@ -53,47 +112,11 @@ fn main() {
Event::WindowEvent { Event::WindowEvent {
ref event, ref event,
window_id, window_id,
} if window_id == window.id() => match event { } if window_id == window.id() => {
WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit, if let Some(cf) = handle_window_event(event, &mut state, &window) {
WindowEvent::KeyboardInput { *control_flow = cf
input:
KeyboardInput {
state: ElementState::Pressed,
virtual_keycode: Some(VirtualKeyCode::Escape),
..
},
..
} => {
let _ = window.set_cursor_grab(false);
window.set_cursor_visible(true);
state.mouse_grabbed = false;
} }
WindowEvent::Resized(physical_size) => { }
state.resize(*physical_size);
}
WindowEvent::ScaleFactorChanged { new_inner_size, .. } => {
state.resize(**new_inner_size);
}
WindowEvent::MouseInput {
state: mouse_state,
button,
..
} => {
if !state.mouse_grabbed && *button == MouseButton::Left && *mouse_state == ElementState::Pressed {
let _ = window.set_cursor_grab(true);
window.set_cursor_visible(false);
state.mouse_grabbed = true;
} else {
state.window_event(event);
}
}
WindowEvent::Focused(false) => {
let _ = window.set_cursor_grab(false);
window.set_cursor_visible(true);
state.mouse_grabbed = false;
}
event => { state.window_event(event); }
},
Event::RedrawRequested(_) => { Event::RedrawRequested(_) => {
let frame_elapsed = frame_instant.elapsed(); let frame_elapsed = frame_instant.elapsed();
frame_instant = Instant::now(); frame_instant = Instant::now();