h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 03:52:54 +08:00
Code Issues Releases Wiki Activity

CI fixes.

Browse Source 
Update SpeedAdjustmentCollection.cs
This commit is contained in:
Dan Balasescu 2017-06-16 10:56:33 +09:00 committed by smoogipooo
parent 41c6140435
commit 6bfb716cc6
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Rulesets/Timing/SpeedAdjustmentCollection.cs
View File

@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Timing
protected override IComparer<Drawable> DepthComparer => new SpeedAdjustmentContainerReverseStartTimeComparer(); protected override IComparer<Drawable> DepthComparer => new SpeedAdjustmentContainerReverseStartTimeComparer();
/// <summary> /// <summary>
/// Hit objects that are to be re-processed when <see cref="layout"/> is invalidated. /// Hit objects that are to be re-processed on the next update.
/// </summary> /// </summary>
private readonly Queue<DrawableHitObject> queuedHitObjects = new Queue<DrawableHitObject>(); private readonly Queue<DrawableHitObject> queuedHitObjects = new Queue<DrawableHitObject>();
@ -60,6 +60,9 @@ namespace osu.Game.Rulesets.Timing
{ {
base.Update(); base.Update();
// Todo: At the moment this is going to re-process every single Update, however this will only be a null-op
// when there are no SpeedAdjustmentContainers available. This should probably error or something, but it's okay for now.
// An external count is kept because hit objects that can't be added are re-queued // An external count is kept because hit objects that can't be added are re-queued
int count = queuedHitObjects.Count; int count = queuedHitObjects.Count;
while (count-- > 0) while (count-- > 0)
@ -121,4 +124,4 @@ namespace osu.Game.Rulesets.Timing
} }
} }
} }
} }

5
osu.Game/Rulesets/UI/SpeedAdjustedHitRenderer.cs
View File

@ -1,3 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -98,4 +101,4 @@ namespace osu.Game.Rulesets.UI
/// </summary> /// </summary>
protected abstract void ApplySpeedAdjustments(); protected abstract void ApplySpeedAdjustments();
} }
} }