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

Remove createLifetimeEntry from HitObjectEntryManager

Browse Source
This commit is contained in:
ekrctb
2021-06-16 15:15:33 +09:00
committed by Dean Herbert
parent 47539e2129
commit c59aa57450
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.UI
[Resolved(CanBeNull = true)]
private IReadOnlyList<Mod> mods { get; set; }
private readonly HitObjectEntryManager entryManager;
private readonly HitObjectEntryManager entryManager = new HitObjectEntryManager();
/// <summary>
/// Creates a new <see cref="Playfield"/>.
@ -112,7 +112,6 @@ namespace osu.Game.Rulesets.UI
h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
}));
entryManager = new HitObjectEntryManager(CreateLifetimeEntry);
entryManager.OnEntryAdded += onEntryAdded;
entryManager.OnEntryRemoved += onEntryRemoved;
}
@ -271,7 +270,8 @@ namespace osu.Game.Rulesets.UI
/// <param name="hitObject"></param>
public virtual void Add(HitObject hitObject)
{
entryManager.Add(hitObject, null);
var entry = CreateLifetimeEntry(hitObject);
entryManager.Add(entry, null);
}
private void preloadSamples(HitObject hitObject)
@ -294,7 +294,13 @@ namespace osu.Game.Rulesets.UI
/// <returns>Whether the <see cref="HitObject"/> was successfully removed.</returns>
public virtual bool Remove(HitObject hitObject)
{
return entryManager.Remove(hitObject) || nestedPlayfields.Any(p => p.Remove(hitObject));
if (entryManager.TryGet(hitObject, out var entry))
{
entryManager.Remove(entry);
return true;
}
return nestedPlayfields.Any(p => p.Remove(hitObject));
}
private void onEntryAdded(HitObjectLifetimeEntry entry, [CanBeNull] HitObject parentHitObject)
@ -378,7 +384,10 @@ namespace osu.Game.Rulesets.UI
}
if (!entryManager.TryGet(hitObject, out var entry))
entry = entryManager.Add(hitObject, parent?.HitObject);
{
entry = CreateLifetimeEntry(hitObject);
entryManager.Add(entry, parent?.HitObject);
}
dho.ParentHitObject = parent;
dho.Apply(entry);