Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

OpenXR - Controller mapping better

Browse Source
This commit is contained in:
Lubos committed 2022-07-22 18:47:37 +02:00
1 parent cc833faa13
commit 67821ca942
3 files changed
+28 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/Input/InputState.cpp
+2
View File
@@ -23,6 +23,8 @@ const char *GetDeviceName(int deviceId) {
case DEVICE_ID_XINPUT_3: return "x360_4";
case DEVICE_ID_ACCELEROMETER: return "accelerometer";
case DEVICE_ID_MOUSE: return "mouse";
case DEVICE_ID_XR_CONTROLLER_LEFT: return "xr_l";
case DEVICE_ID_XR_CONTROLLER_RIGHT: return "xr_r";
default:
return "unknown";
}
Common/Input/InputState.h
+2
View File
@@ -31,6 +31,8 @@ enum {
DEVICE_ID_XINPUT_2 = 22,
DEVICE_ID_XINPUT_3 = 23,
DEVICE_ID_ACCELEROMETER = 30,
DEVICE_ID_XR_CONTROLLER_LEFT = 40,
DEVICE_ID_XR_CONTROLLER_RIGHT = 41,
};
//number of contiguous generic joypad IDs
android/jni/app-android.cpp
+24 -31
View File
@@ -113,32 +113,31 @@ struct ButtonMapping
};
std::vector<ButtonMapping> leftControllerMapping = {
ButtonMapping(52, ovrButton_X),
ButtonMapping(53, ovrButton_Y),
ButtonMapping(54, ovrButton_LThumb),
ButtonMapping(55, ovrButton_GripTrigger),
ButtonMapping(19, ovrButton_Up),
ButtonMapping(20, ovrButton_Down),
ButtonMapping(21, ovrButton_Left),
ButtonMapping(22, ovrButton_Right),
ButtonMapping(23, ovrButton_Joystick),
ButtonMapping(66, ovrButton_Trigger),
ButtonMapping(4, ovrButton_Enter),
ButtonMapping(NKCODE_X, ovrButton_X),
ButtonMapping(NKCODE_Y, ovrButton_Y),
ButtonMapping(NKCODE_ALT_LEFT, ovrButton_GripTrigger),
ButtonMapping(NKCODE_DPAD_UP, ovrButton_Up),
ButtonMapping(NKCODE_DPAD_DOWN, ovrButton_Down),
ButtonMapping(NKCODE_DPAD_LEFT, ovrButton_Left),
ButtonMapping(NKCODE_DPAD_RIGHT, ovrButton_Right),
ButtonMapping(NKCODE_BUTTON_THUMBL, ovrButton_LThumb),
ButtonMapping(NKCODE_ENTER, ovrButton_Trigger),
ButtonMapping(NKCODE_BACK, ovrButton_Enter),
};
std::vector<ButtonMapping> rightControllerMapping = {
ButtonMapping(29, ovrButton_A),
ButtonMapping(30, ovrButton_B),
ButtonMapping(31, ovrButton_RThumb),
ButtonMapping(32, ovrButton_GripTrigger),
ButtonMapping(19, ovrButton_Up),
ButtonMapping(20, ovrButton_Down),
ButtonMapping(21, ovrButton_Left),
ButtonMapping(22, ovrButton_Right),
ButtonMapping(23, ovrButton_Joystick),
ButtonMapping(66, ovrButton_Trigger),
ButtonMapping(NKCODE_A, ovrButton_A),
ButtonMapping(NKCODE_B, ovrButton_B),
ButtonMapping(NKCODE_ALT_RIGHT, ovrButton_GripTrigger),
ButtonMapping(NKCODE_DPAD_UP, ovrButton_Up),
ButtonMapping(NKCODE_DPAD_DOWN, ovrButton_Down),
ButtonMapping(NKCODE_DPAD_LEFT, ovrButton_Left),
ButtonMapping(NKCODE_DPAD_RIGHT, ovrButton_Right),
ButtonMapping(NKCODE_BUTTON_THUMBR, ovrButton_RThumb),
ButtonMapping(NKCODE_ENTER, ovrButton_Trigger),
};
int controllerIds[] = {DEVICE_ID_XR_CONTROLLER_LEFT, DEVICE_ID_XR_CONTROLLER_RIGHT};
std::vector<ButtonMapping> controllerMapping[2] = {
leftControllerMapping,
rightControllerMapping
@@ -1122,18 +1121,12 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeRenderer_displayRender(JNIEnv *env,
for (ButtonMapping& m : controllerMapping[j]) {
keyInput.flags = status & m.ovr ? KEY_DOWN : KEY_UP;
keyInput.keyCode = m.keycode;
keyInput.deviceId = j;
keyInput.deviceId = controllerIds[j];
if (status & m.ovr) {
if (m.pressed) {
keyInput.flags |= KEY_IS_REPEAT;
}
m.pressed = true;
} else {
m.pressed = false;
}
if (!(keyInput.flags & KEY_IS_REPEAT)) {
bool pressed = status & m.ovr;
if (m.pressed != pressed) {
NativeKey(keyInput);
m.pressed = pressed;
}
}
}