h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 07:23:14 +08:00
Code Issues Releases Wiki Activity

Delay lifetime computation until loaded

Browse Source
This commit is contained in:
ekrctb 2020-11-24 16:46:10 +09:00
parent d5f082e5fb
commit 7f6e4d5b21
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
private readonly HashSet<DrawableHitObject> layoutComputedHitObjects = new HashSet<DrawableHitObject>();
// Used to recompute all lifetime when `layoutCache` becomes invalid
private readonly HashSet<DrawableHitObject> lifetimeComputedHitObjects = new HashSet<DrawableHitObject>();
private readonly HashSet<DrawableHitObject> allHitObjects = new HashSet<DrawableHitObject>();
[Resolved]
private IScrollingInfo scrollingInfo { get; set; }
@ -150,18 +150,19 @@ namespace osu.Game.Rulesets.UI.Scrolling
/// </summary>
public void InvalidateDrawableHitObject(DrawableHitObject hitObject)
{
// Lifetime is computed once early and
// layout (Width/Height if `IHasDuration`, and nested object positions) will be computed when the object becomes alive.
// An assumption is that a hit object layout update (setting `Height` or `Width`) won't affect its lifetime.
// This is satisfied in practice because otherwise the hit object won't be aligned to its `StartTime`.
hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
// Lifetime computation is delayed to the next update because `scrollLength` may not be valid here.
// Layout computation will be delayed to when the object becomes alive.
// An assumption is that a hit object layout update (setting `Height` or `Width`) won't affect its lifetime but
// this is satisfied in practice because otherwise the hit object won't be aligned to its `StartTime`.
layoutCache.Invalidate();
allHitObjects.Add(hitObject);
lifetimeComputedHitObjects.Add(hitObject);
layoutComputedHitObjects.Remove(hitObject);
}
// Use a nonzero value to prevent infinite results
private float scrollLength = 1;
private float scrollLength;
protected override void Update()
{
@ -170,7 +171,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
if (!layoutCache.IsValid)
{
// this.Objects cannot be used as it doesn't contain nested objects
foreach (var hitObject in lifetimeComputedHitObjects)
foreach (var hitObject in allHitObjects)
hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
layoutComputedHitObjects.Clear();