sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use global index and move it to find if break time

Browse Source 
Avoid using iterations
This commit is contained in:
iiSaLMaN 2019-07-25 12:28:21 +03:00
parent 5a55433d6c
commit cdda264c49
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -30,6 +31,8 @@ namespace osu.Game.Screens.Play
set set
{ {
breaks = value; breaks = value;
currentBreakIndex = 0;
initializeBreaks(); initializeBreaks();
} }
} }
@ -41,6 +44,7 @@ namespace osu.Game.Screens.Play
/// </summary> /// </summary>
public IBindable<bool> IsBreakTime => isBreakTime; public IBindable<bool> IsBreakTime => isBreakTime;
private int currentBreakIndex;
private readonly BindableBool isBreakTime = new BindableBool(); private readonly BindableBool isBreakTime = new BindableBool();
private readonly Container remainingTimeAdjustmentBox; private readonly Container remainingTimeAdjustmentBox;
@ -126,22 +130,30 @@ namespace osu.Game.Screens.Play
private void updateBreakTimeBindable() private void updateBreakTimeBindable()
{ {
if (breaks == null) if (breaks == null || !breaks.Any())
return;
for (int i = 0; i < breaks.Count; i++)
{ {
if (!breaks[i].HasEffect) isBreakTime.Value = false;
continue; return;
if (Clock.CurrentTime >= breaks[i].StartTime && Clock.CurrentTime <= breaks[i].EndTime)
{
isBreakTime.Value = true;
return;
}
} }
isBreakTime.Value = false; int indexDirection = Clock.CurrentTime < breaks[currentBreakIndex].StartTime ? -1 : (Clock.CurrentTime > breaks[currentBreakIndex].EndTime ? 1 : 0);
while (Clock.CurrentTime < breaks[currentBreakIndex].StartTime || Clock.CurrentTime > breaks[currentBreakIndex].EndTime)
{
currentBreakIndex += indexDirection;
if (currentBreakIndex < 0 || currentBreakIndex >= breaks.Count)
break;
}
if (currentBreakIndex < 0 || currentBreakIndex >= breaks.Count)
{
isBreakTime.Value = false;
currentBreakIndex = 0;
return;
}
isBreakTime.Value = true;
} }
private void initializeBreaks() private void initializeBreaks()