Reduce Bloom Setting and UI

shiiion · Apr 8, 2021 · 615824c · 615824c
1 parent 35cf0de
commit 615824c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 5 deletions.
diff --git a/Source/Core/Core/Config/GraphicsSettings.cpp b/Source/Core/Core/Config/GraphicsSettings.cpp
@@ -159,6 +159,7 @@ const Info<bool> GFX_PERF_QUERIES_ENABLE{{System::GFX, "GameSpecific", "PerfQuer
 const Info<bool> AUTO_EFB{{System::GFX, "PrimeHack Misc", "AutoEFBMP"}, true};
 const Info<bool> LOCKCAMERA_IN_PUZZLES{{System::GFX, "PrimeHack Misc", "Lock Camera in Motion Puzzles"}, true};
 const Info<bool> DISABLE_BLOOM{{System::GFX, "PrimeHack Misc", "DisableBloom"}, false};
+const Info<bool> REDUCE_BLOOM{{System::GFX, "PrimeHack Misc", "ReduceBloom"}, true};
 const Info<int> FOV{{System::GFX, "PrimeHack Misc", "Field of View"}, 60};
 const Info<bool> TOGGLE_ARM_REPOSITION{{System::GFX, "PrimeHack Misc", "ToggleArmRePosition"}, true};
 const Info<bool> TOGGLE_CULLING{{System::GFX, "PrimeHack Misc", "ToggleCulling"}, false};

diff --git a/Source/Core/Core/Config/GraphicsSettings.h b/Source/Core/Core/Config/GraphicsSettings.h
@@ -131,6 +131,7 @@ extern const Info<bool> GFX_PERF_QUERIES_ENABLE;
 extern const Info<bool> AUTO_EFB;
 extern const Info<bool> LOCKCAMERA_IN_PUZZLES;
 extern const Info<bool> DISABLE_BLOOM;
+extern const Info<bool> REDUCE_BLOOM;
 extern const Info<int> FOV;
 extern const Info<bool> TOGGLE_ARM_REPOSITION;
 extern const Info<bool> TOGGLE_CULLING;

diff --git a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp
@@ -34,7 +34,7 @@ bool IsSettingSaveable(const Config::Location& config_location)
     }
   }
 
-  static constexpr std::array<const Config::Location*, 29> s_setting_saveable = {
+  static constexpr std::array<const Config::Location*, 30> s_setting_saveable = {
       // Main.Core
 
       &Config::MAIN_DEFAULT_ISO.GetLocation(),
@@ -74,6 +74,7 @@ bool IsSettingSaveable(const Config::Location& config_location)
       &Config::ARMPOSITION_FORWARDBACK.GetLocation(),
       &Config::TOGGLE_CULLING.GetLocation(),
       &Config::DISABLE_BLOOM.GetLocation(),
+      &Config::REDUCE_BLOOM.GetLocation(),
       &Config::FOV.GetLocation(),
       &Config::ENABLE_SECONDARY_GUNFX.GetLocation(),
       &Config::GC_SHOW_CROSSHAIR.GetLocation(),

diff --git a/Source/Core/Core/PrimeHack/HackConfig.cpp b/Source/Core/Core/PrimeHack/HackConfig.cpp
@@ -183,6 +183,10 @@ bool GetBloom() {
   return Config::Get(Config::DISABLE_BLOOM);
 }
 
+bool GetReduceBloom() {
+  return Config::Get(Config::REDUCE_BLOOM);
+}
+
 bool GetEnableSecondaryGunFX() {
   return Config::Get(Config::ENABLE_SECONDARY_GUNFX);
 }

diff --git a/Source/Core/Core/PrimeHack/HackConfig.h b/Source/Core/Core/PrimeHack/HackConfig.h
@@ -34,6 +34,7 @@ bool UseMPAutoEFB();
 bool LockCameraInPuzzles();
 bool GetEFBTexture();
 bool GetBloom();
+bool GetReduceBloom();
 
 bool GetNoclip();
 bool GetInvulnerability();

diff --git a/Source/Core/DolphinQt/Config/Graphics/PrimeWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/PrimeWidget.cpp
@@ -53,6 +53,7 @@ void PrimeWidget::CreateWidgets()
 
   m_autoefb = new GraphicsBool(tr("Auto Toggle EFB copies to Texture"), Config::AUTO_EFB);
   m_disable_bloom = new GraphicsBool(tr("Disable Bloom"), Config::DISABLE_BLOOM);
+  m_reduce_bloom = new GraphicsBool(tr("Reduce Bloom [Metroid Prime 3]"), Config::REDUCE_BLOOM);
   m_motions_lock = new GraphicsBool(tr("Lock Camera in Motion Puzzles"), Config::LOCKCAMERA_IN_PUZZLES);
   m_toggle_arm_position = new GraphicsBool(tr("Toggle Viewmodel Adjustment"), Config::TOGGLE_ARM_REPOSITION);
   m_toggle_culling = new GraphicsBool(tr("Disable Culling"), Config::TOGGLE_CULLING);
@@ -63,8 +64,9 @@ void PrimeWidget::CreateWidgets()
   graphics_layout->addWidget(m_motions_lock, 1, 0);
   graphics_layout->addWidget(m_toggle_secondaryFX, 2, 0);
   graphics_layout->addWidget(m_disable_bloom, 3, 0);
-  graphics_layout->addWidget(m_toggle_arm_position, 4, 0);
-  graphics_layout->addWidget(m_toggle_culling, 5, 0);
+  graphics_layout->addWidget(m_reduce_bloom, 4, 0);
+  graphics_layout->addWidget(m_toggle_arm_position, 5, 0);
+  graphics_layout->addWidget(m_toggle_culling, 6, 0);
 
   m_fov_axis = new GraphicsSlider(1, 170, Config::FOV);
   m_fov_axis->setMinimum(1);
@@ -226,8 +228,10 @@ void PrimeWidget::AddDescriptions()
   static const char TR_GUNEFFECTS[] =
     QT_TR_NOOP("Reintroduce the original secondary gun effects that were in the GameCube version of Metroid Prime 1\n"
                 "These effects were disabled and cut in the Trilogy but still remained as unused assets.");
-  static const char TR_BLOOM[] =
+  static const char TR_DISABLE_BLOOM[] =
     QT_TR_NOOP("Disables Bloom.\n\nSource: TheHatedGravity and dreamsyntax.");
+  static const char TR_REDUCE_BLOOM[] =
+    QT_TR_NOOP("Reduces Bloom. Upscaling the resolution massively exaggerates the bloom, especially in Prime 3. This option fixes this.");
   static const char TR_TOGGLE_ARM_POSITION[] =
     QT_TR_NOOP("Toggles repositioning of Samus's arms in the viewmodel. Repositioning her arms is visually beneficial for high Field Of Views.");
   static const char TR_TOGGLE_CULL[] =
@@ -253,7 +257,8 @@ void PrimeWidget::AddDescriptions()
   m_autoefb->SetDescription(tr(TR_AUTO_EFB));
   m_motions_lock->SetDescription(tr(TR_MOTION_LOCK));
   m_toggle_secondaryFX->SetDescription(tr(TR_GUNEFFECTS));
-  m_disable_bloom->SetDescription(tr(TR_BLOOM));
+  m_disable_bloom->SetDescription(tr(TR_DISABLE_BLOOM));
+  m_reduce_bloom->SetDescription(tr(TR_REDUCE_BLOOM));
   m_toggle_culling->SetDescription(tr(TR_TOGGLE_CULL));
   m_toggle_arm_position->SetDescription(tr(TR_TOGGLE_ARM_POSITION));
   m_manual_arm_position->SetDescription(tr(TR_MANUAL_POSITION));

diff --git a/Source/Core/DolphinQt/Config/Graphics/PrimeWidget.h b/Source/Core/DolphinQt/Config/Graphics/PrimeWidget.h
@@ -34,6 +34,7 @@ class PrimeWidget final : public GraphicsWidget
 
   // Misc
   GraphicsBool* m_disable_bloom;
+  GraphicsBool* m_reduce_bloom;
   GraphicsBool* m_motions_lock;
   GraphicsBool* m_autoefb;
   GraphicsBool* m_toggle_culling;