Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

OpenXrInputPlugin: Oculus touch and WMR controller profiles

Browse source
This commit is contained in:
Ada 2024-12-12 12:14:11 +10:00
parent ac75151449
commit afaa8da5d1
1 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
plugins/openxr/src/OpenXrInputPlugin.cpp
View file

@ -395,7 +395,10 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
}; };
// palm pose is nice but monado doesn't support it yet // palm pose is nice but monado doesn't support it yet
auto hand_pose_name = (_context->_palmPoseSupported) ? "/palm_ext/pose" : "/grip/pose"; // (disable it for now because i can't test what palm
// pose looks like and if it'll break something)
//auto hand_pose_name = (_context->_palmPoseSupported) ? "/palm_ext/pose" : "/grip/pose";
auto hand_pose_name = "/grip/pose";
// TODO: set up the openxr dpad bindings modifier (looks complicated) // TODO: set up the openxr dpad bindings modifier (looks complicated)
std::map<std::string, std::map<std::string, std::string>> actionSuggestions = { std::map<std::string, std::map<std::string, std::string>> actionSuggestions = {
@ -430,6 +433,40 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
{"hand_haptic_left", "/user/hand/left/output/haptic"}, {"hand_haptic_left", "/user/hand/left/output/haptic"},
{"hand_haptic_right", "/user/hand/right/output/haptic"}, {"hand_haptic_right", "/user/hand/right/output/haptic"},
}}, }},
{"/interaction_profiles/oculus/touch_controller", {
{"tablet", "/user/hand/left/input/y/click"},
{"interact_left", "/user/hand/left/input/trigger/value"},
{"interact_right", "/user/hand/right/input/trigger/value"},
{"grip_left", "/user/hand/left/input/squeeze/value"},
{"grip_right", "/user/hand/right/input/squeeze/value"},
{"jump", "/user/hand/right/input/b/click"},
{"walk", "/user/hand/left/input/thumbstick"},
{"stick_left", "/user/hand/left/input/thumbstick"},
{"stick_right", "/user/hand/right/input/thumbstick"},
{"stick_click_left", "/user/hand/left/input/thumbstick/click"},
{"stick_click_right", "/user/hand/right/input/thumbstick/click"},
{"hand_pose_left", std::string("/user/hand/left/input") + hand_pose_name},
{"hand_pose_right", std::string("/user/hand/right/input") + hand_pose_name},
{"hand_haptic_left", "/user/hand/left/output/haptic"},
{"hand_haptic_right", "/user/hand/right/output/haptic"},
}},
{"/interaction_profiles/microsoft/motion_controller", {
{"tablet", "/user/hand/left/input/menu/click"},
{"interact_left", "/user/hand/left/input/trigger/value"},
{"interact_right", "/user/hand/right/input/trigger/value"},
{"grip_left", "/user/hand/left/input/squeeze/click"},
{"grip_right", "/user/hand/right/input/squeeze/click"},
{"jump", "/user/hand/right/input/menu/click"},
{"walk", "/user/hand/left/input/thumbstick"},
{"stick_left", "/user/hand/left/input/thumbstick"},
{"stick_right", "/user/hand/right/input/thumbstick"},
{"stick_click_left", "/user/hand/left/input/thumbstick/click"},
{"stick_click_right", "/user/hand/right/input/thumbstick/click"},
{"hand_pose_left", std::string("/user/hand/left/input") + hand_pose_name},
{"hand_pose_right", std::string("/user/hand/right/input") + hand_pose_name},
{"hand_haptic_left", "/user/hand/left/output/haptic"},
{"hand_haptic_right", "/user/hand/right/output/haptic"},
}},
}; };
for (const auto& [id, args] : actionTypes) { for (const auto& [id, args] : actionTypes) {
@ -646,7 +683,7 @@ void OpenXrInputPlugin::InputDevice::emulateStickDPad() {
_axisStateMap[controller::RX].value = -1.0f; _axisStateMap[controller::RX].value = -1.0f;
_axisStateMap[controller::RY].value = 0.0f; _axisStateMap[controller::RY].value = 0.0f;
} }
// snap turn right // snap turn right
if ( if (
right_stick.currentState.x > 0.6f right_stick.currentState.x > 0.6f