Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

OpenXR - Support camera adjust using joystick

Browse source
This commit is contained in:
Lubos 2022-11-17 10:22:01 +01:00
parent 3e481634ac
commit 0ae1d75daf
3 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Common/VR/PPSSPPVR.cpp
View file

@ -36,6 +36,7 @@ enum VRMirroring {
VR_MIRRORING_COUNT
};
static std::map<int, float> pspAxis;
static std::map<int, bool> pspKeys;
static int vr3DGeometryCount = 0;
@ -325,7 +326,12 @@ void UpdateVRInput(bool(*NativeKey)(const KeyInput &key), bool(*NativeTouch)(con
}
}
bool UpdateVRSpecialKeys(const KeyInput &key) {
bool UpdateVRAxis(const AxisInput &axis) {
pspAxis[axis.axisId] = axis.value;
return !pspKeys[VIRTKEY_VR_CAMERA_ADJUST];
}
bool UpdateVRKeys(const KeyInput &key) {
std::vector<int> nativeKeys;
if (KeyMap::KeyToPspButton(key.deviceId, key.keyCode, &nativeKeys)) {
for (int& nativeKey : nativeKeys) {
@ -562,16 +568,16 @@ bool StartVRRender() {
// Camera control
if (pspKeys[VIRTKEY_VR_CAMERA_ADJUST]) {
//left joystick controls height and side
if (pspKeys[CTRL_LEFT]) g_Config.fCameraSide -= 0.05f;
if (pspKeys[CTRL_RIGHT]) g_Config.fCameraSide += 0.05f;
if (pspKeys[CTRL_DOWN]) g_Config.fCameraHeight -= 0.05f;
if (pspKeys[CTRL_UP]) g_Config.fCameraHeight += 0.05f;
if (pspKeys[CTRL_LEFT] || (pspAxis[JOYSTICK_AXIS_X] < -0.5f)) g_Config.fCameraSide -= 0.05f;
if (pspKeys[CTRL_RIGHT] || (pspAxis[JOYSTICK_AXIS_X] > 0.5f)) g_Config.fCameraSide += 0.05f;
if (pspKeys[CTRL_DOWN] || (pspAxis[JOYSTICK_AXIS_Y] > 0.5f)) g_Config.fCameraHeight -= 0.05f;
if (pspKeys[CTRL_UP] || (pspAxis[JOYSTICK_AXIS_Y] < -0.5f)) g_Config.fCameraHeight += 0.05f;
//right joystick controls distance and fov
if (pspKeys[VIRTKEY_AXIS_X_MIN]) g_Config.fFieldOfViewPercentage -= 1.0f;
if (pspKeys[VIRTKEY_AXIS_X_MAX]) g_Config.fFieldOfViewPercentage += 1.0f;
if (pspKeys[VIRTKEY_AXIS_Y_MIN]) g_Config.fCameraDistance -= 0.1f;
if (pspKeys[VIRTKEY_AXIS_Y_MAX]) g_Config.fCameraDistance += 0.1f;
if (pspKeys[VIRTKEY_AXIS_X_MIN] || (pspAxis[JOYSTICK_AXIS_Z] < -0.5f)) g_Config.fFieldOfViewPercentage -= 1.0f;
if (pspKeys[VIRTKEY_AXIS_X_MAX] || (pspAxis[JOYSTICK_AXIS_Z] > 0.5f)) g_Config.fFieldOfViewPercentage += 1.0f;
if (pspKeys[VIRTKEY_AXIS_Y_MIN] || (pspAxis[JOYSTICK_AXIS_RZ] > 0.5f)) g_Config.fCameraDistance -= 0.1f;
if (pspKeys[VIRTKEY_AXIS_Y_MAX] || (pspAxis[JOYSTICK_AXIS_RZ] < -0.5f)) g_Config.fCameraDistance += 0.1f;
// Reset values
if (pspKeys[VIRTKEY_VR_CAMERA_RESET]) {

3
Common/VR/PPSSPPVR.h
View file

@ -23,7 +23,8 @@ void InitVROnAndroid(void* vm, void* activity, const char* system, int version,
void EnterVR(bool firstStart, void* vulkanContext);
void GetVRResolutionPerEye(int* width, int* height);
void UpdateVRInput(bool(*NativeKey)(const KeyInput &key), bool(*NativeTouch)(const TouchInput &touch), bool haptics, float dp_xscale, float dp_yscale);
bool UpdateVRSpecialKeys(const KeyInput &key);
bool UpdateVRAxis(const AxisInput &axis);
bool UpdateVRKeys(const KeyInput &key);
// VR games compatibility
void PreprocessStepVR(void* step);

9
UI/NativeApp.cpp
View file

@ -1306,8 +1306,8 @@ bool NativeTouch(const TouchInput &touch) {
}
bool NativeKey(const KeyInput &key) {
// Special key VR actions
if (IsVREnabled() && !UpdateVRSpecialKeys(key)) {
// VR actions
if (IsVREnabled() && !UpdateVRKeys(key)) {
return false;
}
@ -1331,6 +1331,11 @@ bool NativeKey(const KeyInput &key) {
}
bool NativeAxis(const AxisInput &axis) {
// VR actions
if (IsVREnabled() && !UpdateVRAxis(axis)) {
return false;
}
if (!screenManager) {
// Too early.
return false;