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

Refactor ArgonSongProgress for same CurrentTime meaning

Browse Source
This commit is contained in:
Andrei Zavatski 2024-01-27 03:03:01 +03:00
parent 9b5b313193
commit 567d2bedbf
3 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Play/HUD/ArgonSongProgress.cs
View File

@ -114,12 +114,8 @@ namespace osu.Game.Screens.Play.HUD
protected override void UpdateProgress(double progress, bool isIntro)
{
bar.TrackTime = GameplayClock.CurrentTime;
if (isIntro)
bar.CurrentTime = 0;
else
bar.CurrentTime = FrameStableClock.CurrentTime;
bar.CurrentTime = GameplayClock.CurrentTime;
bar.Progress = isIntro ? 0 : progress;
}
}
}

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

@ -22,16 +22,16 @@ namespace osu.Game.Screens.Play.HUD
private readonly float barHeight;
private readonly RoundedBar playfieldBar;
private readonly RoundedBar catchupBar;
private readonly RoundedBar audioBar;
private readonly Box background;
private readonly ColourInfo mainColour;
private ColourInfo catchUpColour;
public double TrackTime { private get; set; }
public double Progress { get; set; }
private double length => EndTime - StartTime;
private double trackTime => (EndTime - StartTime) * Progress;
public ArgonSongProgressBar(float barHeight)
{
@ -49,13 +49,12 @@ namespace osu.Game.Screens.Play.HUD
Alpha = 0,
Colour = OsuColour.Gray(0.2f),
},
catchupBar = new RoundedBar
audioBar = new RoundedBar
{
Name = "Audio bar",
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
CornerRadius = 5,
AlwaysPresent = true,
RelativeSizeAxes = Axes.Both
},
playfieldBar = new RoundedBar
@ -70,17 +69,6 @@ namespace osu.Game.Screens.Play.HUD
};
}
private float normalizedReference
{
get
{
if (EndTime - StartTime == 0)
return 1;
return (float)((TrackTime - StartTime) / length);
}
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
@ -113,26 +101,24 @@ namespace osu.Game.Screens.Play.HUD
{
base.Update();
playfieldBar.Length = (float)Interpolation.Lerp(playfieldBar.Length, NormalizedValue, Math.Clamp(Time.Elapsed / 40, 0, 1));
catchupBar.Length = (float)Interpolation.Lerp(catchupBar.Length, normalizedReference, Math.Clamp(Time.Elapsed / 40, 0, 1));
playfieldBar.Length = (float)Interpolation.Lerp(playfieldBar.Length, Progress, Math.Clamp(Time.Elapsed / 40, 0, 1));
audioBar.Length = (float)Interpolation.Lerp(audioBar.Length, NormalizedValue, Math.Clamp(Time.Elapsed / 40, 0, 1));
if (TrackTime < CurrentTime)
ChangeChildDepth(catchupBar, -1);
if (trackTime > CurrentTime)
ChangeChildDepth(audioBar, -1);
else
ChangeChildDepth(catchupBar, 0);
ChangeChildDepth(audioBar, 0);
float timeDelta = (float)(Math.Abs(CurrentTime - TrackTime));
float timeDelta = (float)Math.Abs(CurrentTime - trackTime);
const float colour_transition_threshold = 20000;
catchupBar.AccentColour = Interpolation.ValueAt(
audioBar.AccentColour = Interpolation.ValueAt(
Math.Min(timeDelta, colour_transition_threshold),
mainColour,
catchUpColour,
0, colour_transition_threshold,
Easing.OutQuint);
catchupBar.Alpha = Math.Max(1, catchupBar.Length);
}
private partial class RoundedBar : Container

6
osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
View File

@ -99,11 +99,7 @@ namespace osu.Game.Screens.Play.HUD
protected override void UpdateProgress(double progress, bool isIntro)
{
bar.CurrentTime = GameplayClock.CurrentTime;
if (isIntro)
graph.Progress = 0;
else
graph.Progress = (int)(graph.ColumnCount * progress);
graph.Progress = isIntro ? 0 : (int)(graph.ColumnCount * progress);
}
protected override void Update()