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

feat(sk_controller): spawn in main.rs

Browse Source
This commit is contained in:
Nova
2022-10-01 22:56:24 -04:00
parent 55a50140a5
commit 5c1203d990
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@@ -6,6 +6,7 @@ mod wayland;
use crate::core::destroy_queue; use crate::core::destroy_queue;
use crate::nodes::{drawable, hmd, input}; use crate::nodes::{drawable, hmd, input};
use crate::objects::input::mouse_pointer::MousePointer; use crate::objects::input::mouse_pointer::MousePointer;
use crate::objects::input::sk_controller::SkController;
use crate::objects::input::sk_hand::SkHand; use crate::objects::input::sk_hand::SkHand;
use crate::wayland::Wayland; use crate::wayland::Wayland;
@@ -77,6 +78,12 @@ fn main() -> Result<()> {
let mouse_pointer = cli_args.flatscreen.then(MousePointer::new); let mouse_pointer = cli_args.flatscreen.then(MousePointer::new);
let mut hands = let mut hands =
(!cli_args.flatscreen).then(|| [SkHand::new(Handed::Left), SkHand::new(Handed::Right)]); (!cli_args.flatscreen).then(|| [SkHand::new(Handed::Left), SkHand::new(Handed::Right)]);
let mut controllers = (!cli_args.flatscreen).then(|| {
[
SkController::new(Handed::Left),
SkController::new(Handed::Right),
]
});
if hands.is_none() { if hands.is_none() {
unsafe { unsafe {
@@ -110,6 +117,10 @@ fn main() -> Result<()> {
hands[0].update(sk); hands[0].update(sk);
hands[1].update(sk); hands[1].update(sk);
} }
if let Some(controllers) = &mut controllers {
controllers[0].update(sk);
controllers[1].update(sk);
}
input::process_input(); input::process_input();
wayland.make_context_current(); wayland.make_context_current();