Skip to content
This repository was archived by the owner on Feb 16, 2025. It is now read-only.

Surface supported interaction profiles from OpenXR runtime #229

Merged
merged 7 commits into from
Jul 26, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix errors in touch pro/touch plus profiles
Signed-off-by: Daniel Adams <[email protected]>
msub2 committed Jul 26, 2024
commit 335fdcc11f5b00119742d74334650f719d1520df
16 changes: 8 additions & 8 deletions webxr/openxr/interaction_profiles.rs
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ pub enum InteractionProfileType {
MicrosoftMixedRealityMotionController,
OculusGoController,
OculusTouchController,
MetaTouchProController,
FacebookTouchControllerPro,
MetaTouchPlusController,
MetaTouchControllerRiftCv1,
MetaTouchControllerQuest1RiftS,
@@ -229,9 +229,9 @@ pub static OCULUS_TOUCH_CONTROLLER_PROFILE: InteractionProfile = InteractionProf
],
};

pub static META_TOUCH_PRO_CONTROLLER_PROFILE: InteractionProfile = InteractionProfile {
profile_type: InteractionProfileType::MetaTouchProController,
path: "/interaction_profiles/meta/touch_pro_controller",
pub static FACEBOOK_TOUCH_CONTROLLER_PRO_PROFILE: InteractionProfile = InteractionProfile {
profile_type: InteractionProfileType::FacebookTouchControllerPro,
path: "/interaction_profiles/facebook/touch_controller_pro",
required_extension: Some(FB_TOUCH_CONTROLLER_PRO_EXTENSION_NAME),
standard_buttons: &["trigger/value", "squeeze/value", "", "thumbstick/click"],
standard_axes: &["", "", "thumbstick/x", "thumbstick/y"],
@@ -245,9 +245,9 @@ pub static META_TOUCH_PRO_CONTROLLER_PROFILE: InteractionProfile = InteractionPr
],
};

pub static META_TOUCH_PLUS_CONTROLLER_PROFILE: InteractionProfile = InteractionProfile {
pub static META_TOUCH_CONTROLLER_PLUS_PROFILE: InteractionProfile = InteractionProfile {
profile_type: InteractionProfileType::MetaTouchPlusController,
path: "/interaction_profiles/meta/touch_plus_controller",
path: "/interaction_profiles/meta/touch_controller_plus",
required_extension: Some(META_TOUCH_CONTROLLER_PLUS_EXTENSION_NAME),
standard_buttons: &["trigger/value", "squeeze/value", "", "thumbstick/click"],
standard_axes: &["", "", "thumbstick/x", "thumbstick/y"],
@@ -348,8 +348,8 @@ pub static INTERACTION_PROFILES: [InteractionProfile; 20] = [
MICROSOFT_MIXED_REALITY_MOTION_CONTROLLER_PROFILE,
OCULUS_GO_CONTROLLER_PROFILE,
OCULUS_TOUCH_CONTROLLER_PROFILE,
META_TOUCH_PRO_CONTROLLER_PROFILE,
META_TOUCH_PLUS_CONTROLLER_PROFILE,
FACEBOOK_TOUCH_CONTROLLER_PRO_PROFILE,
META_TOUCH_CONTROLLER_PLUS_PROFILE,
META_TOUCH_CONTROLLER_RIFT_CV1_PROFILE,
META_TOUCH_CONTROLLER_QUEST_1_RIFT_S_PROFILE,
META_TOUCH_CONTROLLER_QUEST_2_PROFILE,