h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 11:42:56 +08:00
Code Issues Releases Wiki Activity

Include combo information when determining ordering if available

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-09-26 15:52:25 +02:00
parent a86b9893ac
commit 6dc3e66c93
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Edit; using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types;
namespace osu.Game.Screens.Edit.Compose.Components namespace osu.Game.Screens.Edit.Compose.Components
{ {
@ -45,13 +46,23 @@ namespace osu.Game.Screens.Edit.Compose.Components
// Put earlier blueprints towards the end of the list, so they handle input first // Put earlier blueprints towards the end of the list, so they handle input first
int i = yObj.Item.StartTime.CompareTo(xObj.Item.StartTime); int i = yObj.Item.StartTime.CompareTo(xObj.Item.StartTime);
if (i != 0) return i; if (i != 0) return i;
// Fall back to end time if the start time is equal. // Fall back to end time if the start time is equal.
i = yObj.Item.GetEndTime().CompareTo(xObj.Item.GetEndTime()); i = yObj.Item.GetEndTime().CompareTo(xObj.Item.GetEndTime());
if (i != 0) return i;
return i == 0 ? CompareReverseChildID(y, x) : i; // As a final fallback, use combo information if available.
if (xObj.Item is IHasComboInformation xHasCombo && yObj.Item is IHasComboInformation yHasCombo)
{
i = yHasCombo.ComboIndex.CompareTo(xHasCombo.ComboIndex);
if (i != 0) return i;
i = yHasCombo.IndexInCurrentCombo.CompareTo(xHasCombo.IndexInCurrentCombo);
if (i != 0) return i;
}
return CompareReverseChildID(y, x);
} }
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)