blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-11-01 08:20:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Inheriting MapSettings and PaletteSettings from SettingsCategory, updating SettingsManager initialization

Browse source
This commit is contained in:
Dan Paulat 2022-12-18 08:44:31 -06:00
parent c93e776137
commit 891b6c839f
14 changed files with 231 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scwx-qt/source/scwx/qt/manager/resource_manager.cpp
View file

@ -1,6 +1,5 @@
#include <scwx/qt/manager/resource_manager.hpp>
#include <scwx/qt/config/county_database.hpp>
#include <scwx/qt/manager/settings_manager.hpp>
#include <scwx/qt/model/imgui_context_model.hpp>
#include <scwx/qt/util/font.hpp>
#include <scwx/qt/util/texture_atlas.hpp>
@ -37,12 +36,8 @@ static void LoadFonts()
util::Font::Create(":/res/fonts/din1451alt.ttf");
util::Font::Create(":/res/fonts/din1451alt_g.ttf");
if (manager::SettingsManager::general_settings()->debug_enabled())
{
ImFontAtlas* fontAtlas =
model::ImGuiContextModel::Instance().font_atlas();
fontAtlas->AddFontDefault();
}
ImFontAtlas* fontAtlas = model::ImGuiContextModel::Instance().font_atlas();
fontAtlas->AddFontDefault();
}
static void LoadTextures()

39
scwx-qt/source/scwx/qt/manager/settings_manager.cpp
View file

@ -20,14 +20,6 @@ namespace SettingsManager
static const std::string logPrefix_ = "scwx::qt::manager::settings_manager";
static const auto logger_ = scwx::util::Logger::Create(logPrefix_);
static const std::string kGeneralKey = "general";
static const std::string kMapKey = "maps";
static const std::string kPaletteKey = "palette";
static std::shared_ptr<settings::GeneralSettings> generalSettings_ = nullptr;
static std::shared_ptr<settings::MapSettings> mapSettings_ = nullptr;
static std::shared_ptr<settings::PaletteSettings> paletteSettings_ = nullptr;
static boost::json::value ConvertSettingsToJson();
static void GenerateDefaultSettings();
static bool LoadSettings(const boost::json::object& settingsJson);
@ -79,18 +71,21 @@ void ReadSettings(const std::string& settingsPath)
};
}
std::shared_ptr<settings::GeneralSettings> general_settings()
settings::GeneralSettings& general_settings()
{
static settings::GeneralSettings generalSettings_;
return generalSettings_;
}
std::shared_ptr<settings::MapSettings> map_settings()
settings::MapSettings& map_settings()
{
static settings::MapSettings mapSettings_;
return mapSettings_;
}
std::shared_ptr<settings::PaletteSettings> palette_settings()
settings::PaletteSettings& palette_settings()
{
static settings::PaletteSettings paletteSettings_;
return paletteSettings_;
}
@ -98,9 +93,9 @@ static boost::json::value ConvertSettingsToJson()
{
boost::json::object settingsJson;
generalSettings_->WriteJson(settingsJson);
settingsJson[kMapKey] = mapSettings_->ToJson();
settingsJson[kPaletteKey] = paletteSettings_->ToJson();
general_settings().WriteJson(settingsJson);
map_settings().WriteJson(settingsJson);
palette_settings().WriteJson(settingsJson);
return settingsJson;
}
@ -109,9 +104,9 @@ static void GenerateDefaultSettings()
{
logger_->info("Generating default settings");
generalSettings_ = std::make_shared<settings::GeneralSettings>();
mapSettings_ = settings::MapSettings::Create();
paletteSettings_ = settings::PaletteSettings::Create();
general_settings().SetDefaults();
map_settings().SetDefaults();
palette_settings().SetDefaults();
}
static bool LoadSettings(const boost::json::object& settingsJson)
@ -120,13 +115,9 @@ static bool LoadSettings(const boost::json::object& settingsJson)
bool jsonDirty = false;
generalSettings_ = std::make_shared<settings::GeneralSettings>();
jsonDirty |= !generalSettings_->ReadJson(settingsJson);
mapSettings_ =
settings::MapSettings::Load(settingsJson.if_contains(kMapKey), jsonDirty);
paletteSettings_ = settings::PaletteSettings::Load(
settingsJson.if_contains(kPaletteKey), jsonDirty);
jsonDirty |= !general_settings().ReadJson(settingsJson);
jsonDirty |= !map_settings().ReadJson(settingsJson);
jsonDirty |= !palette_settings().ReadJson(settingsJson);
return jsonDirty;
}

6
scwx-qt/source/scwx/qt/manager/settings_manager.hpp
View file

@ -16,9 +16,9 @@ namespace SettingsManager
void Initialize();
void ReadSettings(const std::string& settingsPath);
std::shared_ptr<settings::GeneralSettings> general_settings();
std::shared_ptr<settings::MapSettings> map_settings();
std::shared_ptr<settings::PaletteSettings> palette_settings();
settings::GeneralSettings& general_settings();
settings::MapSettings& map_settings();
settings::PaletteSettings& palette_settings();
} // namespace SettingsManager
} // namespace manager