h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 15:47:26 +08:00
Code Issues Releases Wiki Activity

Use new HitObjectStartTimeComparer.

Browse Source
This commit is contained in:
smoogipooo 2017-05-26 18:52:43 +09:00
parent 3ec41a313b
commit e4b59314ea
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 777996fb9731ba1895a5ab1323cbbc97259ff741 Subproject commit ea5a2a7e1abffb1515c020fd017b583b71780316

3
osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs
View File

@ -8,6 +8,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using OpenTK; using OpenTK;
using osu.Game.Beatmaps.ControlPoints; using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Rulesets.Objects;
namespace osu.Game.Rulesets.Mania.Timing namespace osu.Game.Rulesets.Mania.Timing
{ {
@ -28,6 +29,8 @@ namespace osu.Game.Rulesets.Mania.Timing
private readonly List<DrawableControlPoint> drawableControlPoints; private readonly List<DrawableControlPoint> drawableControlPoints;
protected override IComparer<Drawable> DepthComparer => new HitObjectStartTimeComparer();
public ControlPointContainer(IEnumerable<TimingChange> timingChanges) public ControlPointContainer(IEnumerable<TimingChange> timingChanges)
{ {
drawableControlPoints = timingChanges.Select(t => new DrawableControlPoint(t)).ToList(); drawableControlPoints = timingChanges.Select(t => new DrawableControlPoint(t)).ToList();

7
osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
View File

@ -189,12 +189,7 @@ namespace osu.Game.Rulesets.Mania.UI
} }
} }
public override void Add(DrawableHitObject<ManiaHitObject, ManiaJudgement> h) public override void Add(DrawableHitObject<ManiaHitObject, ManiaJudgement> h) => Columns.ElementAt(h.HitObject.Column).Add(h);
{
h.Depth = (float)h.HitObject.StartTime;
Columns.ElementAt(h.HitObject.Column).Add(h);
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{ {