sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-19 18:27:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert changes to HitObjectUsageBegan, not use it.

Browse Source
This commit is contained in:
ekrctb 2020-11-26 14:01:46 +09:00
parent 1a6e5bdaba
commit f6faf95e33
3 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.UI
/// <remarks> /// <remarks>
/// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive. /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
/// </remarks> /// </remarks>
internal event Action<DrawableHitObject> HitObjectUsageBegan; internal event Action<HitObject> HitObjectUsageBegan;
/// <summary> /// <summary>
/// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>. /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.UI
/// <remarks> /// <remarks>
/// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead. /// If this <see cref="HitObjectContainer"/> uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
/// </remarks> /// </remarks>
internal event Action<DrawableHitObject> HitObjectUsageFinished; internal event Action<HitObject> HitObjectUsageFinished;
/// <summary> /// <summary>
/// The amount of time prior to the current time within which <see cref="HitObject"/>s should be considered alive. /// The amount of time prior to the current time within which <see cref="HitObject"/>s should be considered alive.
@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.UI
bindStartTime(drawable); bindStartTime(drawable);
AddInternal(drawableMap[entry] = drawable, false); AddInternal(drawableMap[entry] = drawable, false);
HitObjectUsageBegan?.Invoke(drawable); HitObjectUsageBegan?.Invoke(entry.HitObject);
} }
private void removeDrawable(HitObjectLifetimeEntry entry) private void removeDrawable(HitObjectLifetimeEntry entry)
@ -129,10 +129,10 @@ namespace osu.Game.Rulesets.UI
drawableMap.Remove(entry); drawableMap.Remove(entry);
HitObjectUsageFinished?.Invoke(drawable);
unbindStartTime(drawable); unbindStartTime(drawable);
RemoveInternal(drawable); RemoveInternal(drawable);
HitObjectUsageFinished?.Invoke(entry.HitObject);
} }
#endregion #endregion

4
osu.Game/Rulesets/UI/Playfield.cs
View File

@ -92,8 +92,8 @@ namespace osu.Game.Rulesets.UI
{ {
h.NewResult += (d, r) => NewResult?.Invoke(d, r); h.NewResult += (d, r) => NewResult?.Invoke(d, r);
h.RevertResult += (d, r) => RevertResult?.Invoke(d, r); h.RevertResult += (d, r) => RevertResult?.Invoke(d, r);
h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o.HitObject); h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o.HitObject); h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
})); }));
} }

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

@ -17,10 +17,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
private readonly IBindable<double> timeRange = new BindableDouble(); private readonly IBindable<double> timeRange = new BindableDouble();
private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>(); private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
// Tracks all `DrawableHitObject` (nested or not) applied a `HitObject`.
// It dynamically changes based on approximate lifetime when a pooling is used.
private readonly HashSet<DrawableHitObject> hitObjectApplied = new HashSet<DrawableHitObject>();
// The lifetime of a hit object in this will be computed in next update. // The lifetime of a hit object in this will be computed in next update.
private readonly HashSet<DrawableHitObject> toComputeLifetime = new HashSet<DrawableHitObject>(); private readonly HashSet<DrawableHitObject> toComputeLifetime = new HashSet<DrawableHitObject>();
@ -39,9 +35,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
AddLayout(layoutCache); AddLayout(layoutCache);
HitObjectUsageBegan += onHitObjectUsageBegin;
HitObjectUsageFinished += onHitObjectUsageFinished;
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -58,7 +51,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
{ {
base.Clear(disposeChildren); base.Clear(disposeChildren);
hitObjectApplied.Clear();
toComputeLifetime.Clear(); toComputeLifetime.Clear();
layoutComputed.Clear(); layoutComputed.Clear();
} }
@ -159,18 +151,10 @@ namespace osu.Game.Rulesets.UI.Scrolling
{ {
// Lifetime computation is delayed until next update because // Lifetime computation is delayed until next update because
// when the hit object is not pooled this container is not loaded here and `scrollLength` cannot be computed. // when the hit object is not pooled this container is not loaded here and `scrollLength` cannot be computed.
hitObjectApplied.Add(hitObject);
toComputeLifetime.Add(hitObject); toComputeLifetime.Add(hitObject);
layoutComputed.Remove(hitObject); layoutComputed.Remove(hitObject);
} }
private void onHitObjectUsageFinished(DrawableHitObject hitObject)
{
hitObjectApplied.Remove(hitObject);
toComputeLifetime.Remove(hitObject);
layoutComputed.Remove(hitObject);
}
private float scrollLength; private float scrollLength;
protected override void Update() protected override void Update()
@ -179,8 +163,12 @@ namespace osu.Game.Rulesets.UI.Scrolling
if (!layoutCache.IsValid) if (!layoutCache.IsValid)
{ {
foreach (var hitObject in hitObjectApplied) toComputeLifetime.Clear();
toComputeLifetime.Add(hitObject); foreach (var hitObject in Objects)
{
if (hitObject.HitObject != null)
toComputeLifetime.Add(hitObject);
}
layoutComputed.Clear(); layoutComputed.Clear();