aw man

Author: BlueWitherer

changelog.md

@@ -1,3 +1,6 @@
+# v1.2.2 
+- Fix visual bug with fading color progress bars
+
 # v1.2.1 
 - Raised *Inversed Inputs* option Silly Tier to **Medium**
 - Raised *Size Changer* option Silly Tier to **Medium**

src/util/Themes.hpp

@@ -18,21 +18,27 @@ namespace horrible {
         inline constexpr cocos2d::ccColor3B gold = {255, 200, 150};
         inline constexpr cocos2d::ccColor3B black = {0, 0, 0};
 
-        inline constexpr cocos2d::ccColor3B lerpColor(cocos2d::ccColor3B const& a, cocos2d::ccColor3B const& b, float t) noexcept {
-            return {
-                static_cast<GLubyte>(a.r + (b.r - a.r) * t),
-                static_cast<GLubyte>(a.g + (b.g - a.g) * t),
-                static_cast<GLubyte>(a.b + (b.b - a.b) * t),
+        namespace internal {
+
+            inline constexpr cocos2d::ccColor3B lerpColor(cocos2d::ccColor3B const& a, cocos2d::ccColor3B const& b, float t) noexcept {
+                return {
+                    static_cast<GLubyte>(a.r + (b.r - a.r) * t),
+                    static_cast<GLubyte>(a.g + (b.g - a.g) * t),
+                    static_cast<GLubyte>(a.b + (b.b - a.b) * t),
+                };
             };
         };
 
         inline constexpr cocos2d::ccColor3B fadeColor(float value) noexcept {
+            if (value > 100.f) value = 100.f;
+            if (value < 0.f) value = 0.f;
+
             if (value <= 50.0f) {
-                float t = value / 50.0f;
-                return lerpColor(red, yellow, t);
+                auto t = value / 50.0f;
+                return internal::lerpColor(red, yellow, t);
             } else {
-                float t = (value - 50.0f) / 50.0f;
-                return lerpColor(yellow, green, t);
+                auto t = (value - 50.0f) / 50.0f;
+                return internal::lerpColor(yellow, green, t);
             };
         };
     };