1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 08:22:56 +08:00

Order hitobjects by endtime

This commit is contained in:
Naxess 2021-06-27 01:25:03 +02:00
parent 4796b1b208
commit 0c0fd291d9

View File

@ -55,18 +55,23 @@ namespace osu.Game.Rulesets.Edit.Checks
objectsWithoutHitsounds = 0; objectsWithoutHitsounds = 0;
lastHitsoundTime = context.Beatmap.HitObjects.First().StartTime; lastHitsoundTime = context.Beatmap.HitObjects.First().StartTime;
var hitObjectCount = context.Beatmap.HitObjects.Count; var hitObjectsIncludingNested = new List<HitObject>();
foreach (var hitObject in context.Beatmap.HitObjects)
{
// Samples play on the end of objects. Some objects have nested objects to accomplish playing them elsewhere (e.g. slider head/repeat).
foreach (var nestedHitObject in hitObject.NestedHitObjects)
hitObjectsIncludingNested.Add(nestedHitObject);
hitObjectsIncludingNested.Add(hitObject);
}
var hitObjectsByEndTime = hitObjectsIncludingNested.OrderBy(o => o.GetEndTime()).ToList();
var hitObjectCount = hitObjectsByEndTime.Count;
for (int i = 0; i < hitObjectCount; ++i) for (int i = 0; i < hitObjectCount; ++i)
{ {
var hitObject = context.Beatmap.HitObjects[i]; var hitObject = hitObjectsByEndTime[i];
// Samples play on the end of objects. Some objects have nested objects to accomplish playing them elsewhere (e.g. slider head/repeat).
foreach (var nestedHitObject in hitObject.NestedHitObjects)
{
foreach (var issue in applyHitsoundUpdate(nestedHitObject))
yield return issue;
}
// This is used to perform an update at the end so that the period after the last hitsounded object can be an issue. // This is used to perform an update at the end so that the period after the last hitsounded object can be an issue.
bool isLastObject = i == hitObjectCount - 1; bool isLastObject = i == hitObjectCount - 1;