diff --git a/Core/Config.cpp b/Core/Config.cpp index 24052b11ee..bdbb8406c7 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -696,7 +696,7 @@ struct ConfigTranslator { typedef ConfigTranslator GPUBackendTranslator; static ConfigSetting graphicsSettings[] = { - ConfigSetting("EnableCardboard", &g_Config.bEnableCardboard, false, true, true), + ConfigSetting("EnableCardboardVR", &g_Config.bEnableCardboardVR, false, true, true), ConfigSetting("CardboardScreenSize", &g_Config.iCardboardScreenSize, 50, true, true), ConfigSetting("CardboardXShift", &g_Config.iCardboardXShift, 0, true, true), ConfigSetting("CardboardYShift", &g_Config.iCardboardXShift, 0, true, true), diff --git a/Core/Config.h b/Core/Config.h index 27fb772d71..f0b743510a 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -150,7 +150,7 @@ public: bool bAutoFrameSkip; bool bFrameSkipUnthrottle; - bool bEnableCardboard; // Cardboard Master Switch + bool bEnableCardboardVR; // Cardboard Master Switch int iCardboardScreenSize; // Screen Size (in %) int iCardboardXShift; // X-Shift of Screen (in %) int iCardboardYShift; // Y-Shift of Screen (in %) diff --git a/GPU/Common/FramebufferCommon.cpp b/GPU/Common/FramebufferCommon.cpp index 1a0bb55cce..4addac91d1 100644 --- a/GPU/Common/FramebufferCommon.cpp +++ b/GPU/Common/FramebufferCommon.cpp @@ -1030,7 +1030,7 @@ void FramebufferManagerCommon::CopyDisplayToOutput() { Bind2DShader(); flags = (!postShaderIsUpscalingFilter_ && g_Config.iBufFilter == SCALE_LINEAR) ? DRAWTEX_LINEAR : DRAWTEX_NEAREST; flags = flags | DRAWTEX_TO_BACKBUFFER; - if (g_Config.bEnableCardboard) { + if (g_Config.bEnableCardboardVR) { // Left Eye Image SetViewport2D(cardboardSettings.leftEyeXPosition, cardboardSettings.screenYPosition, cardboardSettings.screenWidth, cardboardSettings.screenHeight); DrawActiveTexture(x, y, w, h, (float)pixelWidth_, (float)pixelHeight_, u0, v0, u1, v1, ROTATION_LOCKED_HORIZONTAL, flags | DRAWTEX_KEEP_TEX); @@ -1058,7 +1058,7 @@ void FramebufferManagerCommon::CopyDisplayToOutput() { PostShaderUniforms uniforms{}; CalculatePostShaderUniforms(vfb->bufferWidth, vfb->bufferHeight, vfb->renderWidth, vfb->renderHeight, &uniforms); BindPostShader(uniforms); - if (g_Config.bEnableCardboard) { + if (g_Config.bEnableCardboardVR) { // Left Eye Image SetViewport2D(cardboardSettings.leftEyeXPosition, cardboardSettings.screenYPosition, cardboardSettings.screenWidth, cardboardSettings.screenHeight); DrawActiveTexture(x, y, w, h, (float)pixelWidth_, (float)pixelHeight_, u0, v0, u1, v1, ROTATION_LOCKED_HORIZONTAL, flags | DRAWTEX_KEEP_TEX); @@ -1862,7 +1862,7 @@ void FramebufferManagerCommon::GetCardboardSettings(CardboardSettings *cardboard float cardboardUserYShift = g_Config.iCardboardYShift / 100.0f * cardboardMaxYShift; float cardboardScreenY = cardboardMaxYShift + cardboardUserYShift; - cardboardSettings->enabled = g_Config.bEnableCardboard; + cardboardSettings->enabled = g_Config.bEnableCardboardVR; cardboardSettings->leftEyeXPosition = cardboardLeftEyeX; cardboardSettings->rightEyeXPosition = cardboardRightEyeX; cardboardSettings->screenYPosition = cardboardScreenY; diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 0cd9907b79..4a7a8a466c 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -1035,7 +1035,7 @@ UI::EventReturn EmuScreen::OnDevTools(UI::EventParams ¶ms) { } UI::EventReturn EmuScreen::OnDisableCardboard(UI::EventParams ¶ms) { - g_Config.bEnableCardboard = false; + g_Config.bEnableCardboardVR = false; return UI::EVENT_DONE; } @@ -1292,7 +1292,7 @@ void EmuScreen::render() { return; if (hasVisibleUI()) { - cardboardDisableButton_->SetVisibility(g_Config.bEnableCardboard ? UI::V_VISIBLE : UI::V_GONE); + cardboardDisableButton_->SetVisibility(g_Config.bEnableCardboardVR ? UI::V_VISIBLE : UI::V_GONE); screenManager()->getUIContext()->BeginFrame(); renderUI(); } @@ -1321,7 +1321,7 @@ bool EmuScreen::hasVisibleUI() { return true; if (!osm.IsEmpty() || g_Config.bShowTouchControls || g_Config.iShowFPSCounter != 0) return true; - if (g_Config.bEnableCardboard) + if (g_Config.bEnableCardboardVR) return true; // Debug UI. if (g_Config.bShowDebugStats || g_Config.bShowDeveloperMenu || g_Config.bShowAudioDebug || g_Config.bShowFrameProfiler)