Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 02:17:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1423 from ada-tv/fix/openxr-trigger-click
Some checks failed
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Has been cancelled
Details
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Has been cancelled
Details

Browse source 
Trigger click emulation for XR
This commit is contained in:
ksuprynowicz 2025-04-10 22:12:13 +02:00 committed by GitHub
commit 4e6575a917
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -398,7 +398,7 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
// not really usable, bare minimum // not really usable, bare minimum
{"/interaction_profiles/khr/simple_controller", { {"/interaction_profiles/khr/simple_controller", {
{"left_secondary_click", hand_left + "/menu/click"}, {"left_secondary_click", hand_left + "/menu/click"},
{"left_trigger_click", hand_left + "/select/click"}, {"left_trigger_value", hand_left + "/select/click"},
{"left_pose", hand_left + "/grip/pose"}, {"left_pose", hand_left + "/grip/pose"},
{"left_haptic", "/user/hand/left/output/haptic"}, {"left_haptic", "/user/hand/left/output/haptic"},
@ -433,7 +433,6 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
{"left_secondary_click", hand_left + "/y/click"}, {"left_secondary_click", hand_left + "/y/click"},
{"left_squeeze_value", hand_left + "/squeeze/value"}, {"left_squeeze_value", hand_left + "/squeeze/value"},
{"left_trigger_value", hand_left + "/trigger/value"}, {"left_trigger_value", hand_left + "/trigger/value"},
{"left_trigger_click", hand_left + "/trigger/click"},
{"left_thumbstick", hand_left + "/thumbstick"}, {"left_thumbstick", hand_left + "/thumbstick"},
{"left_thumbstick_click", hand_left + "/thumbstick/click"}, {"left_thumbstick_click", hand_left + "/thumbstick/click"},
{"left_thumbstick_touch", hand_left + "/thumbstick/touch"}, {"left_thumbstick_touch", hand_left + "/thumbstick/touch"},
@ -444,7 +443,6 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
{"right_secondary_click", hand_right + "/b/click"}, {"right_secondary_click", hand_right + "/b/click"},
{"right_squeeze_value", hand_right + "/squeeze/value"}, {"right_squeeze_value", hand_right + "/squeeze/value"},
{"right_trigger_value", hand_right + "/trigger/value"}, {"right_trigger_value", hand_right + "/trigger/value"},
{"right_trigger_click", hand_right + "/trigger/click"},
{"right_thumbstick", hand_right + "/thumbstick"}, {"right_thumbstick", hand_right + "/thumbstick"},
{"right_thumbstick_click", hand_right + "/thumbstick/click"}, {"right_thumbstick_click", hand_right + "/thumbstick/click"},
{"right_thumbstick_touch", hand_right + "/thumbstick/touch"}, {"right_thumbstick_touch", hand_right + "/thumbstick/touch"},
@ -455,7 +453,6 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
{"left_secondary_click", hand_left + "/menu/click"}, {"left_secondary_click", hand_left + "/menu/click"},
{"left_squeeze_value", hand_left + "/squeeze/click"}, {"left_squeeze_value", hand_left + "/squeeze/click"},
{"left_trigger_value", hand_left + "/trigger/value"}, {"left_trigger_value", hand_left + "/trigger/value"},
{"left_trigger_click", hand_left + "/trigger/click"},
{"left_thumbstick", hand_left + "/thumbstick"}, {"left_thumbstick", hand_left + "/thumbstick"},
{"left_thumbstick_click", hand_left + "/trackpad/click"}, {"left_thumbstick_click", hand_left + "/trackpad/click"},
{"left_thumbstick_touch", hand_left + "/trackpad/touch"}, {"left_thumbstick_touch", hand_left + "/trackpad/touch"},
@ -465,7 +462,6 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
{"right_secondary_click", hand_right + "/menu/click"}, {"right_secondary_click", hand_right + "/menu/click"},
{"right_squeeze_value", hand_right + "/squeeze/click"}, {"right_squeeze_value", hand_right + "/squeeze/click"},
{"right_trigger_value", hand_right + "/trigger/value"}, {"right_trigger_value", hand_right + "/trigger/value"},
{"right_trigger_click", hand_right + "/trigger/click"},
{"right_thumbstick", hand_right + "/thumbstick"}, {"right_thumbstick", hand_right + "/thumbstick"},
{"right_thumbstick_click", hand_right + "/trackpad/click"}, {"right_thumbstick_click", hand_right + "/trackpad/click"},
{"right_thumbstick_touch", hand_right + "/trackpad/touch"}, {"right_thumbstick_touch", hand_right + "/trackpad/touch"},
@ -622,6 +618,23 @@ void OpenXrInputPlugin::InputDevice::update(float deltaTime, const controller::I
} }
} }
// emulate stick clicks for controllers that don't have them
{
const auto& left_trigger = _actions.at("left_trigger_value")->getFloat();
const auto& left_click = _actions.at("left_trigger_click")->getBool();
const auto& right_trigger = _actions.at("right_trigger_value")->getFloat();
const auto& right_click = _actions.at("right_trigger_click")->getBool();
if (!left_click.isActive && (left_trigger.isActive && left_trigger.currentState > 0.9f)) {
_buttonPressedMap.insert(controller::LT_CLICK);
}
if (!right_click.isActive && (right_trigger.isActive && right_trigger.currentState > 0.9f)) {
_buttonPressedMap.insert(controller::RT_CLICK);
}
}
std::vector<std::tuple<std::string, controller::StandardAxisChannel, controller::StandardAxisChannel>> axesToUpdate = { std::vector<std::tuple<std::string, controller::StandardAxisChannel, controller::StandardAxisChannel>> axesToUpdate = {
{"left_thumbstick", controller::LX, controller::LY}, {"left_thumbstick", controller::LX, controller::LY},
{"right_thumbstick", controller::RX, controller::RY}, {"right_thumbstick", controller::RX, controller::RY},