Skip to content

Commit

Permalink
fix(server_openvr): 🐛 Fix hand tracking when using Disabled interacti…
Browse files Browse the repository at this point in the history 
…on (#2406)

* fix(server_openvr): 🐛 Fix hand tracking when using Disabled interaction

* Remove comment
  • Loading branch information
@zmerp
zmerp authored Sep 18, 2024
1 parent f279887 commit 09b78e0
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 54 deletions.
14 changes: 6 additions & 8 deletions alvr/server_openvr/cpp/alvr_server/Controller.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,14 +228,12 @@ bool Controller::onPoseUpdate(float predictionS, FfiHandData handData) {
auto controllerMotion = handData.controllerMotion;
auto handSkeleton = handData.handSkeleton;

// Note: following the multimodal protocol, to make sure we want to use hand trackers we need to
// check controllerMotion == nullptr. handSkeleton != nullptr is not enough.
bool enabledAsHandTracker = handData.useHandTracker
&& (device_id == HAND_TRACKER_LEFT_ID || device_id == HAND_TRACKER_RIGHT_ID)
&& controllerMotion == nullptr;
bool enabledAsController = !handData.useHandTracker
&& (device_id == HAND_LEFT_ID || device_id == HAND_RIGHT_ID) && controllerMotion != nullptr;
bool enabled = handData.tracked && (enabledAsHandTracker || enabledAsController);
bool enabledAsHandTracker = handData.isHandTracker
&& (device_id == HAND_TRACKER_LEFT_ID || device_id == HAND_TRACKER_RIGHT_ID);
bool enabledAsController
= !handData.isHandTracker && (device_id == HAND_LEFT_ID || device_id == HAND_RIGHT_ID);
bool enabled = (controllerMotion != nullptr || handSkeleton != nullptr)
&& (enabledAsHandTracker || enabledAsController);

Debug(
"%s %s: enabled: %d, ctrl: %d, hand: %d",
Expand Down
3 changes: 1 addition & 2 deletions alvr/server_openvr/cpp/alvr_server/bindings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@ struct FfiDeviceMotion {
};

struct FfiHandData {
unsigned int tracked;
const FfiDeviceMotion* controllerMotion;
const FfiHandSkeleton* handSkeleton;
bool useHandTracker;
bool isHandTracker;
};

struct FfiBodyTracker {
Expand Down
88 changes: 44 additions & 44 deletions alvr/server_openvr/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,28 @@ extern "C" fn driver_ready_idle(set_default_chap: bool) {
let controllers_config = headset_config.controllers.clone().into_option();
let track_body = headset_config.body_tracking.enabled();

let track_controllers = controllers_config
let tracked = controllers_config
.as_ref()
.map(|c| c.tracked)
.unwrap_or(false);

let left_openvr_hand_skeleton = tracking.hand_skeletons[0].map(|s| {
tracking::to_openvr_hand_skeleton(headset_config, *HAND_LEFT_ID, s)
});
let right_openvr_hand_skeleton = tracking.hand_skeletons[1].map(|s| {
tracking::to_openvr_hand_skeleton(headset_config, *HAND_RIGHT_ID, s)
});
let ffi_head_motion = tracking
.device_motions
.iter()
.find_map(|(id, motion)| {
(*id == *HEAD_ID).then(|| tracking::to_ffi_motion(*HEAD_ID, *motion))
})
.unwrap_or_else(FfiDeviceMotion::default);
let ffi_left_controller_motion =
tracking.device_motions.iter().find_map(|(id, motion)| {
(*id == *HAND_LEFT_ID && tracked)
.then(|| tracking::to_ffi_motion(*HAND_LEFT_ID, *motion))
});
let ffi_right_controller_motion =
tracking.device_motions.iter().find_map(|(id, motion)| {
(*id == *HAND_RIGHT_ID && tracked)
.then(|| tracking::to_ffi_motion(*HAND_RIGHT_ID, *motion))
});

let (
use_separate_hand_trackers,
Expand All @@ -141,46 +152,32 @@ extern "C" fn driver_ready_idle(set_default_chap: bool) {
{
(
hand_skeleton_config.steamvr_input_2_0,
left_openvr_hand_skeleton.map(tracking::to_ffi_skeleton),
right_openvr_hand_skeleton.map(tracking::to_ffi_skeleton),
tracked
.then_some(tracking.hand_skeletons[0])
.flatten()
.map(|s| {
tracking::to_ffi_skeleton(tracking::to_openvr_hand_skeleton(
headset_config,
*HAND_LEFT_ID,
s,
))
}),
tracked
.then_some(tracking.hand_skeletons[1])
.flatten()
.map(|s| {
tracking::to_ffi_skeleton(tracking::to_openvr_hand_skeleton(
headset_config,
*HAND_RIGHT_ID,
s,
))
}),
)
} else {
(false, None, None)
};

let use_left_hand_tracker = use_separate_hand_trackers
&& tracking.hand_skeletons[0].is_some()
&& tracking
.device_motions
.iter()
.all(|(id, _)| *id != *HAND_LEFT_ID);
let use_right_hand_tracker = use_separate_hand_trackers
&& tracking.hand_skeletons[1].is_some()
&& tracking
.device_motions
.iter()
.all(|(id, _)| *id != *HAND_RIGHT_ID);

let ffi_head_motion = tracking
.device_motions
.iter()
.find_map(|(id, motion)| {
(*id == *HEAD_ID).then(|| tracking::to_ffi_motion(*HEAD_ID, *motion))
})
.unwrap_or_else(FfiDeviceMotion::default);
let ffi_left_controller_motion =
tracking.device_motions.iter().find_map(|(id, motion)| {
(*id == *HAND_LEFT_ID)
.then(|| tracking::to_ffi_motion(*HAND_LEFT_ID, *motion))
});
let ffi_right_controller_motion =
tracking.device_motions.iter().find_map(|(id, motion)| {
(*id == *HAND_RIGHT_ID)
.then(|| tracking::to_ffi_motion(*HAND_RIGHT_ID, *motion))
});

let left_hand_data = FfiHandData {
tracked: track_controllers.into(),
controllerMotion: if let Some(motion) = &ffi_left_controller_motion {
motion
} else {
Expand All @@ -191,10 +188,11 @@ extern "C" fn driver_ready_idle(set_default_chap: bool) {
} else {
ptr::null()
},
useHandTracker: use_left_hand_tracker,
isHandTracker: use_separate_hand_trackers
&& ffi_left_controller_motion.is_none()
&& ffi_left_hand_skeleton.is_some(),
};
let right_hand_data = FfiHandData {
tracked: track_controllers.into(),
controllerMotion: if let Some(motion) = &ffi_right_controller_motion {
motion
} else {
Expand All @@ -205,7 +203,9 @@ extern "C" fn driver_ready_idle(set_default_chap: bool) {
} else {
ptr::null()
},
useHandTracker: use_right_hand_tracker,
isHandTracker: use_separate_hand_trackers
&& ffi_right_controller_motion.is_none()
&& ffi_right_hand_skeleton.is_some(),
};

let ffi_body_trackers =
Expand Down

0 comments on commit 09b78e0

Please sign in to comment.