h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 11:35:35 +08:00
Code Issues Releases Wiki Activity

Simplify depth change logic

Browse Source
This commit is contained in:
Dean Herbert 2023-01-18 16:38:21 +09:00
parent 17c35cf811
commit f3677ab33d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/Play/HUD/ArgonSongProgressBar.cs
View File

@ -22,7 +22,6 @@ namespace osu.Game.Screens.Play.HUD
public partial class ArgonSongProgressBar : SliderBar<double>
{
private readonly float baseHeight;
private readonly float catchupBaseDepth;
private readonly RoundedBar playfieldBar;
private readonly RoundedBar catchupBar;
@ -118,7 +117,7 @@ namespace osu.Game.Screens.Play.HUD
RelativeSizeAxes = Axes.Both
},
};
catchupBaseDepth = catchupBar.Depth;
mainColourDarkened = Colour4.White.Darken(1 / 3f);
}
@ -184,9 +183,9 @@ namespace osu.Game.Screens.Play.HUD
catchupBar.Length = (float)Interpolation.Lerp(catchupBar.Length, normalizedReference, Math.Clamp(Time.Elapsed / 40, 0, 1));
if (TrackTime < CurrentTime)
ChangeChildDepth(catchupBar, playfieldBar.Depth - 0.1f);
ChangeChildDepth(catchupBar, -1);
else
ChangeChildDepth(catchupBar, catchupBaseDepth);
ChangeChildDepth(catchupBar, 0);
float timeDelta = (float)(Math.Abs(CurrentTime - TrackTime));
catchupBar.Alpha = MathHelper.Clamp(timeDelta, 0, alpha_threshold) / alpha_threshold;