Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MarathonRecomp/patches/video_patches.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,5 @@ void FurtherObjectShadows(PPCRegister& scope)

bool DisableRadialBlur()
{
return Config::DisableRadialBlur;
return Config::RadialBlur == ERadialBlur::Off;
}
6 changes: 6 additions & 0 deletions MarathonRecomp/user/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
6 changes: 6 additions & 0 deletions MarathonRecomp/user/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ enum class EReflectionResolution : int32_t
Full
};

enum class ERadialBlur : uint32_t
{
Off,
Original
};

enum class ECutsceneAspectRatio : uint32_t
{
Original,
Expand Down
3 changes: 2 additions & 1 deletion MarathonRecomp/user/config_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Loading