Merge branch 'main' into feature/time-stones

include/dusk/config_var.hpp

@@ -146,6 +146,12 @@ concept ConfigValue =
 template <ConfigValue T>
 const ConfigImplBase* GetConfigImpl();
 
+template <typename T>
+struct ConfigEnumRange {
+    static constexpr auto min = std::numeric_limits<std::underlying_type_t<T>>::min();
+    static constexpr auto max = std::numeric_limits<std::underlying_type_t<T>>::max();
+};
+
 /**
  * \brief A CVar storing values.
  *
@@ -189,6 +195,11 @@ public:
         }
     }
 
+    [[nodiscard]] constexpr const T& getDefaultValue() const noexcept {
+        checkRegistered();
+        return defaultValue;
+    }
+
     /**
      * \brief Change the value of a CVar.
      *

include/dusk/settings.h

@@ -7,6 +7,20 @@ namespace dusk {
 
 using namespace config;
 
+enum class BloomMode : int {
+    Off = 0,
+    Classic = 1,
+    Dusk = 2,
+};
+
+namespace config {
+template <>
+struct ConfigEnumRange<BloomMode> {
+    static constexpr auto min = BloomMode::Off;
+    static constexpr auto max = BloomMode::Dusk;
+};
+}
+
 // Persistent user settings
 
 struct UserSettings {
@@ -54,7 +68,7 @@ struct UserSettings {
         ConfigVar<bool> invertCameraXAxis;
 
         // Graphics
-        ConfigVar<bool> enableBloom;
+        ConfigVar<BloomMode> bloomMode;
         ConfigVar<bool> enableWaterRefraction;
         ConfigVar<bool> enableFrameInterpolation;
         ConfigVar<int> shadowResolutionMultiplier;