RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-02 20:32:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split out transition length constants

Browse Source
This commit is contained in:
Dean Herbert 2022-06-02 13:16:31 +09:00
parent 15f8d318eb
commit 060372a129
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Screens/Edit/Timing/TapButton.cs
View File

@ -68,6 +68,8 @@ namespace osu.Game.Screens.Edit.Timing
private const int max_taps_to_consider = 8; private const int max_taps_to_consider = 8;
private const double transition_length = 500;
private readonly List<double> tapTimings = new List<double>(); private readonly List<double> tapTimings = new List<double>();
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -212,15 +214,15 @@ namespace osu.Game.Screens.Edit.Timing
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
hoverLayer.FadeIn(500, Easing.OutQuint); hoverLayer.FadeIn(transition_length, Easing.OutQuint);
textContainer.FadeColour(textColour, 500, Easing.OutQuint); textContainer.FadeColour(textColour, transition_length, Easing.OutQuint);
return true; return true;
} }
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
hoverLayer.FadeOut(500, Easing.OutQuint); hoverLayer.FadeOut(transition_length, Easing.OutQuint);
textContainer.FadeColour(textColour, 500, Easing.OutQuint); textContainer.FadeColour(textColour, transition_length, Easing.OutQuint);
base.OnHoverLost(e); base.OnHoverLost(e);
} }
@ -265,6 +267,7 @@ namespace osu.Game.Screens.Edit.Timing
scaleContainer.ScaleTo(1, out_duration, Easing.OutQuint); scaleContainer.ScaleTo(1, out_duration, Easing.OutQuint);
innerCircle.ScaleTo(1, out_duration, Easing.OutQuint); innerCircle.ScaleTo(1, out_duration, Easing.OutQuint);
innerCircleHighlight.FadeOut(out_duration, Easing.OutQuint); innerCircleHighlight.FadeOut(out_duration, Easing.OutQuint);
resetDelegate = Scheduler.AddDelayed(reset, 1000); resetDelegate = Scheduler.AddDelayed(reset, 1000);
@ -321,9 +324,9 @@ namespace osu.Game.Screens.Edit.Timing
private void reset() private void reset()
{ {
bpmText.FadeOut(500, Easing.OutQuint); bpmText.FadeOut(transition_length, Easing.OutQuint);
using (BeginDelayedSequence(tapTimings.Count > 0 ? 500 : 0)) using (BeginDelayedSequence(tapTimings.Count > 0 ? transition_length : 0))
{ {
Schedule(() => bpmText.Text = "the beat!"); Schedule(() => bpmText.Text = "the beat!");
bpmText.FadeIn(800, Easing.OutQuint); bpmText.FadeIn(800, Easing.OutQuint);