diff --git a/Common/VR/PPSSPPVR.cpp b/Common/VR/PPSSPPVR.cpp index 7c8c522ec0..ba6ff6ba64 100644 --- a/Common/VR/PPSSPPVR.cpp +++ b/Common/VR/PPSSPPVR.cpp @@ -158,7 +158,7 @@ void UpdateVRInput(bool(*NativeKey)(const KeyInput &key), bool(*NativeTouch)(con std::vector nativeKeys; if (KeyMap::KeyToPspButton(controllerIds[j], m.keycode, &nativeKeys)) { for (int& nativeKey : nativeKeys) { - if (nativeKey == CTRL_HOLD) { + if (nativeKey == VIRTKEY_VR_CAMERA_ADJUST) { cameraKey = true; break; } @@ -246,7 +246,7 @@ void UpdateVRSpecialKeys(const KeyInput &key) { if (KeyMap::KeyToPspButton(key.deviceId, key.keyCode, &nativeKeys)) { for (int& nativeKey : nativeKeys) { // adjust camera parameters - if (nativeKey == CTRL_HOLD) { + if (nativeKey == VIRTKEY_VR_CAMERA_ADJUST) { VR_SetConfig(VR_CONFIG_CAMERA_CONTROL, key.flags & KEY_DOWN); } // force 2D rendering diff --git a/Core/KeyMap.cpp b/Core/KeyMap.cpp index b0a3b69c7e..30b005d86f 100644 --- a/Core/KeyMap.cpp +++ b/Core/KeyMap.cpp @@ -399,10 +399,14 @@ const KeyMap_IntStrPair psp_button_names[] = { {VIRTKEY_ANALOG_ROTATE_CW, "Rotate Analog (CW)"}, {VIRTKEY_ANALOG_ROTATE_CCW, "Rotate Analog (CCW)"}, +#ifdef OPENXR + {VIRTKEY_VR_CAMERA_ADJUST, "VR camera adjust"}, +#else {VIRTKEY_SCREEN_ROTATION_VERTICAL, "Display Portrait"}, {VIRTKEY_SCREEN_ROTATION_VERTICAL180, "Display Portrait Reversed"}, {VIRTKEY_SCREEN_ROTATION_HORIZONTAL, "Display Landscape"}, {VIRTKEY_SCREEN_ROTATION_HORIZONTAL180, "Display Landscape Reversed"}, +#endif {CTRL_HOME, "Home"}, {CTRL_HOLD, "Hold"}, diff --git a/Core/KeyMap.h b/Core/KeyMap.h index a8ae9f672a..74859d3628 100644 --- a/Core/KeyMap.h +++ b/Core/KeyMap.h @@ -68,6 +68,7 @@ enum { VIRTKEY_SCREEN_ROTATION_HORIZONTAL = 0x40000022, VIRTKEY_SCREEN_ROTATION_HORIZONTAL180 = 0x40000023, VIRTKEY_SPEED_ANALOG = 0x40000024, + VIRTKEY_VR_CAMERA_ADJUST = 0x40000025, VIRTKEY_LAST, VIRTKEY_COUNT = VIRTKEY_LAST - VIRTKEY_FIRST };