diff --git a/Source/Core/Core/Config/GraphicsSettings.cpp b/Source/Core/Core/Config/GraphicsSettings.cpp index d6f1f633dd..506d9062d5 100644 --- a/Source/Core/Core/Config/GraphicsSettings.cpp +++ b/Source/Core/Core/Config/GraphicsSettings.cpp @@ -42,9 +42,6 @@ const Info GFX_CACHE_HIRES_TEXTURES{{System::GFX, "Settings", "CacheHiresT const Info GFX_DUMP_EFB_TARGET{{System::GFX, "Settings", "DumpEFBTarget"}, false}; const Info GFX_DUMP_XFB_TARGET{{System::GFX, "Settings", "DumpXFBTarget"}, false}; const Info GFX_DUMP_FRAMES_AS_IMAGES{{System::GFX, "Settings", "DumpFramesAsImages"}, false}; -const Info GFX_FREE_LOOK{{System::GFX, "Settings", "FreeLook"}, false}; -const Info GFX_FREE_LOOK_CONTROL_TYPE{ - {System::GFX, "Settings", "FreeLookControlType"}, FreelookControlType::SixAxis}; const Info GFX_USE_FFV1{{System::GFX, "Settings", "UseFFV1"}, false}; const Info GFX_DUMP_FORMAT{{System::GFX, "Settings", "DumpFormat"}, "avi"}; const Info GFX_DUMP_CODEC{{System::GFX, "Settings", "DumpCodec"}, ""}; diff --git a/Source/Core/Core/Config/GraphicsSettings.h b/Source/Core/Core/Config/GraphicsSettings.h index 228c2af3b9..75bcb227e0 100644 --- a/Source/Core/Core/Config/GraphicsSettings.h +++ b/Source/Core/Core/Config/GraphicsSettings.h @@ -43,8 +43,6 @@ extern const Info GFX_CACHE_HIRES_TEXTURES; extern const Info GFX_DUMP_EFB_TARGET; extern const Info GFX_DUMP_XFB_TARGET; extern const Info GFX_DUMP_FRAMES_AS_IMAGES; -extern const Info GFX_FREE_LOOK; -extern const Info GFX_FREE_LOOK_CONTROL_TYPE; extern const Info GFX_USE_FFV1; extern const Info GFX_DUMP_FORMAT; extern const Info GFX_DUMP_CODEC; diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 02deb3a8b1..acd1cdb7a1 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -63,7 +63,6 @@ #include "VideoCommon/FrameDump.h" #include "VideoCommon/FramebufferManager.h" #include "VideoCommon/FramebufferShaderGen.h" -#include "VideoCommon/FreeLookCamera.h" #include "VideoCommon/NetPlayChatUI.h" #include "VideoCommon/NetPlayGolfUI.h" #include "VideoCommon/OnScreenDisplay.h" @@ -403,11 +402,6 @@ void Renderer::CheckForConfigChanges() UpdateActiveConfig(); - if (g_ActiveConfig.bFreeLook) - { - g_freelook_camera.SetControlType(g_ActiveConfig.iFreelookControlType); - } - // Update texture cache settings with any changed options. g_texture_cache->OnConfigChanged(g_ActiveConfig); diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp index 04cb3b2f6f..174ab70316 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/VertexShaderManager.cpp @@ -112,7 +112,6 @@ void VertexShaderManager::Init() bViewportChanged = false; bTexMtxInfoChanged = false; bLightingConfigChanged = false; - g_freelook_camera.SetControlType(Config::Get(Config::GFX_FREE_LOOK_CONTROL_TYPE)); std::memset(static_cast(&xfmem), 0, sizeof(xfmem)); constants = {}; @@ -420,7 +419,7 @@ void VertexShaderManager::SetConstants() auto corrected_matrix = s_viewportCorrection * Common::Matrix44::FromArray(g_fProjectionMatrix); - if (g_ActiveConfig.bFreeLook && xfmem.projection.type == GX_PERSPECTIVE) + if (xfmem.projection.type == GX_PERSPECTIVE) corrected_matrix *= g_freelook_camera.GetView(); memcpy(constants.projection.data(), corrected_matrix.data.data(), 4 * sizeof(float4)); diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index b0ab912e6c..9ed9a599e4 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -92,8 +92,6 @@ void VideoConfig::Refresh() bDumpEFBTarget = Config::Get(Config::GFX_DUMP_EFB_TARGET); bDumpXFBTarget = Config::Get(Config::GFX_DUMP_XFB_TARGET); bDumpFramesAsImages = Config::Get(Config::GFX_DUMP_FRAMES_AS_IMAGES); - bFreeLook = Config::Get(Config::GFX_FREE_LOOK); - iFreelookControlType = Config::Get(Config::GFX_FREE_LOOK_CONTROL_TYPE); bUseFFV1 = Config::Get(Config::GFX_USE_FFV1); sDumpFormat = Config::Get(Config::GFX_DUMP_FORMAT); sDumpCodec = Config::Get(Config::GFX_DUMP_CODEC); diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index dacb286ada..6c328c864b 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -51,13 +51,6 @@ enum class ShaderCompilationMode : int AsynchronousSkipRendering }; -enum class FreelookControlType : int -{ - SixAxis, - FPS, - Orbital -}; - // NEVER inherit from this class. struct VideoConfig final { @@ -115,8 +108,6 @@ struct VideoConfig final std::string sDumpFormat; std::string sDumpPath; bool bInternalResolutionFrameDumps; - bool bFreeLook; - FreelookControlType iFreelookControlType; bool bBorderlessFullscreen; bool bEnableGPUTextureDecoding; int iBitrateKbps;