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

Merge branch 'master' into cleanup_openxr_core

Browse source
This commit is contained in:
Lubos 2022-11-05 10:51:29 +01:00
commit a52afe9fd8
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Common/VR/PPSSPPVR.cpp
View file

@ -128,8 +128,6 @@ void InitVROnAndroid(void* vm, void* activity, const char* system, int version,
java.Vm = (JavaVM*)vm;
java.ActivityObject = (jobject)activity;
VR_Init(&java, name, version);
__DisplaySetFramerate(72);
}
#endif
@ -393,6 +391,7 @@ bool StartVRRender() {
}
// Set customizations
__DisplaySetFramerate(g_Config.bForce72Hz ? 72 : 60);
VR_SetConfig(VR_CONFIG_6DOF_ENABLED, g_Config.bEnable6DoF);
VR_SetConfig(VR_CONFIG_CAMERA_DISTANCE, g_Config.fCameraDistance * 1000);
VR_SetConfig(VR_CONFIG_CAMERA_HEIGHT, g_Config.fCameraHeight * 1000);

1
Core/Config.cpp
View file

@ -1208,6 +1208,7 @@ static ConfigSetting vrSettings[] = {
ConfigSetting("VREnable", &g_Config.bEnableVR, true),
ConfigSetting("VREnable6DoF", &g_Config.bEnable6DoF, true),
ConfigSetting("VREnableStereo", &g_Config.bEnableStereo, false),
ConfigSetting("VRbForce72Hz", &g_Config.bForce72Hz, true),
ConfigSetting("VRCameraDistance", &g_Config.fCameraDistance, 0.0f),
ConfigSetting("VRCameraHeight", &g_Config.fCameraHeight, 0.0f),
ConfigSetting("VRCameraSide", &g_Config.fCameraSide, 0.0f),

1
Core/Config.h
View file

@ -463,6 +463,7 @@ public:
bool bEnableVR;
bool bEnable6DoF;
bool bEnableStereo;
bool bForce72Hz;
float fCameraDistance;
float fCameraHeight;
float fCameraSide;

1
UI/GameSettingsScreen.cpp
View file

@ -1162,6 +1162,7 @@ void GameSettingsScreen::CreateViews() {
CheckBox *vr6DoF = vrSettings->Add(new CheckBox(&g_Config.bEnable6DoF, vr->T("6DoF movement")));
vr6DoF->SetEnabledPtr(&g_Config.bEnableVR);
vrSettings->Add(new CheckBox(&g_Config.bEnableStereo, vr->T("Stereoscopic vision (Experimental)")));
vrSettings->Add(new CheckBox(&g_Config.bForce72Hz, vr->T("Force 72Hz update")));
vrSettings->Add(new ItemHeader(vr->T("VR camera")));
vrSettings->Add(new PopupSliderChoiceFloat(&g_Config.fCameraDistance, -10.0f, 10.0f, vr->T("Camera distance adjust", "Camera distance adjust"), 1.0f, screenManager(), ""));