Merge pull request #7714 from peppy/physically-correct-slider-tracking

Make slider tracking match what is on screen
ppy · Feb 3, 2020 · 0759752 · 0759752
2 parents 9650a4f + d7d6e7b
commit 0759752
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -299,7 +299,7 @@ public void TestTrackingAreaEdge()
             performTest(new List<ReplayFrame>
             {
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
-                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.19f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
+                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.19f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 250 },
                 new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.199f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
 
@@ -320,7 +320,7 @@ public void TestTrackingAreaOutsideEdge()
             performTest(new List<ReplayFrame>
             {
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
-                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.21f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
+                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.21f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 250 },
                 new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.201f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
 

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -24,7 +24,6 @@ public class SliderBall : CircularContainer, ISliderProgress, IRequireHighFreque
 
         private readonly Slider slider;
         private readonly Drawable followCircle;
-        private readonly Drawable trackingArea;
         private readonly DrawableSlider drawableSlider;
 
         public SliderBall(Slider slider, DrawableSlider drawableSlider = null)
@@ -39,13 +38,6 @@ public SliderBall(Slider slider, DrawableSlider drawableSlider = null)
 
             Children = new[]
             {
-                // This is separate from the visible followcircle to ensure consistent internal tracking area (needed to match osu-stable)
-                trackingArea = new CircularContainer
-                {
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both
-                },
                 followCircle = new FollowCircleContainer
                 {
                     Origin = Anchor.Centre,
@@ -103,9 +95,7 @@ private set
 
                 tracking = value;
 
-                // Tracking area is bigger than the visible followcircle and scales instantly to match osu-stable
-                trackingArea.ScaleTo(tracking ? 2.4f : 1f);
-                followCircle.ScaleTo(tracking ? 2f : 1f, 300, Easing.OutQuint);
+                followCircle.ScaleTo(tracking ? 2.4f : 1f, 300, Easing.OutQuint);
                 followCircle.FadeTo(tracking ? 1f : 0, 300, Easing.OutQuint);
             }
         }
@@ -159,7 +149,7 @@ protected override void Update()
                 // in valid time range
                 Time.Current >= slider.StartTime && Time.Current < slider.EndTime &&
                 // in valid position range
-                lastScreenSpaceMousePosition.HasValue && trackingArea.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
+                lastScreenSpaceMousePosition.HasValue && followCircle.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action
                 (actions?.Any(isValidTrackingAction) ?? false);
         }