Merge pull request ppy#18238 from peppy/fix-slider-ball-rotation

Fix slider ball rotation becoming undefined when time is not flowing smoothly
Lawtrohux · May 12, 2022 · b48308e · b48308e
2 parents 5f2d9bf + c4854d4
commit b48308e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
@@ -195,16 +195,16 @@ private bool isValidTrackingAction(OsuAction action)
 
         public void UpdateProgress(double completionProgress)
         {
-            var newPos = drawableSlider.HitObject.CurvePositionAt(completionProgress);
+            Position = drawableSlider.HitObject.CurvePositionAt(completionProgress);
 
-            var diff = lastPosition.HasValue ? lastPosition.Value - newPos : newPos - drawableSlider.HitObject.CurvePositionAt(completionProgress + 0.01f);
-            if (diff == Vector2.Zero)
+            var diff = lastPosition.HasValue ? lastPosition.Value - Position : Position - drawableSlider.HitObject.CurvePositionAt(completionProgress + 0.01f);
+
+            // Ensure the value is substantially high enough to allow for Atan2 to get a valid angle.
+            if (diff.LengthFast < 0.01f)
                 return;
 
-            Position = newPos;
             ball.Rotation = -90 + (float)(-Math.Atan2(diff.X, diff.Y) * 180 / Math.PI);
-
-            lastPosition = newPos;
+            lastPosition = Position;
         }
 
         private class FollowCircleContainer : CircularContainer