Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-05 21:12:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

OpenXrInput: Improve mapping for the Index controller.

Browse source 
* Add thumbstick click and touch.
* Add face and trigger touch.

Use left primary / secondary instead of face button names.
This commit is contained in:
Lubosz Sarnecki 2024-03-13 01:41:18 +01:00 committed by Ada
parent d9cd2fd3d5
commit 2db3168612
2 changed files with 46 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
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" },
@ -27,6 +22,8 @@
{ "from": "Index.LX", "to": "Standard.LX" },
{ "from": "Index.RY", "to": "Standard.RY" },
{ "from": "Index.RX", "to": "Standard.RX" },
{ "from": "Index.LS", "to": "Standard.LS" },
{ "from": "Index.RS", "to": "Standard.RS" },
{ "from": "Index.LSTouch", "to": "Standard.LSTouch" },
{ "from": "Index.RSTouch", "to": "Standard.RSTouch" },

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

@ -302,18 +302,29 @@ controller::Input::NamedVector OpenXrInputPlugin::InputDevice::getAvailableInput
// Sticks
makePair(LX, "LX"),
makePair(LY, "LY"),
makePair(LS, "LS"),
makePair(LS_TOUCH, "LSTouch"),
makePair(RX, "RX"),
makePair(RY, "RY"),
makePair(RS, "RS"),
makePair(RS_TOUCH, "RSTouch"),
// Face buttons
makePair(A, "A"),
makePair(B, "B"),
makePair(X, "X"),
makePair(Y, "Y"),
makePair(RIGHT_PRIMARY_THUMB, "RightPrimaryThumb"),
makePair(RIGHT_PRIMARY_THUMB_TOUCH, "RightPrimaryThumbTouch"),
makePair(RIGHT_SECONDARY_THUMB, "RightSecondaryThumb"),
makePair(RIGHT_SECONDARY_THUMB_TOUCH, "RightSecondaryThumbTouch"),
makePair(LEFT_PRIMARY_THUMB, "LeftPrimaryThumb"),
makePair(LEFT_PRIMARY_THUMB_TOUCH, "LeftPrimaryThumbTouch"),
makePair(LEFT_SECONDARY_THUMB, "LeftSecondaryThumb"),
makePair(LEFT_SECONDARY_THUMB_TOUCH, "LeftSecondaryThumbTouch"),
// Triggers
makePair(RT, "RT"),
makePair(LT, "LT"),
makePair(RT_CLICK, "RTClick"),
makePair(LT_CLICK, "LTClick"),
makePair(LEFT_PRIMARY_INDEX_TOUCH, "LeftPrimaryIndexTouch"),
makePair(RIGHT_PRIMARY_INDEX_TOUCH, "RightPrimaryIndexTouch"),
// Menu buttons
// TODO: Add this to button channel
// Input::NamedPair(Input(_deviceID, LEFT_APP_MENU, ChannelType::BUTTON), "LeftApplicationMenu"),
@ -350,10 +361,15 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
std::map<std::string, XrActionType> actionsToInit = {
{ "/input/thumbstick/x", XR_ACTION_TYPE_FLOAT_INPUT },
{ "/input/thumbstick/y", XR_ACTION_TYPE_FLOAT_INPUT },
{ "/input/thumbstick/touch", XR_ACTION_TYPE_BOOLEAN_INPUT },
{ "/input/thumbstick/click", XR_ACTION_TYPE_BOOLEAN_INPUT },
{ "/input/a/click", XR_ACTION_TYPE_BOOLEAN_INPUT },
{ "/input/a/touch", XR_ACTION_TYPE_BOOLEAN_INPUT },
{ "/input/b/click", XR_ACTION_TYPE_BOOLEAN_INPUT },
{ "/input/b/touch", XR_ACTION_TYPE_BOOLEAN_INPUT },
{ "/input/trigger/value", XR_ACTION_TYPE_FLOAT_INPUT },
{ "/input/trigger/click", XR_ACTION_TYPE_BOOLEAN_INPUT },
{ "/input/trigger/touch", XR_ACTION_TYPE_BOOLEAN_INPUT },
{ "/output/haptic", XR_ACTION_TYPE_VIBRATION_OUTPUT },
{ "/input/grip/pose", XR_ACTION_TYPE_POSE_INPUT },
{ "/input/select/click", XR_ACTION_TYPE_BOOLEAN_INPUT },
@ -387,9 +403,15 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
"/input/grip/pose",
"/input/thumbstick/x",
"/input/thumbstick/y",
"/input/thumbstick/touch",
"/input/thumbstick/click",
"/input/a/click",
"/input/a/touch",
"/input/b/click",
"/input/b/touch",
"/input/trigger/value",
"/input/trigger/click",
"/input/trigger/touch",
"/output/haptic",
"/input/system/click",
};
@ -499,15 +521,25 @@ 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::Y, "/input/b/click" },
{ controller::LEFT_PRIMARY_THUMB, "/input/a/click" },
{ controller::LEFT_PRIMARY_THUMB_TOUCH, "/input/a/touch" },
{ 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" },
{ controller::LS, "/input/thumbstick/click" },
{ controller::LS_TOUCH, "/input/thumbstick/touch" },
//{ LEFT_APP_MENU, "/input/system/click" },
},
{
{ controller::A, "/input/a/click" },
{ controller::B, "/input/b/click" },
{ controller::RIGHT_PRIMARY_THUMB, "/input/a/click" },
{ controller::RIGHT_PRIMARY_THUMB_TOUCH, "/input/a/touch" },
{ 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" },
{ controller::RS, "/input/thumbstick/click" },
{ controller::RS_TOUCH, "/input/thumbstick/touch" },
//{ RIGHT_APP_MENU, "/input/system/click" },
},
};