JustForFun/vulkano_test
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

virtual_input: Use RwLock instead of Mutex

Browse source
This commit is contained in:
Florian RICHER 2025-05-31 12:59:32 +02:00
parent 45ccf030f6
commit 9d3800c718
Signed by: florian.richer
GPG key ID: C73D37CBED7BFC77
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/core/input/virtual_input.rs
View file

@ -1,6 +1,6 @@
use std::{collections::HashMap, sync::Arc}; use std::{collections::HashMap, sync::Arc};
use egui_winit_vulkano::egui::mutex::Mutex; use egui_winit_vulkano::egui::mutex::RwLock;
use winit::{ use winit::{
event::{AxisId, ElementState, MouseButton}, event::{AxisId, ElementState, MouseButton},
keyboard::PhysicalKey, keyboard::PhysicalKey,
@ -14,14 +14,14 @@ use super::{
#[derive(Default)] #[derive(Default)]
pub struct VirtualInput { pub struct VirtualInput {
// Global states // Global states
states: HashMap<String, Arc<Mutex<VirtualInputState>>>, states: HashMap<String, Arc<RwLock<VirtualInputState>>>,
// Per kind of input states to keep complexity low during state updates // Per kind of input states to keep complexity low during state updates
states_by_key: HashMap<PhysicalKey, Vec<Arc<Mutex<VirtualInputState>>>>, states_by_key: HashMap<PhysicalKey, Vec<Arc<RwLock<VirtualInputState>>>>,
mouse_move_states: Vec<Arc<Mutex<VirtualInputState>>>, mouse_move_states: Vec<Arc<RwLock<VirtualInputState>>>,
mouse_wheel_states: Vec<Arc<Mutex<VirtualInputState>>>, mouse_wheel_states: Vec<Arc<RwLock<VirtualInputState>>>,
mouse_button_states: HashMap<MouseButton, Vec<Arc<Mutex<VirtualInputState>>>>, mouse_button_states: HashMap<MouseButton, Vec<Arc<RwLock<VirtualInputState>>>>,
axis_states: HashMap<AxisId, Vec<Arc<Mutex<VirtualInputState>>>>, axis_states: HashMap<AxisId, Vec<Arc<RwLock<VirtualInputState>>>>,
} }
impl std::fmt::Debug for VirtualInput { impl std::fmt::Debug for VirtualInput {
@ -29,7 +29,7 @@ impl std::fmt::Debug for VirtualInput {
let mut debug = f.debug_struct("VirtualInput"); let mut debug = f.debug_struct("VirtualInput");
for (name, state) in &self.states { for (name, state) in &self.states {
debug.field(name, &state.lock().value); debug.field(name, &state.read().value);
} }
debug.finish() debug.finish()
@ -40,18 +40,18 @@ impl VirtualInput {
pub fn get_state(&self, value_name: &str) -> f32 { pub fn get_state(&self, value_name: &str) -> f32 {
self.states self.states
.get(value_name) .get(value_name)
.map(|state| state.lock().value) .map(|state| state.read().value)
.unwrap_or(0.0) .unwrap_or(0.0)
} }
pub fn add_bindings(&mut self, value_name: String, new_bindings: Vec<VirtualBinding>) { pub fn add_bindings(&mut self, value_name: String, new_bindings: Vec<VirtualBinding>) {
let state = let state = self
self.states .states
.entry(value_name) .entry(value_name)
.or_insert(Arc::new(Mutex::new(VirtualInputState { .or_insert(Arc::new(RwLock::new(VirtualInputState {
value: 0.0, value: 0.0,
bindings: Vec::new(), bindings: Vec::new(),
}))); })));
for binding in &new_bindings { for binding in &new_bindings {
match binding { match binding {
@ -83,7 +83,7 @@ impl VirtualInput {
} }
state state
.lock() .write()
.bindings .bindings
.extend(new_bindings.iter().map(|b| VirtualBindingState { .extend(new_bindings.iter().map(|b| VirtualBindingState {
value: 0.0, value: 0.0,
@ -96,7 +96,7 @@ impl VirtualInput {
if let Some(states) = states { if let Some(states) = states {
for state in states { for state in states {
let mut state = state.lock(); let mut state = state.write();
state.update_from_key(key, key_state); state.update_from_key(key, key_state);
} }
} }
@ -104,14 +104,14 @@ impl VirtualInput {
pub(super) fn update_mouse_move_binding(&mut self, delta: &glam::Vec2) { pub(super) fn update_mouse_move_binding(&mut self, delta: &glam::Vec2) {
for state in &mut self.mouse_move_states { for state in &mut self.mouse_move_states {
let mut state = state.lock(); let mut state = state.write();
state.update_from_mouse(delta); state.update_from_mouse(delta);
} }
} }
pub(super) fn update_mouse_wheel_binding(&mut self, delta: &glam::Vec2) { pub(super) fn update_mouse_wheel_binding(&mut self, delta: &glam::Vec2) {
for state in &mut self.mouse_wheel_states { for state in &mut self.mouse_wheel_states {
let mut state = state.lock(); let mut state = state.write();
state.update_from_mouse_wheel(delta); state.update_from_mouse_wheel(delta);
} }
} }
@ -125,7 +125,7 @@ impl VirtualInput {
if let Some(states) = states { if let Some(states) = states {
for state in states { for state in states {
let mut state = state.lock(); let mut state = state.write();
state.update_from_mouse_button(button, button_state); state.update_from_mouse_button(button, button_state);
} }
} }
@ -136,7 +136,7 @@ impl VirtualInput {
if let Some(states) = states { if let Some(states) = states {
for state in states { for state in states {
let mut state = state.lock(); let mut state = state.write();
state.update_from_axis(axis, axis_state); state.update_from_axis(axis, axis_state);
} }
} }