thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

typos fixed

Browse source
This commit is contained in:
Lubos 2022-11-25 15:58:51 +01:00
parent 1ef036d07c
commit b2d809f4cd
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Common/VR/PPSSPPVR.cpp
View file

@ -316,9 +316,9 @@ void UpdateVRInput(bool(*NativeAxis)(const AxisInput &axis), bool(*NativeKey)(co
g_Config.fCameraHeight = clampFloat(g_Config.fCameraHeight, -50.0f, 50.0f); g_Config.fCameraHeight = clampFloat(g_Config.fCameraHeight, -50.0f, 50.0f);
break; break;
case JOYSTICK_AXIS_Z: case JOYSTICK_AXIS_Z:
if (axis.second < -0.75f) g_Config.fHeadUpDidplayScale -= 0.01f; if (axis.second < -0.75f) g_Config.fHeadUpDisplayScale -= 0.01f;
if (axis.second > 0.75f) g_Config.fHeadUpDidplayScale += 0.01f; if (axis.second > 0.75f) g_Config.fHeadUpDisplayScale += 0.01f;
g_Config.fHeadUpDidplayScale = clampFloat(g_Config.fHeadUpDidplayScale, 0.2f, 1.0f); g_Config.fHeadUpDisplayScale = clampFloat(g_Config.fHeadUpDisplayScale, 0.2f, 1.0f);
break; break;
case JOYSTICK_AXIS_RZ: case JOYSTICK_AXIS_RZ:
if (axis.second > 0.75f) g_Config.fCameraDistance -= 0.1f; if (axis.second > 0.75f) g_Config.fCameraDistance -= 0.1f;
@ -430,7 +430,7 @@ bool UpdateVRKeys(const KeyInput &key) {
g_Config.fCameraHeight = 0; g_Config.fCameraHeight = 0;
g_Config.fCameraSide = 0; g_Config.fCameraSide = 0;
g_Config.fCameraDistance = 0; g_Config.fCameraDistance = 0;
g_Config.fHeadUpDidplayScale = 0.3f; g_Config.fHeadUpDisplayScale = 0.3f;
} }
//block keys by camera adjust //block keys by camera adjust

2
Core/Config.cpp
View file

@ -1214,7 +1214,7 @@ static ConfigSetting vrSettings[] = {
ConfigSetting("VRCameraSide", &g_Config.fCameraSide, 0.0f), ConfigSetting("VRCameraSide", &g_Config.fCameraSide, 0.0f),
ConfigSetting("VRCanvasDistance", &g_Config.fCanvasDistance, 6.0f), ConfigSetting("VRCanvasDistance", &g_Config.fCanvasDistance, 6.0f),
ConfigSetting("VRFieldOfView", &g_Config.fFieldOfViewPercentage, 100.0f), ConfigSetting("VRFieldOfView", &g_Config.fFieldOfViewPercentage, 100.0f),
ConfigSetting("VRHeadUpDidplayScale", &g_Config.fHeadUpDidplayScale, 0.3f), ConfigSetting("VRHeadUpDisplayScale", &g_Config.fHeadUpDisplayScale, 0.3f),
ConfigSetting("VRMotionLength", &g_Config.fMotionLength, 0.5f), ConfigSetting("VRMotionLength", &g_Config.fMotionLength, 0.5f),
ConfigSetting(false), ConfigSetting(false),

2
Core/Config.h
View file

@ -471,7 +471,7 @@ public:
float fCameraSide; float fCameraSide;
float fCanvasDistance; float fCanvasDistance;
float fFieldOfViewPercentage; float fFieldOfViewPercentage;
float fHeadUpDidplayScale; float fHeadUpDisplayScale;
float fMotionLength; float fMotionLength;
// Debugger // Debugger

4
GPU/GLES/ShaderManagerGLES.cpp
View file

@ -409,8 +409,8 @@ void LinkedShader::UpdateUniforms(u32 vertType, const ShaderID &vsid, bool useBu
if ((fabs(gstate.viewMatrix[9]) > 100) || (fabs(gstate.viewMatrix[11]) > 100)) hud = false; if ((fabs(gstate.viewMatrix[9]) > 100) || (fabs(gstate.viewMatrix[11]) > 100)) hud = false;
if (hud) { if (hud) {
render_->SetUniformF1(&u_scaleX, g_Config.fHeadUpDidplayScale * 480.0f / 272.0f); render_->SetUniformF1(&u_scaleX, g_Config.fHeadUpDisplayScale * 480.0f / 272.0f);
render_->SetUniformF1(&u_scaleY, g_Config.fHeadUpDidplayScale); render_->SetUniformF1(&u_scaleY, g_Config.fHeadUpDisplayScale);
} else { } else {
render_->SetUniformF1(&u_scaleX, 1.0f); render_->SetUniformF1(&u_scaleX, 1.0f);
render_->SetUniformF1(&u_scaleY, 1.0f); render_->SetUniformF1(&u_scaleY, 1.0f);

2
UI/GameSettingsScreen.cpp
View file

@ -1103,7 +1103,7 @@ void GameSettingsScreen::CreateViews() {
vrSettings->Add(new ItemHeader(vr->T("VR camera"))); vrSettings->Add(new ItemHeader(vr->T("VR camera")));
vrSettings->Add(new PopupSliderChoiceFloat(&g_Config.fCanvasDistance, 1.0f, 15.0f, vr->T("Distance to 2D menus and scenes"), 1.0f, screenManager(), "")); vrSettings->Add(new PopupSliderChoiceFloat(&g_Config.fCanvasDistance, 1.0f, 15.0f, vr->T("Distance to 2D menus and scenes"), 1.0f, screenManager(), ""));
vrSettings->Add(new PopupSliderChoiceFloat(&g_Config.fFieldOfViewPercentage, 100.0f, 200.0f, vr->T("Field of view scale"), 10.0f, screenManager(), vr->T("% of native FoV"))); vrSettings->Add(new PopupSliderChoiceFloat(&g_Config.fFieldOfViewPercentage, 100.0f, 200.0f, vr->T("Field of view scale"), 10.0f, screenManager(), vr->T("% of native FoV")));
vrSettings->Add(new PopupSliderChoiceFloat(&g_Config.fHeadUpDidplayScale, 0.2f, 1.0f, vr->T("Head up display scale"), 0.1f, screenManager(), "")); vrSettings->Add(new PopupSliderChoiceFloat(&g_Config.fHeadUpDisplayScale, 0.2f, 1.0f, vr->T("Heads-up display scale"), 0.1f, screenManager(), ""));
vrSettings->Add(new ItemHeader(vr->T("VR controllers"))); vrSettings->Add(new ItemHeader(vr->T("VR controllers")));
vrSettings->Add(new CheckBox(&g_Config.bEnableMotions, vr->T("Map controller movements to keys"))); vrSettings->Add(new CheckBox(&g_Config.bEnableMotions, vr->T("Map controller movements to keys")));