StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

refactor(input): rename internal capture requests

Browse Source
This commit is contained in:
Nova
2024-08-06 12:08:19 -04:00
parent 98a6ad6f32
commit 827c630a70
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nodes/input/method.rs
View File

@@ -25,7 +25,7 @@ pub struct InputMethod {
handler_aliases: AliasList, handler_aliases: AliasList,
handler_field_aliases: AliasList, handler_field_aliases: AliasList,
pub(super) handler_order: Mutex<Vec<Weak<InputHandler>>>, pub(super) handler_order: Mutex<Vec<Weak<InputHandler>>>,
pub capture_requests: Registry<InputHandler>, pub internal_capture_requests: Registry<InputHandler>,
pub captures: Registry<InputHandler>, pub captures: Registry<InputHandler>,
} }
impl InputMethod { impl InputMethod {
@@ -42,7 +42,7 @@ impl InputMethod {
handler_aliases: AliasList::default(), handler_aliases: AliasList::default(),
handler_field_aliases: AliasList::default(), handler_field_aliases: AliasList::default(),
handler_order: Mutex::new(Vec::new()), handler_order: Mutex::new(Vec::new()),
capture_requests: Registry::new(), internal_capture_requests: Registry::new(),
captures: Registry::new(), captures: Registry::new(),
}; };
<InputMethod as InputMethodRefAspect>::add_node_members(node); <InputMethod as InputMethodRefAspect>::add_node_members(node);
@@ -167,7 +167,9 @@ impl InputMethodRefAspect for InputMethod {
let input_method = node.get_aspect::<InputMethod>()?; let input_method = node.get_aspect::<InputMethod>()?;
let input_handler = handler.get_aspect::<InputHandler>()?; let input_handler = handler.get_aspect::<InputHandler>()?;
input_method.capture_requests.add_raw(&input_handler); input_method
.internal_capture_requests
.add_raw(&input_handler);
Ok(()) Ok(())
} }
} }

2
src/nodes/input/mod.rs
View File

@@ -145,6 +145,6 @@ pub fn process_input() {
let _ = input_handler_client::input(&handler_node, &methods, &datas); let _ = input_handler_client::input(&handler_node, &methods, &datas);
} }
for method in methods { for method in methods {
method.capture_requests.clear(); method.internal_capture_requests.clear();
} }
} }

4
src/objects/input/mouse_pointer.rs
View File

@@ -150,7 +150,7 @@ impl MousePointer {
if let Some(capture) = &self.capture { if let Some(capture) = &self.capture {
if !self if !self
.pointer .pointer
.capture_requests .internal_capture_requests
.get_valid_contents() .get_valid_contents()
.contains(capture) .contains(capture)
{ {
@@ -161,7 +161,7 @@ impl MousePointer {
if self.capture.is_none() { if self.capture.is_none() {
if let Some(new_capture) = self if let Some(new_capture) = self
.pointer .pointer
.capture_requests .internal_capture_requests
.get_valid_contents() .get_valid_contents()
.into_iter() .into_iter()
.map(|h| { .map(|h| {

4
src/objects/input/sk_controller.rs
View File

@@ -104,7 +104,7 @@ impl SkController {
if let Some(capture) = &self.capture { if let Some(capture) = &self.capture {
if !self if !self
.input .input
.capture_requests .internal_capture_requests
.get_valid_contents() .get_valid_contents()
.contains(capture) .contains(capture)
{ {
@@ -115,7 +115,7 @@ impl SkController {
if self.capture.is_none() { if self.capture.is_none() {
self.capture = self self.capture = self
.input .input
.capture_requests .internal_capture_requests
.get_valid_contents() .get_valid_contents()
.into_iter() .into_iter()
.map(|handler| { .map(|handler| {

4
src/objects/input/sk_hand.rs
View File

@@ -139,7 +139,7 @@ impl SkHand {
if let Some(capture) = &self.capture { if let Some(capture) = &self.capture {
if !self if !self
.input .input
.capture_requests .internal_capture_requests
.get_valid_contents() .get_valid_contents()
.contains(capture) .contains(capture)
{ {
@@ -150,7 +150,7 @@ impl SkHand {
if self.capture.is_none() { if self.capture.is_none() {
self.capture = self self.capture = self
.input .input
.capture_requests .internal_capture_requests
.get_valid_contents() .get_valid_contents()
.into_iter() .into_iter()
.map(|handler| (handler.clone(), self.compare_distance(&handler.field).abs())) .map(|handler| (handler.clone(), self.compare_distance(&handler.field).abs()))