Skip to content

Commit 8d913e8

Browse files
committed
Fix multiple animation inconsistencies pointed out in review
1 parent 794765b commit 8d913e8

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ protected override void Update()
104104
main.Scale = new Vector2(Interpolation.ValueAt(loopCurrentTime, scale_amount, 1f, move_out_duration, move_out_duration + move_in_duration, Easing.Out));
105105

106106
if (loopCurrentTime < move_out_duration)
107-
side.X = Interpolation.ValueAt(loopCurrentTime, 1, move_distance, 0, move_out_duration, Easing.Out);
107+
side.X = Interpolation.ValueAt(loopCurrentTime, 0, move_distance, 0, move_out_duration, Easing.Out);
108108
else
109-
side.X = Interpolation.ValueAt(loopCurrentTime, move_distance, 1f, move_out_duration, move_out_duration + move_in_duration, Easing.Out);
109+
side.X = Interpolation.ValueAt(loopCurrentTime, move_distance, 0, move_out_duration, move_out_duration + move_in_duration, Easing.Out);
110110
}
111111
}
112112
}

osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs

+8-1
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,16 @@ protected override void Update()
9696

9797
double loopCurrentTime = (Time.Current - drawableRepeat.AnimationStartTime.Value) % duration;
9898

99+
// Reference: https://github.com/peppy/osu-stable-reference/blob/2280c4c436f80d04f9c79d3c905db00ac2902273/osu!/GameplayElements/HitObjects/Osu/HitCircleSliderEnd.cs#L79-L96
99100
if (shouldRotate)
101+
{
100102
arrow.Rotation = Interpolation.ValueAt(loopCurrentTime, rotation, -rotation, 0, duration);
101-
arrow.Scale = new Vector2(Interpolation.ValueAt(loopCurrentTime, 1.3f, 1, 0, duration));
103+
arrow.Scale = new Vector2(Interpolation.ValueAt(loopCurrentTime, 1.3f, 1, 0, duration));
104+
}
105+
else
106+
{
107+
arrow.Scale = new Vector2(Interpolation.ValueAt(loopCurrentTime, 1.3f, 1, 0, duration, Easing.Out));
108+
}
102109
}
103110
}
104111

0 commit comments

Comments
 (0)