RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix slider tracking state not restoring correctly in all cases on rewind

This commit is contained in:
Bartłomiej Dach 2024-02-29 11:44:14 +01:00
parent 7b28a66fc0
commit d05b31933f
No known key found for this signature in database
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
View File

@ -5,11 +5,13 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using osu.Game.Screens.Play;
using osuTK; using osuTK;
namespace osu.Game.Rulesets.Osu.Objects.Drawables namespace osu.Game.Rulesets.Osu.Objects.Drawables
@ -21,6 +23,11 @@ public partial class SliderInputManager : Component, IRequireHighFrequencyMouseP
/// </summary> /// </summary>
public bool Tracking { get; private set; } public bool Tracking { get; private set; }
[Resolved]
private IGameplayClock? gameplayClock { get; set; }
private readonly Stack<(double time, bool tracking)> trackingHistory = new Stack<(double, bool)>();
/// <summary> /// <summary>
/// The point in time after which we can accept any key for tracking. Before this time, we may need to restrict tracking to the key used to hit the head circle. /// The point in time after which we can accept any key for tracking. Before this time, we may need to restrict tracking to the key used to hit the head circle.
/// ///
@ -208,6 +215,19 @@ private float getFollowRadius(bool expanded)
/// <param name="isValidTrackingPosition">Whether the current mouse position is valid to begin tracking.</param> /// <param name="isValidTrackingPosition">Whether the current mouse position is valid to begin tracking.</param>
private void updateTracking(bool isValidTrackingPosition) private void updateTracking(bool isValidTrackingPosition)
{ {
if (gameplayClock?.IsRewinding == true)
{
while (trackingHistory.TryPeek(out var historyEntry) && Time.Current < historyEntry.time)
trackingHistory.Pop();
Debug.Assert(trackingHistory.Count > 0);
Tracking = trackingHistory.Peek().tracking;
return;
}
bool wasTracking = Tracking;
// from the point at which the head circle is hit, this will be non-null. // from the point at which the head circle is hit, this will be non-null.
// it may be null if the head circle was missed. // it may be null if the head circle was missed.
OsuAction? headCircleHitAction = getInitialHitAction(); OsuAction? headCircleHitAction = getInitialHitAction();
@ -247,6 +267,9 @@ private void updateTracking(bool isValidTrackingPosition)
&& isValidTrackingPosition && isValidTrackingPosition
// valid action // valid action
&& validTrackingAction; && validTrackingAction;
if (wasTracking != Tracking)
trackingHistory.Push((Time.Current, Tracking));
} }
private OsuAction? getInitialHitAction() => slider.HeadCircle?.HitAction; private OsuAction? getInitialHitAction() => slider.HeadCircle?.HitAction;