sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Dean Herbert
2017-04-07 15:20:39 +09:00
parent 06776443eb
commit 7e99fc47e2
6 changed files with 423 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
osu.Game/Screens/Play/SongProgress.cs
View File

@ -14,7 +14,9 @@ namespace osu.Game.Screens.Play
public class SongProgress : OverlayContainer
{
private const int progress_height = 5;
private readonly Vector2 handleSize = new Vector2(14, 25);
private static readonly Vector2 handle_size = new Vector2(14, 25);
private const float transition_duration = 200;
private readonly SongProgressBar bar;
@ -22,24 +24,13 @@ namespace osu.Game.Screens.Play
public Action<double> OnSeek;
private double currentTime;
public double CurrentTime
private double progress;
public double Progress
{
get { return currentTime; }
get { return progress; }
set
{
currentTime = value;
updateProgress();
}
}
private double length;
public double Length
{
get { return length; }
set
{
length = value;
progress = value;
updateProgress();
}
}
@ -59,7 +50,7 @@ namespace osu.Game.Screens.Play
public SongProgress()
{
RelativeSizeAxes = Axes.X;
Height = progress_height + SongProgressGraph.Column.HEIGHT + handleSize.Y;
Height = progress_height + SongProgressGraph.Column.HEIGHT + handle_size.Y;
Children = new Drawable[]
{
@ -71,13 +62,13 @@ namespace osu.Game.Screens.Play
Height = SongProgressGraph.Column.HEIGHT,
Margin = new MarginPadding { Bottom = progress_height },
},
bar = new SongProgressBar(progress_height, SongProgressGraph.Column.HEIGHT, handleSize)
bar = new SongProgressBar(progress_height, SongProgressGraph.Column.HEIGHT, handle_size)
{
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
SeekRequested = delegate (float position)
{
OnSeek?.Invoke(Length * position);
OnSeek?.Invoke(position);
},
},
};
@ -85,9 +76,8 @@ namespace osu.Game.Screens.Play
private void updateProgress()
{
float currentProgress = (float)(CurrentTime / Length);
bar.UpdatePosition(currentProgress);
graph.Progress = (int)(graph.ColumnCount * currentProgress);
bar.UpdatePosition((float)progress);
graph.Progress = (int)(graph.ColumnCount * progress);
}
protected override void PopIn()
@ -105,5 +95,12 @@ namespace osu.Game.Screens.Play
bar.FadeOut(transition_duration, EasingTypes.In);
MoveTo(new Vector2(0f, progress_height), transition_duration, EasingTypes.In);
}
protected override void Update()
{
base.Update();
updateProgress();
}
}
}