h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:02:55 +08:00
Code Issues Releases Wiki Activity

Merge branch 'nested-hitobject-pooling' into osu-hitobject-pooling

Browse Source
This commit is contained in:
smoogipoo 2020-11-12 18:10:34 +09:00
commit 57ca192c8e
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Rulesets/UI/HitObjectContainer.cs
View File

@ -57,6 +57,14 @@ namespace osu.Game.Rulesets.UI
lifetimeManager.EntryBecameDead += entryBecameDead; lifetimeManager.EntryBecameDead += entryBecameDead;
} }
protected override void LoadAsyncComplete()
{
base.LoadAsyncComplete();
// Application of hitobjects during load() may have changed their start times, so ensure the correct sorting order.
SortInternal();
}
#region Pooling support #region Pooling support
public void Add(HitObjectLifetimeEntry entry) => lifetimeManager.AddEntry(entry); public void Add(HitObjectLifetimeEntry entry) => lifetimeManager.AddEntry(entry);
@ -163,7 +171,12 @@ namespace osu.Game.Rulesets.UI
private void bindStartTime(DrawableHitObject hitObject) private void bindStartTime(DrawableHitObject hitObject)
{ {
var bindable = hitObject.StartTimeBindable.GetBoundCopy(); var bindable = hitObject.StartTimeBindable.GetBoundCopy();
bindable.BindValueChanged(_ => SortInternal());
bindable.BindValueChanged(_ =>
{
if (LoadState >= LoadState.Ready)
SortInternal();
});
startTimeMap[hitObject] = bindable; startTimeMap[hitObject] = bindable;
} }