sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Don't store nulls to parentMap

Browse Source
This commit is contained in:
Dan Balasescu
2022-09-15 15:38:44 +09:00
parent b321b68096
commit 31bc067dd1
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
View File

@ -36,13 +36,12 @@ namespace osu.Game.Rulesets.Objects.Pooling
/// <summary> /// <summary>
/// Stores the parent hit object for entries of the nested hit objects. /// Stores the parent hit object for entries of the nested hit objects.
/// A <c>null</c> is stored for entries of the top-level hit objects.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// The parent hit object of a pooled hit object may be non-pooled. /// The parent hit object of a pooled hit object may be non-pooled.
/// In that case, no corresponding <see cref="HitObjectLifetimeEntry"/> is stored in this <see cref="HitObjectEntryManager"/>. /// In that case, no corresponding <see cref="HitObjectLifetimeEntry"/> is stored in this <see cref="HitObjectEntryManager"/>.
/// </remarks> /// </remarks>
private readonly Dictionary<HitObjectLifetimeEntry, HitObject?> parentMap = new Dictionary<HitObjectLifetimeEntry, HitObject?>(); private readonly Dictionary<HitObjectLifetimeEntry, HitObject> parentMap = new Dictionary<HitObjectLifetimeEntry, HitObject>();
/// <summary> /// <summary>
/// Stores the list of entries managed by this <see cref="HitObjectEntryManager"/> for each hit object managed by this <see cref="HitObjectEntryManager"/>. /// Stores the list of entries managed by this <see cref="HitObjectEntryManager"/> for each hit object managed by this <see cref="HitObjectEntryManager"/>.
@ -55,16 +54,17 @@ namespace osu.Game.Rulesets.Objects.Pooling
throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is already added to this {nameof(HitObjectEntryManager)}."); throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is already added to this {nameof(HitObjectEntryManager)}.");
var hitObject = entry.HitObject; var hitObject = entry.HitObject;
parentMap[entry] = parent;
entryMap[hitObject] = entry; entryMap[hitObject] = entry;
if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries))
parentChildEntries.Add(entry);
hitObject.DefaultsApplied += onDefaultsApplied;
childrenMap[hitObject] = new List<HitObjectLifetimeEntry>(); childrenMap[hitObject] = new List<HitObjectLifetimeEntry>();
if (parent != null)
{
parentMap[entry] = parent;
if (childrenMap.TryGetValue(parent, out var parentChildEntries))
parentChildEntries.Add(entry);
}
hitObject.DefaultsApplied += onDefaultsApplied;
OnEntryAdded?.Invoke(entry, parent); OnEntryAdded?.Invoke(entry, parent);
} }
@ -74,14 +74,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectLifetimeEntry)}."); throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectLifetimeEntry)}.");
var hitObject = entry.HitObject; var hitObject = entry.HitObject;
parentMap.Remove(entry, out var parent);
entryMap.Remove(hitObject); entryMap.Remove(hitObject);
if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries)) if (parentMap.Remove(entry, out var parent) && childrenMap.TryGetValue(parent, out var parentChildEntries))
parentChildEntries.Remove(entry); parentChildEntries.Remove(entry);
hitObject.DefaultsApplied -= onDefaultsApplied;
// Remove all entries of the nested hit objects // Remove all entries of the nested hit objects
if (childrenMap.Remove(entry.HitObject, out var childEntries)) if (childrenMap.Remove(entry.HitObject, out var childEntries))
{ {
@ -89,6 +86,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
Remove(childEntry); Remove(childEntry);
} }
hitObject.DefaultsApplied -= onDefaultsApplied;
OnEntryRemoved?.Invoke(entry, parent); OnEntryRemoved?.Invoke(entry, parent);
} }