mirror of
https://github.com/ppy/osu
synced 2024-12-29 18:32:39 +00:00
Merge pull request #10208 from peppy/reduce-all-hitobject-enumerator-complexity
Reduce complexity of AllHitObjects enumerator when nested playfields are not present
This commit is contained in:
commit
6d58973452
@ -37,7 +37,21 @@ namespace osu.Game.Rulesets.UI
|
||||
/// <summary>
|
||||
/// All the <see cref="DrawableHitObject"/>s contained in this <see cref="Playfield"/> and all <see cref="NestedPlayfields"/>.
|
||||
/// </summary>
|
||||
public IEnumerable<DrawableHitObject> AllHitObjects => HitObjectContainer?.Objects.Concat(NestedPlayfields.SelectMany(p => p.AllHitObjects)) ?? Enumerable.Empty<DrawableHitObject>();
|
||||
public IEnumerable<DrawableHitObject> AllHitObjects
|
||||
{
|
||||
get
|
||||
{
|
||||
if (HitObjectContainer == null)
|
||||
return Enumerable.Empty<DrawableHitObject>();
|
||||
|
||||
var enumerable = HitObjectContainer.Objects;
|
||||
|
||||
if (nestedPlayfields.IsValueCreated)
|
||||
enumerable = enumerable.Concat(NestedPlayfields.SelectMany(p => p.AllHitObjects));
|
||||
|
||||
return enumerable;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// All <see cref="Playfield"/>s nested inside this <see cref="Playfield"/>.
|
||||
|
Loading…
Reference in New Issue
Block a user