RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-17 12:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add remaining time counter

Browse Source
This commit is contained in:
EVAST9919 2017-09-20 19:45:38 +03:00
parent eb93706c26
commit 8d7db52200
1 changed files with 82 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
osu.Game/Screens/Play/BreakOverlay.cs
View File

@ -8,6 +8,9 @@ using osu.Game.Beatmaps.Timing;
using OpenTK; using OpenTK;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Game.Graphics.Sprites;
using System;
using osu.Framework.Timing;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {
@ -18,9 +21,19 @@ namespace osu.Game.Screens.Play
public List<BreakPeriod> Breaks; public List<BreakPeriod> Breaks;
public override IFrameBasedClock Clock
{
set
{
base.Clock = remainingTimeCounter.Clock = value;
}
get { return base.Clock; }
}
private readonly bool letterboxing; private readonly bool letterboxing;
private readonly LetterboxOverlay letterboxOverlay; private readonly LetterboxOverlay letterboxOverlay;
private readonly Container remainingTimeContainer; private readonly Container remainingTimeBox;
private readonly RemainingTimeCounter remainingTimeCounter;
public BreakOverlay(bool letterboxing) public BreakOverlay(bool letterboxing)
{ {
@ -30,7 +43,7 @@ namespace osu.Game.Screens.Play
Children = new Drawable[] Children = new Drawable[]
{ {
letterboxOverlay = new LetterboxOverlay(), letterboxOverlay = new LetterboxOverlay(),
remainingTimeContainer = new Container remainingTimeBox = new Container
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -42,6 +55,12 @@ namespace osu.Game.Screens.Play
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = Color4.White, Colour = Color4.White,
} }
},
remainingTimeCounter = new RemainingTimeCounter
{
Anchor = Anchor.Centre,
Origin = Anchor.BottomCentre,
Margin = new MarginPadding { Bottom = 25 },
} }
}; };
} }
@ -77,12 +96,71 @@ namespace osu.Game.Screens.Play
if (letterboxing) if (letterboxing)
letterboxOverlay.FadeIn(fade_duration); letterboxOverlay.FadeIn(fade_duration);
remainingTimeContainer.ResizeWidthTo(remaining_time_container_max_size, fade_duration, Easing.OutQuint).Then().ResizeWidthTo(0, b.Duration); remainingTimeBox
.ResizeWidthTo(remaining_time_container_max_size, fade_duration, Easing.OutQuint)
.Then()
.ResizeWidthTo(0, b.Duration);
Scheduler.AddDelayed(() => remainingTimeCounter.StartCounting(b.EndTime), b.StartTime - Clock.CurrentTime);
remainingTimeCounter.FadeIn(fade_duration);
} }
private void onBreakOut() private void onBreakOut()
{ {
if (letterboxing) letterboxOverlay.FadeOut(fade_duration); if (letterboxing)
letterboxOverlay.FadeOut(fade_duration);
remainingTimeCounter.FadeOut(fade_duration);
}
private class RemainingTimeCounter : Container
{
private readonly OsuSpriteText counter;
private int? previousSecond;
private double remainingTime;
private bool isCounting;
public RemainingTimeCounter()
{
AutoSizeAxes = Axes.Both;
Alpha = 0;
Child = counter = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
TextSize = 35,
Font = "Venera",
};
}
public void StartCounting(double remainingTime)
{
this.remainingTime = remainingTime;
isCounting = true;
}
protected override void Update()
{
base.Update();
if (isCounting)
{
var currentTime = Clock.CurrentTime;
if (currentTime < remainingTime)
{
int currentSecond = (int)Math.Floor((remainingTime - Clock.CurrentTime) / 1000.0) + 1;
if (currentSecond != previousSecond)
{
counter.Text = currentSecond.ToString();
previousSecond = currentSecond;
}
}
else isCounting = false;
}
}
} }
} }
} }