diff --git a/MarathonRecomp/patches/video_patches.cpp b/MarathonRecomp/patches/video_patches.cpp index 2ffef4b2c..6b6dd8421 100644 --- a/MarathonRecomp/patches/video_patches.cpp +++ b/MarathonRecomp/patches/video_patches.cpp @@ -111,5 +111,5 @@ void FurtherObjectShadows(PPCRegister& scope) bool DisableRadialBlur() { - return Config::DisableRadialBlur; + return Config::RadialBlur == ERadialBlur::Off; } diff --git a/MarathonRecomp/user/config.cpp b/MarathonRecomp/user/config.cpp index bfbfc8585..24b59bab1 100644 --- a/MarathonRecomp/user/config.cpp +++ b/MarathonRecomp/user/config.cpp @@ -313,6 +313,12 @@ CONFIG_DEFINE_ENUM_TEMPLATE(EWindowState) { "Maximized", EWindowState::Maximised } }; +CONFIG_DEFINE_ENUM_TEMPLATE(ERadialBlur) +{ + { "Off", ERadialBlur::Off }, + { "Original", ERadialBlur::Original }, +}; + CONFIG_DEFINE_ENUM_TEMPLATE(EAspectRatio) { { "Auto", EAspectRatio::Auto }, diff --git a/MarathonRecomp/user/config.h b/MarathonRecomp/user/config.h index c330ddbea..a46463b59 100644 --- a/MarathonRecomp/user/config.h +++ b/MarathonRecomp/user/config.h @@ -120,6 +120,12 @@ enum class EReflectionResolution : int32_t Full }; +enum class ERadialBlur : uint32_t +{ + Off, + Original +}; + enum class ECutsceneAspectRatio : uint32_t { Original, diff --git a/MarathonRecomp/user/config_def.h b/MarathonRecomp/user/config_def.h index 7c3851c30..7cd66ba08 100644 --- a/MarathonRecomp/user/config_def.h +++ b/MarathonRecomp/user/config_def.h @@ -53,6 +53,8 @@ CONFIG_DEFINE("Video", int32_t, WindowWidth, 1280); CONFIG_DEFINE("Video", int32_t, WindowHeight, 720); CONFIG_DEFINE_ENUM("Video", EWindowState, WindowState, EWindowState::Normal); CONFIG_DEFINE_LOCALISED("Video", int32_t, Monitor, 0); +// TODO: Localise this enum +CONFIG_DEFINE_ENUM("Video", ERadialBlur, RadialBlur, ERadialBlur::Original); CONFIG_DEFINE_ENUM_LOCALISED("Video", EAspectRatio, AspectRatio, EAspectRatio::Auto); CONFIG_DEFINE_LOCALISED("Video", float, ResolutionScale, 1.0f); CONFIG_DEFINE_LOCALISED("Video", bool, Fullscreen, true); @@ -82,6 +84,5 @@ CONFIG_DEFINE_HIDDEN("Codes", bool, DisableEdgeGrabLeftover, false); CONFIG_DEFINE_HIDDEN("Codes", bool, TailsGauge, false); CONFIG_DEFINE_HIDDEN("Codes", bool, MidairControlForMachSpeed, false); CONFIG_DEFINE_HIDDEN("Codes", bool, MidairControlForSnowboards, false); -CONFIG_DEFINE_HIDDEN("Codes", bool, DisableRadialBlur, false); CONFIG_DEFINE("Update", time_t, LastChecked, 0);