From e2886132d9f5b37c361121325d796ee5c28f96b8 Mon Sep 17 00:00:00 2001 From: lat9nq Date: Tue, 23 Jun 2020 16:05:07 -0400 Subject: [PATCH] address comments and style issues --- src/core/settings.cpp | 4 +--- src/core/settings.h | 14 ++++++++++---- src/video_core/video_core.cpp | 2 +- src/yuzu/bootmanager.cpp | 2 +- src/yuzu/configuration/config.cpp | 5 +++-- src/yuzu/configuration/configuration_shared.cpp | 17 +++++++++-------- src/yuzu/configuration/configure_audio.cpp | 3 ++- src/yuzu/configuration/configure_general.cpp | 6 ++++-- src/yuzu/configuration/configure_graphics.cpp | 6 ++++-- .../configure_graphics_advanced.cpp | 3 ++- src/yuzu/configuration/configure_system.cpp | 17 ++++++++++------- 11 files changed, 47 insertions(+), 32 deletions(-) diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 1083579047..a8df6acc4f 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -2,8 +2,6 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include - #include "common/file_util.h" #include "core/core.h" #include "core/gdbstub/gdbstub.h" @@ -63,7 +61,7 @@ const std::array mapping = {{ }}; } -Values values; +Values values = {}; bool configuring_global = true; std::string GetTimeZoneString() { diff --git a/src/core/settings.h b/src/core/settings.h index d7674793fd..132ad79d3e 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -390,6 +390,10 @@ public: Setting() { use_global = true; } + Setting(Type val) { + use_global = true; + global = val; + } ~Setting() = default; void SetGlobal(bool to_global) { use_global = to_global; @@ -398,15 +402,17 @@ public: return use_global; }; Type GetValue() const { - if (use_global) + if (use_global) { return global; + } return local; }; void SetValue(const Type& value) { - if (use_global) + if (use_global) { global = value; - else + } else { local = value; + } }; operator Type() const { return GetValue(); @@ -441,7 +447,7 @@ struct Values { Setting renderer_debug; Setting vulkan_device; - Setting resolution_factor; + Setting resolution_factor = Setting(static_cast(1)); Setting aspect_ratio; Setting max_anisotropy; Setting use_frame_limit; diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index f60bdc60a5..c30ad34795 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -52,7 +52,7 @@ std::unique_ptr CreateGPU(Core::Frontend::EmuWindow& emu_window, Cor u16 GetResolutionScaleFactor(const RendererBase& renderer) { return static_cast( Settings::values.resolution_factor != 0 - ? Settings::values.resolution_factor + ? Settings::values.resolution_factor.GetValue() : renderer.GetRenderWindow().GetFramebufferLayout().GetScalingRatio()); } diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 4bfce48a4b..e4ff6b0689 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -145,7 +145,7 @@ public: // disable vsync for any shared contexts auto format = share_context->format(); - format.setSwapInterval(main_surface ? Settings::values.use_vsync : 0); + format.setSwapInterval(main_surface ? Settings::values.use_vsync.GetValue() : 0); context = std::make_unique(); context->setShareContext(share_context); diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index f5a7a919a4..0865fbff0b 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -24,8 +24,9 @@ Config::Config(const std::string& config_file, bool is_global) { } Config::~Config() { - if (global) + if (global) { Save(); + } } const std::array Config::default_buttons = { @@ -640,7 +641,7 @@ void Config::ReadRendererValues() { Settings::values.max_anisotropy = ReadSetting(QStringLiteral("max_anisotropy"), 0).toInt(); Settings::values.use_frame_limit = ReadSetting(QStringLiteral("use_frame_limit"), true).toBool(); - Settings::values.frame_limit = ReadSetting(QStringLiteral("frame_limit"), 100).toInt(); + Settings::values.frame_limit = ReadSetting(QStringLiteral("frame_limit"), 100).toUInt(); Settings::values.use_disk_shader_cache = ReadSetting(QStringLiteral("use_disk_shader_cache"), true).toBool(); const int gpu_accuracy_level = ReadSetting(QStringLiteral("gpu_accuracy"), 0).toInt(); diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp index 34d7f59188..80d2c9c334 100644 --- a/src/yuzu/configuration/configuration_shared.cpp +++ b/src/yuzu/configuration/configuration_shared.cpp @@ -9,9 +9,9 @@ void ConfigurationShared::ApplyPerGameSetting(Settings::Setting* setting, const QCheckBox* checkbox) { - if (checkbox->checkState() == Qt::PartiallyChecked) + if (checkbox->checkState() == Qt::PartiallyChecked) { setting->SetGlobal(true); - else { + } else { setting->SetGlobal(false); setting->SetValue(checkbox->checkState() == Qt::Checked); } @@ -19,9 +19,9 @@ void ConfigurationShared::ApplyPerGameSetting(Settings::Setting* setting, void ConfigurationShared::ApplyPerGameSetting(Settings::Setting* setting, const QComboBox* combobox) { - if (combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) + if (combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) { setting->SetGlobal(true); - else { + } else { setting->SetGlobal(false); setting->SetValue(combobox->currentIndex() - ConfigurationShared::USE_GLOBAL_OFFSET); } @@ -29,9 +29,9 @@ void ConfigurationShared::ApplyPerGameSetting(Settings::Setting* setting, void ConfigurationShared::ApplyPerGameSetting(Settings::Setting* setting, const QComboBox* combobox) { - if (combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) + if (combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) { setting->SetGlobal(true); - else { + } else { setting->SetGlobal(false); setting->SetValue(static_cast( combobox->currentIndex() - ConfigurationShared::USE_GLOBAL_OFFSET)); @@ -40,10 +40,11 @@ void ConfigurationShared::ApplyPerGameSetting(Settings::Setting* setting) { - if (setting->UsingGlobal()) + if (setting->UsingGlobal()) { checkbox->setCheckState(Qt::PartiallyChecked); - else + } else { checkbox->setCheckState(setting->GetValue() ? Qt::Checked : Qt::Unchecked); + } } void ConfigurationShared::SetPerGameSetting(QComboBox* combobox, diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp index 2caad91524..e2bab019cd 100644 --- a/src/yuzu/configuration/configure_audio.cpp +++ b/src/yuzu/configuration/configure_audio.cpp @@ -155,8 +155,9 @@ void ConfigureAudio::RetranslateUI() { } void ConfigureAudio::SetupPerGameUI() { - if (Settings::configuring_global) + if (Settings::configuring_global) { return; + } connect(ui->volume_combo_box, static_cast(&QComboBox::activated), this, [this](int index) { ui->volume_slider->setEnabled(index == 1); }); diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 4a36ac0014..44d049722a 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp @@ -39,8 +39,9 @@ void ConfigureGeneral::SetConfiguration() { ui->toggle_frame_limit->setChecked(Settings::values.use_frame_limit); ui->frame_limit->setValue(Settings::values.frame_limit); - if (!Settings::configuring_global && Settings::values.use_frame_limit.UsingGlobal()) + if (!Settings::configuring_global && Settings::values.use_frame_limit.UsingGlobal()) { ui->toggle_frame_limit->setCheckState(Qt::PartiallyChecked); + } ui->frame_limit->setEnabled(ui->toggle_frame_limit->checkState() == Qt::Checked); } @@ -80,8 +81,9 @@ void ConfigureGeneral::RetranslateUI() { } void ConfigureGeneral::SetupPerGameUI() { - if (Settings::configuring_global) + if (Settings::configuring_global) { return; + } ui->toggle_check_exit->setVisible(false); ui->toggle_user_on_boot->setVisible(false); diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index b6f3f1b2eb..affd28ded3 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -183,8 +183,9 @@ void ConfigureGraphics::RetrieveVulkanDevices() { } Settings::RendererBackend ConfigureGraphics::GetCurrentGraphicsBackend() const { - if (Settings::configuring_global) + if (Settings::configuring_global) { return static_cast(ui->api->currentIndex()); + } if (ui->api->currentIndex() == 0) { Settings::values.renderer_backend.SetGlobal(true); @@ -195,8 +196,9 @@ Settings::RendererBackend ConfigureGraphics::GetCurrentGraphicsBackend() const { } void ConfigureGraphics::SetupPerGameUI() { - if (Settings::configuring_global) + if (Settings::configuring_global) { return; + } connect(ui->bg_combobox, static_cast(&QComboBox::activated), this, [this](int index) { ui->bg_button->setEnabled(index == 1); }); diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index ae4bc3d1d8..d5f827ee8a 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -96,8 +96,9 @@ void ConfigureGraphicsAdvanced::RetranslateUI() { } void ConfigureGraphicsAdvanced::SetupPerGameUI() { - if (Settings::configuring_global) + if (Settings::configuring_global) { return; + } ConfigurationShared::InsertGlobalItem(ui->gpu_accuracy); ui->use_vsync->setTristate(true); diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index c967f1ccb0..483576b4cd 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -88,22 +88,24 @@ void ConfigureSystem::SetConfiguration() { &Settings::values.time_zone_index); ConfigurationShared::SetPerGameSetting(ui->combo_sound, &Settings::values.sound_index); - if (Settings::values.rng_seed.UsingGlobal()) + if (Settings::values.rng_seed.UsingGlobal()) { ui->rng_seed_checkbox->setCheckState(Qt::PartiallyChecked); - else { + } else { ui->rng_seed_checkbox->setCheckState( Settings::values.rng_seed.GetValue().has_value() ? Qt::Checked : Qt::Unchecked); - if (Settings::values.rng_seed.GetValue().has_value()) + if (Settings::values.rng_seed.GetValue().has_value()) { ui->rng_seed_edit->setText(rng_seed); + } } - if (Settings::values.custom_rtc.UsingGlobal()) + if (Settings::values.custom_rtc.UsingGlobal()) { ui->custom_rtc_checkbox->setCheckState(Qt::PartiallyChecked); - else { + } else { ui->custom_rtc_checkbox->setCheckState( Settings::values.custom_rtc.GetValue().has_value() ? Qt::Checked : Qt::Unchecked); - if (Settings::values.custom_rtc.GetValue().has_value()) + if (Settings::values.custom_rtc.GetValue().has_value()) { ui->custom_rtc_edit->setDateTime(QDateTime::fromSecsSinceEpoch(rtc_time.count())); + } } } } @@ -190,8 +192,9 @@ void ConfigureSystem::RefreshConsoleID() { } void ConfigureSystem::SetupPerGameUI() { - if (Settings::configuring_global) + if (Settings::configuring_global) { return; + } ConfigurationShared::InsertGlobalItem(ui->combo_language); ConfigurationShared::InsertGlobalItem(ui->combo_region);