OpenXR: fix thumbrest action;

This commit is contained in:
bjorn 2022-03-14 14:09:47 -07:00
parent c9fe026a66
commit a11121d739
2 changed files with 5 additions and 2 deletions

View File

@ -723,13 +723,17 @@ static bool getButtonState(Device device, DeviceButton button, bool* value, bool
switch (button) {
case BUTTON_TRIGGER: info.action = state.actions[ACTION_TRIGGER_DOWN + touch]; break;
case BUTTON_THUMBREST: info.action = state.actions[ACTION_THUMBREST_DOWN + touch]; break;
case BUTTON_THUMBREST: info.action = touch ? state.actions[ACTION_THUMBREST_TOUCH] : XR_NULL_HANDLE; break;
case BUTTON_TOUCHPAD: info.action = state.actions[ACTION_TRACKPAD_DOWN + touch]; break;
case BUTTON_MENU: info.action = state.actions[ACTION_MENU_DOWN + touch]; break;
case BUTTON_GRIP: info.action = state.actions[ACTION_GRIP_DOWN + touch]; break;
default: return false;
}
if (!info.action) {
return false;
}
XrActionStateBoolean actionState = { .type = XR_TYPE_ACTION_STATE_BOOLEAN };
XR(xrGetActionStateBoolean(state.session, &info, &actionState));
*value = actionState.currentState;

View File

@ -27,7 +27,6 @@ enum {
ACTION_GRIP_DOWN,
ACTION_GRIP_TOUCH,
ACTION_GRIP_AXIS,
ACTION_THUMBREST_DOWN,
ACTION_THUMBREST_TOUCH,
ACTION_VIBRATE,
MAX_ACTIONS