h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 16:12:54 +08:00
Code Issues Releases Wiki Activity

Remove OnAdd/OnRemove of HitObjectContainer

Browse Source 
Instead, override `AddDrawable`/`RemoveDrawable`.
This commit is contained in:
ekrctb 2021-05-31 23:07:32 +09:00
parent 0ce7baa3f3
commit b321b20e9d
2 changed files with 20 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
@ -92,26 +91,19 @@ namespace osu.Game.Rulesets.UI
protected override void AddDrawable(HitObjectLifetimeEntry entry, DrawableHitObject drawable) protected override void AddDrawable(HitObjectLifetimeEntry entry, DrawableHitObject drawable)
{ {
if (!nonPooledDrawableMap.ContainsKey(entry)) if (nonPooledDrawableMap.ContainsKey(entry)) return;
{
addDrawable(drawable);
HitObjectUsageBegan?.Invoke(entry.HitObject);
}
OnAdd(drawable); addDrawable(drawable);
HitObjectUsageBegan?.Invoke(entry.HitObject);
} }
protected override void RemoveDrawable(HitObjectLifetimeEntry entry, DrawableHitObject drawable) protected override void RemoveDrawable(HitObjectLifetimeEntry entry, DrawableHitObject drawable)
{ {
drawable.OnKilled(); drawable.OnKilled();
if (nonPooledDrawableMap.ContainsKey(entry)) return;
if (!nonPooledDrawableMap.ContainsKey(entry)) removeDrawable(drawable);
{ HitObjectUsageFinished?.Invoke(entry.HitObject);
removeDrawable(drawable);
HitObjectUsageFinished?.Invoke(entry.HitObject);
}
OnRemove(drawable);
} }
private void addDrawable(DrawableHitObject drawable) private void addDrawable(DrawableHitObject drawable)
@ -159,21 +151,6 @@ namespace osu.Game.Rulesets.UI
#endregion #endregion
/// <summary>
/// Invoked after a <see cref="DrawableHitObject"/> is added to this container.
/// </summary>
protected virtual void OnAdd(DrawableHitObject drawableHitObject)
{
Debug.Assert(drawableHitObject.LoadState >= LoadState.Ready);
}
/// <summary>
/// Invoked after a <see cref="DrawableHitObject"/> is removed from this container.
/// </summary>
protected virtual void OnRemove(DrawableHitObject drawableHitObject)
{
}
private void onNewResult(DrawableHitObject d, JudgementResult r) => NewResult?.Invoke(d, r); private void onNewResult(DrawableHitObject d, JudgementResult r) => NewResult?.Invoke(d, r);
private void onRevertResult(DrawableHitObject d, JudgementResult r) => RevertResult?.Invoke(d, r); private void onRevertResult(DrawableHitObject d, JudgementResult r) => RevertResult?.Invoke(d, r);

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

@ -2,10 +2,12 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Layout; using osu.Framework.Layout;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using osuTK; using osuTK;
@ -140,17 +142,20 @@ namespace osu.Game.Rulesets.UI.Scrolling
} }
} }
protected override void OnAdd(DrawableHitObject drawableHitObject) protected override void AddDrawable(HitObjectLifetimeEntry entry, DrawableHitObject drawable)
{ {
invalidateHitObject(drawableHitObject); base.AddDrawable(entry, drawable);
drawableHitObject.DefaultsApplied += invalidateHitObject;
invalidateHitObject(drawable);
drawable.DefaultsApplied += invalidateHitObject;
} }
protected override void OnRemove(DrawableHitObject drawableHitObject) protected override void RemoveDrawable(HitObjectLifetimeEntry entry, DrawableHitObject drawable)
{ {
layoutComputed.Remove(drawableHitObject); base.RemoveDrawable(entry, drawable);
drawableHitObject.DefaultsApplied -= invalidateHitObject; drawable.DefaultsApplied -= invalidateHitObject;
layoutComputed.Remove(drawable);
} }
private void invalidateHitObject(DrawableHitObject hitObject) private void invalidateHitObject(DrawableHitObject hitObject)
@ -199,6 +204,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
private double computeOriginAdjustedLifetimeStart(DrawableHitObject hitObject) private double computeOriginAdjustedLifetimeStart(DrawableHitObject hitObject)
{ {
// Origin position may be relative to the parent size
Debug.Assert(hitObject.Parent != null);
float originAdjustment = 0.0f; float originAdjustment = 0.0f;
// calculate the dimension of the part of the hitobject that should already be visible // calculate the dimension of the part of the hitobject that should already be visible