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

feat(objects): rename inputs

Browse Source
This commit is contained in:
Nova
2024-07-18 08:07:35 -04:00
parent a3bcff035a
commit 1b28290cbb
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/objects/mod.rs
View File

@@ -28,13 +28,18 @@ pub mod play_space;
enum Inputs { enum Inputs {
XR { XR {
controllers: (SkController, SkController), controller_left: SkController,
hands: (SkHand, SkHand), controller_right: SkController,
hand_left: SkHand,
hand_right: SkHand,
eye_pointer: Option<EyePointer>, eye_pointer: Option<EyePointer>,
}, },
MousePointer(MousePointer), MousePointer(MousePointer),
// Controllers((SkController, SkController)), // Controllers((SkController, SkController)),
Hands((SkHand, SkHand)), Hands {
left: SkHand,
right: SkHand,
},
} }
pub struct ServerObjects { pub struct ServerObjects {
@@ -64,14 +69,10 @@ impl ServerObjects {
let inputs = if sk.get_active_display_mode() == DisplayMode::MixedReality { let inputs = if sk.get_active_display_mode() == DisplayMode::MixedReality {
Inputs::XR { Inputs::XR {
controllers: ( controller_left: SkController::new(Handed::Left).unwrap(),
SkController::new(Handed::Left).unwrap(), controller_right: SkController::new(Handed::Right).unwrap(),
SkController::new(Handed::Right).unwrap(), hand_left: SkHand::new(Handed::Left).unwrap(),
), hand_right: SkHand::new(Handed::Right).unwrap(),
hands: (
SkHand::new(Handed::Left).unwrap(),
SkHand::new(Handed::Right).unwrap(),
),
eye_pointer: Device::has_eye_gaze() eye_pointer: Device::has_eye_gaze()
.then(EyePointer::new) .then(EyePointer::new)
.transpose() .transpose()
@@ -120,23 +121,25 @@ impl ServerObjects {
// )); // ));
// } // }
if Input::key(Key::F8).is_just_inactive() { if Input::key(Key::F8).is_just_inactive() {
self.inputs = Inputs::Hands(( self.inputs = Inputs::Hands {
SkHand::new(Handed::Left).unwrap(), left: SkHand::new(Handed::Left).unwrap(),
SkHand::new(Handed::Right).unwrap(), right: SkHand::new(Handed::Right).unwrap(),
)); };
} }
} }
match &mut self.inputs { match &mut self.inputs {
Inputs::XR { Inputs::XR {
controllers: (left_controller, right_controller), controller_left,
hands: (left_hand, right_hand), controller_right,
hand_left,
hand_right,
eye_pointer, eye_pointer,
} => { } => {
left_hand.update(sk, token); controller_left.update(token);
right_hand.update(sk, token); controller_right.update(token);
left_controller.update(token); hand_left.update(sk, token);
right_controller.update(token); hand_right.update(sk, token);
if let Some(eye_pointer) = eye_pointer { if let Some(eye_pointer) = eye_pointer {
eye_pointer.update(); eye_pointer.update();
} }
@@ -146,7 +149,7 @@ impl ServerObjects {
// left.update(token); // left.update(token);
// right.update(token); // right.update(token);
// } // }
Inputs::Hands((left, right)) => { Inputs::Hands { left, right } => {
left.update(sk, token); left.update(sk, token);
right.update(sk, token); right.update(sk, token);
} }