From 5bd7cc8bac67797a3a72b34fbeaf82546ffbe568 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Sun, 26 Apr 2020 16:39:46 -0500 Subject: [PATCH] Core: Add freelook camera control type setting --- Source/Core/Core/Config/GraphicsSettings.cpp | 2 ++ Source/Core/Core/Config/GraphicsSettings.h | 2 ++ Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Config/GraphicsSettings.cpp b/Source/Core/Core/Config/GraphicsSettings.cpp index f9186d3fe9..f8755042d7 100644 --- a/Source/Core/Core/Config/GraphicsSettings.cpp +++ b/Source/Core/Core/Config/GraphicsSettings.cpp @@ -41,6 +41,8 @@ const Info GFX_DUMP_EFB_TARGET{{System::GFX, "Settings", "DumpEFBTarget"}, 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 c7daedee27..d70831e21b 100644 --- a/Source/Core/Core/Config/GraphicsSettings.h +++ b/Source/Core/Core/Config/GraphicsSettings.h @@ -11,6 +11,7 @@ enum class AspectMode : int; enum class ShaderCompilationMode : int; enum class StereoMode : int; +enum class FreelookControlType : int; namespace Config { @@ -41,6 +42,7 @@ 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/Core/ConfigLoaders/IsSettingSaveable.cpp b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp index f75fec2f9d..93d1530cdb 100644 --- a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp +++ b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp @@ -28,7 +28,7 @@ bool IsSettingSaveable(const Config::Location& config_location) return true; } - static constexpr std::array s_setting_saveable = { + static constexpr std::array s_setting_saveable = { // Main.Core &Config::MAIN_DEFAULT_ISO.location, @@ -73,6 +73,7 @@ bool IsSettingSaveable(const Config::Location& config_location) &Config::GFX_DUMP_EFB_TARGET.location, &Config::GFX_DUMP_FRAMES_AS_IMAGES.location, &Config::GFX_FREE_LOOK.location, + &Config::GFX_FREE_LOOK_CONTROL_TYPE.location, &Config::GFX_USE_FFV1.location, &Config::GFX_DUMP_FORMAT.location, &Config::GFX_DUMP_CODEC.location,