Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 09:42:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

OpenXrInputPlugin: Use left primary / secondary instead of face button names.

Browse source
This commit is contained in:
Lubosz Sarnecki 2024-03-17 10:46:01 +01:00
parent cc20c37e05
commit 3be716cb05
2 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/resources/controllers/openxr_index.json
View file

@ -5,15 +5,10 @@
{ "from": "Index.RightHand", "to": "Standard.RightHand" },
{ "from": "Index.Head", "to" : "Standard.Head", "when" : [ "Application.InHMD"] },
{ "from": "Index.A", "to": "Standard.RightPrimaryThumb", "peek": true },
{ "from": "Index.B", "to": "Standard.RightSecondaryThumb", "peek": true },
{ "from": "Index.X", "to": "Standard.LeftPrimaryThumb", "peek": true },
{ "from": "Index.Y", "to": "Standard.LeftSecondaryThumb", "peek": true},
{ "from": "Index.A", "to": "Standard.A" },
{ "from": "Index.B", "to": "Standard.B" },
{ "from": "Index.X", "to": "Standard.X" },
{ "from": "Index.Y", "to": "Standard.Y" },
{ "from": "Index.RightPrimaryThumb", "to": "Standard.RightPrimaryThumb" },
{ "from": "Index.RightSecondaryThumb", "to": "Standard.RightSecondaryThumb" },
{ "from": "Index.LeftPrimaryThumb", "to": "Standard.LeftPrimaryThumb" },
{ "from": "Index.LeftSecondaryThumb", "to": "Standard.LeftSecondaryThumb" },
{ "from": "Index.LeftPrimaryThumbTouch", "to": "Standard.LeftPrimaryThumbTouch" },
{ "from": "Index.LeftSecondaryThumbTouch", "to": "Standard.LeftSecondaryThumbTouch" },

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

@ -309,14 +309,14 @@ controller::Input::NamedVector OpenXrInputPlugin::InputDevice::getAvailableInput
makePair(RS, "RS"),
makePair(RS_TOUCH, "RSTouch"),
// Face buttons
makePair(A, "A"),
makePair(RIGHT_PRIMARY_THUMB, "RightPrimaryThumb"),
makePair(RIGHT_PRIMARY_THUMB_TOUCH, "RightPrimaryThumbTouch"),
makePair(B, "B"),
makePair(RIGHT_SECONDARY_THUMB, "RightSecondaryThumb"),
makePair(RIGHT_SECONDARY_THUMB_TOUCH, "RightSecondaryThumbTouch"),
makePair(X, "X"),
makePair(LEFT_PRIMARY_THUMB, "LeftPrimaryThumb"),
makePair(LEFT_PRIMARY_THUMB_TOUCH, "LeftPrimaryThumbTouch"),
makePair(Y, "Y"),
makePair(LEFT_SECONDARY_THUMB, "LeftSecondaryThumb"),
makePair(LEFT_SECONDARY_THUMB_TOUCH, "LeftSecondaryThumbTouch"),
// Triggers
makePair(RT, "RT"),
@ -508,9 +508,9 @@ void OpenXrInputPlugin::InputDevice::update(float deltaTime, const controller::I
// TODO: Figure out why LEFT_APP_MENU is misssing in StandardButtonChannel
std::map<controller::StandardButtonChannel, std::string> buttonsToUpdate[2] = {
{
{ controller::X, "/input/a/click" },
{ controller::LEFT_PRIMARY_THUMB, "/input/a/click" },
{ controller::LEFT_PRIMARY_THUMB_TOUCH, "/input/a/touch" },
{ controller::Y, "/input/b/click" },
{ controller::LEFT_SECONDARY_THUMB, "/input/b/click" },
{ controller::LEFT_SECONDARY_THUMB_TOUCH, "/input/b/touch" },
{ controller::LT_CLICK, "/input/trigger/click" },
{ controller::LEFT_PRIMARY_INDEX_TOUCH, "/input/trigger/touch" },
@ -519,9 +519,9 @@ void OpenXrInputPlugin::InputDevice::update(float deltaTime, const controller::I
//{ LEFT_APP_MENU, "/input/system/click" },
},
{
{ controller::A, "/input/a/click" },
{ controller::RIGHT_PRIMARY_THUMB, "/input/a/click" },
{ controller::RIGHT_PRIMARY_THUMB_TOUCH, "/input/a/touch" },
{ controller::B, "/input/b/click" },
{ controller::RIGHT_SECONDARY_THUMB, "/input/b/click" },
{ controller::RIGHT_SECONDARY_THUMB_TOUCH, "/input/b/touch" },
{ controller::RT_CLICK, "/input/trigger/click" },
{ controller::RIGHT_PRIMARY_INDEX_TOUCH, "/input/trigger/touch" },