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

Merge pull request #1440 from ada-tv/fix/openxr-wmr-primary-button
Some checks are pending
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Waiting to run
Details
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Waiting to run
Details

Browse source 
Primary button for XR controllers without one
This commit is contained in:
ksuprynowicz 2025-04-13 22:22:47 +02:00 committed by GitHub
commit 59a6f5aae1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -688,6 +688,23 @@ void OpenXrInputPlugin::InputDevice::update(float deltaTime, const controller::I
}
}
// emulate primary button for controllers with only one physical button,
// but not on vive controllers because we have special behavior there already
if (!_context->_stickEmulation) {
const auto& left_click = _actions.at("left_thumbstick_click")->getBool();
const auto& right_click = _actions.at("right_thumbstick_click")->getBool();
const auto& left_primary = _actions.at("left_primary_click")->getBool();
const auto& right_primary = _actions.at("right_primary_click")->getBool();
if (!left_primary.isActive && left_click.currentState) {
_buttonPressedMap.insert(controller::LEFT_PRIMARY_THUMB);
}
if (!right_primary.isActive && right_click.currentState) {
_buttonPressedMap.insert(controller::RIGHT_PRIMARY_THUMB);
}
}
awfulRightStickHackForBrokenScripts();
if (_context->_stickEmulation) {
@ -715,20 +732,20 @@ void OpenXrInputPlugin::InputDevice::emulateStickFromTrackpad() {
// "primary" button on trackpad center
if (
left_click &&
left_stick.x > -0.3f &&
left_stick.x < 0.3f &&
left_stick.y > -0.3f &&
left_stick.y < 0.3f
left_stick.x > -0.4f &&
left_stick.x < 0.4f &&
left_stick.y > -0.4f &&
left_stick.y < 0.4f
) {
_buttonPressedMap.insert(controller::LEFT_PRIMARY_THUMB);
}
if (
right_click &&
right_stick.x > -0.3f &&
right_stick.x < 0.3f &&
right_stick.y > -0.3f &&
right_stick.y < 0.3f
right_stick.x > -0.4f &&
right_stick.x < 0.4f &&
right_stick.y > -0.4f &&
right_stick.y < 0.4f
) {
_buttonPressedMap.insert(controller::RIGHT_PRIMARY_THUMB);
}