fix: Mutex fixes when animating

Author: shdwmtr

src/animate.cc

@@ -45,41 +45,44 @@ float EaseInOut(float t)
     return t < 0.5f ? 2 * t * t : -1 + (4 - 2 * t) * t;
 }
 
-float EaseInOutFloat(const std::string& id, float lowerBound, float upperBound, bool currentState, float duration)
+namespace
 {
-    struct FloatAnimationState
-    {
-        bool wasHovered = false;
-        bool isAnimating = false;
-        bool isReversing = false;
+struct FloatAnimationState
+{
+    bool wasHovered = false;
+    bool isAnimating = false;
+    bool isReversing = false;
 
-        float elapsedTime = 0.0f;
-        float currentValue = 0.0f;
-        float minValue = 0.0f;
-        float maxValue = 1.0f;
+    float elapsedTime = 0.0f;
+    float currentValue = 0.0f;
+    float minValue = 0.0f;
+    float maxValue = 1.0f;
 
-        float lastXDPI = XDPI, lastYDPI = YDPI;
+    float lastXDPI = XDPI, lastYDPI = YDPI;
 
-        FloatAnimationState() = default;
-        FloatAnimationState(float lower, float upper)
-            : wasHovered(false), isAnimating(false), isReversing(false), elapsedTime(0.0f), currentValue(lower), minValue(lower), maxValue(upper)
-        {
-        }
-    };
+    FloatAnimationState() = default;
+    FloatAnimationState(float lower, float upper)
+        : wasHovered(false), isAnimating(false), isReversing(false), elapsedTime(0.0f), currentValue(lower), minValue(lower), maxValue(upper)
+    {
+    }
+};
 
-    static std::unordered_map<std::string, FloatAnimationState> animations;
-    static std::mutex animationsMutex;
+std::unordered_map<std::string, FloatAnimationState> g_floatAnimations;
+std::mutex g_floatAnimationsMutex;
+} // namespace
 
-    std::lock_guard<std::mutex> lock(animationsMutex);
+float EaseInOutFloat(const std::string& id, float lowerBound, float upperBound, bool currentState, float duration)
+{
+    std::lock_guard<std::mutex> lock(g_floatAnimationsMutex);
 
-    auto it = animations.find(id);
-    if (it == animations.end()) {
-        animations[id] = FloatAnimationState(lowerBound, upperBound);
-        animations[id].currentValue = currentState ? upperBound : lowerBound;
-        animations[id].wasHovered = currentState;
+    auto it = g_floatAnimations.find(id);
+    if (it == g_floatAnimations.end()) {
+        g_floatAnimations[id] = FloatAnimationState(lowerBound, upperBound);
+        g_floatAnimations[id].currentValue = currentState ? upperBound : lowerBound;
+        g_floatAnimations[id].wasHovered = currentState;
     }
 
-    FloatAnimationState& state = animations[id];
+    FloatAnimationState& state = g_floatAnimations[id];
 
     float deltaTime = ImGui::GetIO().DeltaTime;