mirror/UnleashedRecomp-hedge-dev
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-01-05 19:19:43 -06:00
Code Issues Packages Projects Releases 4 Wiki Activity

Implemented hidden config values, removed DLL exports (#112)

Browse Source
This commit is contained in:
Hyper
2025-01-17 19:51:56 +00:00
committed by GitHub
parent d297c07edb
commit 95bd71a23e
11 changed files with 89 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
UnleashedRecomp/user/config.cpp
View File

@@ -15,14 +15,14 @@ void Config::Load()
{
toml::parse_result toml;
std::ifstream tomlStream(configPath);
if (tomlStream.is_open())
{
toml = toml::parse(tomlStream);
}
for (auto def : g_configDefinitions)
{
def->ReadValue(toml);
#if _DEBUG
LOGFN_UTILITY("{} (0x{:X})", def->GetDefinition().c_str(), (intptr_t)def->GetValue());
#endif
@@ -46,6 +46,9 @@ void Config::Save()
for (auto def : g_configDefinitions)
{
if (def->IsHidden())
continue;
auto isFirstSection = section.empty();
auto isDefWithSection = section != def->GetSection();
auto tomlDef = def->GetDefinition(isDefWithSection);

38
UnleashedRecomp/user/config.h
View File

@@ -8,6 +8,7 @@ class IConfigDef
{
public:
virtual ~IConfigDef() = default;
virtual bool IsHidden() = 0;
virtual void ReadValue(toml::v3::ex::parse_result& toml) = 0;
virtual void MakeDefault() = 0;
virtual std::string_view GetSection() const = 0;
@@ -29,6 +30,9 @@ public:
#define CONFIG_DEFINE(section, type, name, defaultValue) \
static inline ConfigDef<type> name{section, #name, defaultValue};
#define CONFIG_DEFINE_HIDDEN(section, type, name, defaultValue) \
static inline ConfigDef<type, true> name{section, #name, defaultValue};
#define CONFIG_DEFINE_LOCALISED(section, type, name, defaultValue) \
static CONFIG_LOCALE g_##name##_locale; \
static inline ConfigDef<type> name{section, #name, &g_##name##_locale, defaultValue};
@@ -267,7 +271,7 @@ CONFIG_DEFINE_ENUM_TEMPLATE(EUIScaleMode)
{ "Center", EUIScaleMode::Centre }
};
template<typename T>
template<typename T, bool isHidden = false>
class ConfigDef final : public IConfigDef
{
public:
@@ -279,9 +283,10 @@ public:
std::unordered_map<std::string, T>* EnumTemplate;
std::map<T, std::string> EnumTemplateReverse{};
CONFIG_ENUM_LOCALE(T)* EnumLocale{};
std::function<void(ConfigDef<T>*)> Callback;
std::function<void(ConfigDef<T>*)> LockCallback;
std::function<void(ConfigDef<T>*)> ApplyCallback;
std::function<void(ConfigDef<T, isHidden>*)> Callback;
std::function<void(ConfigDef<T, isHidden>*)> LockCallback;
std::function<void(ConfigDef<T, isHidden>*)> ApplyCallback;
bool IsLoadedFromConfig{};
// CONFIG_DEFINE
ConfigDef(std::string section, std::string name, T defaultValue) : Section(section), Name(name), DefaultValue(defaultValue)
@@ -314,11 +319,16 @@ public:
}
// CONFIG_DEFINE_CALLBACK
ConfigDef(std::string section, std::string name, T defaultValue, std::function<void(ConfigDef<T>*)> callback) : Section(section), Name(name), DefaultValue(defaultValue), Callback(callback)
ConfigDef(std::string section, std::string name, T defaultValue, std::function<void(ConfigDef<T, isHidden>*)> callback) : Section(section), Name(name), DefaultValue(defaultValue), Callback(callback)
{
g_configDefinitions.emplace_back(this);
}
bool IsHidden() override
{
return isHidden;
}
void ReadValue(toml::v3::ex::parse_result& toml) override
{
if (auto pSection = toml[Section].as_table())
@@ -331,8 +341,9 @@ public:
}
else if constexpr (std::is_enum_v<T>)
{
std::string value = section[Name].value_or(std::string());
auto value = section[Name].value_or(std::string());
auto it = EnumTemplate->find(value);
if (it != EnumTemplate->end())
{
Value = it->second;
@@ -349,6 +360,8 @@ public:
if (Callback)
Callback(this);
IsLoadedFromConfig = true;
}
}
@@ -650,12 +663,13 @@ public:
CONFIG_DEFINE_LOCALISED("Video", bool, XboxColorCorrection, false);
CONFIG_DEFINE_ENUM_LOCALISED("Video", EUIScaleMode, UIScaleMode, EUIScaleMode::Edge);
// TODO: remove these once the exports are implemented.
CONFIG_DEFINE("Exports", bool, AllowCancellingUnleash, false);
CONFIG_DEFINE("Exports", bool, FixUnleashOutOfControlDrain, false);
CONFIG_DEFINE("Exports", bool, HomingAttackOnBoost, true);
CONFIG_DEFINE("Exports", bool, SaveScoreAtCheckpoints, false);
CONFIG_DEFINE("Exports", bool, SkipIntroLogos, false);
CONFIG_DEFINE_HIDDEN("Exports", bool, AllowCancellingUnleash, false);
CONFIG_DEFINE_HIDDEN("Exports", bool, DisableAutoSaveWarning, false);
CONFIG_DEFINE_HIDDEN("Exports", bool, DisableDLCIcon, false);
CONFIG_DEFINE_HIDDEN("Exports", bool, FixUnleashOutOfControlDrain, false);
CONFIG_DEFINE_HIDDEN("Exports", bool, HomingAttackOnBoost, true);
CONFIG_DEFINE_HIDDEN("Exports", bool, SaveScoreAtCheckpoints, false);
CONFIG_DEFINE_HIDDEN("Exports", bool, SkipIntroLogos, false);
static std::filesystem::path GetConfigPath()
{