1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 19:04:06 +08:00

Fix slider ball facing incorrect direction during rewinding in editor

Closes https://github.com/ppy/osu/issues/20648.
This commit is contained in:
Dean Herbert 2022-10-10 15:24:17 +09:00
parent 26a473e85e
commit 33620b7bd6

View File

@ -186,17 +186,22 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
private Vector2? lastPosition; private Vector2? lastPosition;
private bool rewinding;
public void UpdateProgress(double completionProgress) public void UpdateProgress(double completionProgress)
{ {
Position = drawableSlider.HitObject.CurvePositionAt(completionProgress); Position = drawableSlider.HitObject.CurvePositionAt(completionProgress);
var diff = lastPosition.HasValue ? lastPosition.Value - Position : Position - drawableSlider.HitObject.CurvePositionAt(completionProgress + 0.01f); var diff = lastPosition.HasValue ? lastPosition.Value - Position : Position - drawableSlider.HitObject.CurvePositionAt(completionProgress + 0.01f);
if (Clock.ElapsedFrameTime != 0)
rewinding = Clock.ElapsedFrameTime < 0;
// Ensure the value is substantially high enough to allow for Atan2 to get a valid angle. // Ensure the value is substantially high enough to allow for Atan2 to get a valid angle.
if (diff.LengthFast < 0.01f) if (diff.LengthFast < 0.01f)
return; return;
ball.Rotation = -90 + (float)(-Math.Atan2(diff.X, diff.Y) * 180 / Math.PI); ball.Rotation = -90 + (float)(-Math.Atan2(diff.X, diff.Y) * 180 / Math.PI) + (rewinding ? 180 : 0);
lastPosition = Position; lastPosition = Position;
} }
} }