mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Core / VideoCommon: Remove old Free Look config
This commit is contained in:
@ -42,9 +42,6 @@ const Info<bool> GFX_CACHE_HIRES_TEXTURES{{System::GFX, "Settings", "CacheHiresT
|
|||||||
const Info<bool> GFX_DUMP_EFB_TARGET{{System::GFX, "Settings", "DumpEFBTarget"}, false};
|
const Info<bool> GFX_DUMP_EFB_TARGET{{System::GFX, "Settings", "DumpEFBTarget"}, false};
|
||||||
const Info<bool> GFX_DUMP_XFB_TARGET{{System::GFX, "Settings", "DumpXFBTarget"}, false};
|
const Info<bool> GFX_DUMP_XFB_TARGET{{System::GFX, "Settings", "DumpXFBTarget"}, false};
|
||||||
const Info<bool> GFX_DUMP_FRAMES_AS_IMAGES{{System::GFX, "Settings", "DumpFramesAsImages"}, false};
|
const Info<bool> GFX_DUMP_FRAMES_AS_IMAGES{{System::GFX, "Settings", "DumpFramesAsImages"}, false};
|
||||||
const Info<bool> GFX_FREE_LOOK{{System::GFX, "Settings", "FreeLook"}, false};
|
|
||||||
const Info<FreelookControlType> GFX_FREE_LOOK_CONTROL_TYPE{
|
|
||||||
{System::GFX, "Settings", "FreeLookControlType"}, FreelookControlType::SixAxis};
|
|
||||||
const Info<bool> GFX_USE_FFV1{{System::GFX, "Settings", "UseFFV1"}, false};
|
const Info<bool> GFX_USE_FFV1{{System::GFX, "Settings", "UseFFV1"}, false};
|
||||||
const Info<std::string> GFX_DUMP_FORMAT{{System::GFX, "Settings", "DumpFormat"}, "avi"};
|
const Info<std::string> GFX_DUMP_FORMAT{{System::GFX, "Settings", "DumpFormat"}, "avi"};
|
||||||
const Info<std::string> GFX_DUMP_CODEC{{System::GFX, "Settings", "DumpCodec"}, ""};
|
const Info<std::string> GFX_DUMP_CODEC{{System::GFX, "Settings", "DumpCodec"}, ""};
|
||||||
|
@ -43,8 +43,6 @@ extern const Info<bool> GFX_CACHE_HIRES_TEXTURES;
|
|||||||
extern const Info<bool> GFX_DUMP_EFB_TARGET;
|
extern const Info<bool> GFX_DUMP_EFB_TARGET;
|
||||||
extern const Info<bool> GFX_DUMP_XFB_TARGET;
|
extern const Info<bool> GFX_DUMP_XFB_TARGET;
|
||||||
extern const Info<bool> GFX_DUMP_FRAMES_AS_IMAGES;
|
extern const Info<bool> GFX_DUMP_FRAMES_AS_IMAGES;
|
||||||
extern const Info<bool> GFX_FREE_LOOK;
|
|
||||||
extern const Info<FreelookControlType> GFX_FREE_LOOK_CONTROL_TYPE;
|
|
||||||
extern const Info<bool> GFX_USE_FFV1;
|
extern const Info<bool> GFX_USE_FFV1;
|
||||||
extern const Info<std::string> GFX_DUMP_FORMAT;
|
extern const Info<std::string> GFX_DUMP_FORMAT;
|
||||||
extern const Info<std::string> GFX_DUMP_CODEC;
|
extern const Info<std::string> GFX_DUMP_CODEC;
|
||||||
|
@ -63,7 +63,6 @@
|
|||||||
#include "VideoCommon/FrameDump.h"
|
#include "VideoCommon/FrameDump.h"
|
||||||
#include "VideoCommon/FramebufferManager.h"
|
#include "VideoCommon/FramebufferManager.h"
|
||||||
#include "VideoCommon/FramebufferShaderGen.h"
|
#include "VideoCommon/FramebufferShaderGen.h"
|
||||||
#include "VideoCommon/FreeLookCamera.h"
|
|
||||||
#include "VideoCommon/NetPlayChatUI.h"
|
#include "VideoCommon/NetPlayChatUI.h"
|
||||||
#include "VideoCommon/NetPlayGolfUI.h"
|
#include "VideoCommon/NetPlayGolfUI.h"
|
||||||
#include "VideoCommon/OnScreenDisplay.h"
|
#include "VideoCommon/OnScreenDisplay.h"
|
||||||
@ -403,11 +402,6 @@ void Renderer::CheckForConfigChanges()
|
|||||||
|
|
||||||
UpdateActiveConfig();
|
UpdateActiveConfig();
|
||||||
|
|
||||||
if (g_ActiveConfig.bFreeLook)
|
|
||||||
{
|
|
||||||
g_freelook_camera.SetControlType(g_ActiveConfig.iFreelookControlType);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update texture cache settings with any changed options.
|
// Update texture cache settings with any changed options.
|
||||||
g_texture_cache->OnConfigChanged(g_ActiveConfig);
|
g_texture_cache->OnConfigChanged(g_ActiveConfig);
|
||||||
|
|
||||||
|
@ -112,7 +112,6 @@ void VertexShaderManager::Init()
|
|||||||
bViewportChanged = false;
|
bViewportChanged = false;
|
||||||
bTexMtxInfoChanged = false;
|
bTexMtxInfoChanged = false;
|
||||||
bLightingConfigChanged = false;
|
bLightingConfigChanged = false;
|
||||||
g_freelook_camera.SetControlType(Config::Get(Config::GFX_FREE_LOOK_CONTROL_TYPE));
|
|
||||||
|
|
||||||
std::memset(static_cast<void*>(&xfmem), 0, sizeof(xfmem));
|
std::memset(static_cast<void*>(&xfmem), 0, sizeof(xfmem));
|
||||||
constants = {};
|
constants = {};
|
||||||
@ -420,7 +419,7 @@ void VertexShaderManager::SetConstants()
|
|||||||
|
|
||||||
auto corrected_matrix = s_viewportCorrection * Common::Matrix44::FromArray(g_fProjectionMatrix);
|
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();
|
corrected_matrix *= g_freelook_camera.GetView();
|
||||||
|
|
||||||
memcpy(constants.projection.data(), corrected_matrix.data.data(), 4 * sizeof(float4));
|
memcpy(constants.projection.data(), corrected_matrix.data.data(), 4 * sizeof(float4));
|
||||||
|
@ -92,8 +92,6 @@ void VideoConfig::Refresh()
|
|||||||
bDumpEFBTarget = Config::Get(Config::GFX_DUMP_EFB_TARGET);
|
bDumpEFBTarget = Config::Get(Config::GFX_DUMP_EFB_TARGET);
|
||||||
bDumpXFBTarget = Config::Get(Config::GFX_DUMP_XFB_TARGET);
|
bDumpXFBTarget = Config::Get(Config::GFX_DUMP_XFB_TARGET);
|
||||||
bDumpFramesAsImages = Config::Get(Config::GFX_DUMP_FRAMES_AS_IMAGES);
|
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);
|
bUseFFV1 = Config::Get(Config::GFX_USE_FFV1);
|
||||||
sDumpFormat = Config::Get(Config::GFX_DUMP_FORMAT);
|
sDumpFormat = Config::Get(Config::GFX_DUMP_FORMAT);
|
||||||
sDumpCodec = Config::Get(Config::GFX_DUMP_CODEC);
|
sDumpCodec = Config::Get(Config::GFX_DUMP_CODEC);
|
||||||
|
@ -51,13 +51,6 @@ enum class ShaderCompilationMode : int
|
|||||||
AsynchronousSkipRendering
|
AsynchronousSkipRendering
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class FreelookControlType : int
|
|
||||||
{
|
|
||||||
SixAxis,
|
|
||||||
FPS,
|
|
||||||
Orbital
|
|
||||||
};
|
|
||||||
|
|
||||||
// NEVER inherit from this class.
|
// NEVER inherit from this class.
|
||||||
struct VideoConfig final
|
struct VideoConfig final
|
||||||
{
|
{
|
||||||
@ -115,8 +108,6 @@ struct VideoConfig final
|
|||||||
std::string sDumpFormat;
|
std::string sDumpFormat;
|
||||||
std::string sDumpPath;
|
std::string sDumpPath;
|
||||||
bool bInternalResolutionFrameDumps;
|
bool bInternalResolutionFrameDumps;
|
||||||
bool bFreeLook;
|
|
||||||
FreelookControlType iFreelookControlType;
|
|
||||||
bool bBorderlessFullscreen;
|
bool bBorderlessFullscreen;
|
||||||
bool bEnableGPUTextureDecoding;
|
bool bEnableGPUTextureDecoding;
|
||||||
int iBitrateKbps;
|
int iBitrateKbps;
|
||||||
|
Reference in New Issue
Block a user