refactor(main): make arrays tuples
This commit is contained in:
18
src/main.rs
18
src/main.rs
@@ -105,12 +105,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 && !cli_args.disable_controller).then(|| {
|
let mut controllers = (!cli_args.flatscreen && !cli_args.disable_controller).then(|| {
|
||||||
[
|
(
|
||||||
SkController::new(Handed::Left),
|
SkController::new(Handed::Left),
|
||||||
SkController::new(Handed::Right),
|
SkController::new(Handed::Right),
|
||||||
]
|
)
|
||||||
});
|
});
|
||||||
|
|
||||||
if hands.is_none() {
|
if hands.is_none() {
|
||||||
@@ -147,13 +147,13 @@ fn main() -> Result<()> {
|
|||||||
if let Some(mouse_pointer) = &mouse_pointer {
|
if let Some(mouse_pointer) = &mouse_pointer {
|
||||||
mouse_pointer.update(sk);
|
mouse_pointer.update(sk);
|
||||||
}
|
}
|
||||||
if let Some(hands) = &mut hands {
|
if let Some((left_hand, right_hand)) = &mut hands {
|
||||||
hands[0].update(sk);
|
left_hand.update(sk);
|
||||||
hands[1].update(sk);
|
right_hand.update(sk);
|
||||||
}
|
}
|
||||||
if let Some(controllers) = &mut controllers {
|
if let Some((left_controller, right_controller)) = &mut controllers {
|
||||||
controllers[0].update(sk);
|
left_controller.update(sk);
|
||||||
controllers[1].update(sk);
|
right_controller.update(sk);
|
||||||
}
|
}
|
||||||
input::process_input();
|
input::process_input();
|
||||||
nodes::root::Root::logic_step(sk.time_elapsed());
|
nodes::root::Root::logic_step(sk.time_elapsed());
|
||||||
|
|||||||
Reference in New Issue
Block a user