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

Remove Component inheritance

Browse Source
This commit is contained in:
smoogipoo
2021-05-18 18:59:45 +09:00
parent 633f841a0f
commit 97f4f7bbd1
3 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
View File

@ -5,7 +5,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Graphics;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.UI;
@ -15,7 +14,7 @@ namespace osu.Game.Screens.Edit.Compose
/// <summary>
/// Buffers events from the many <see cref="HitObjectContainer"/>s in a nested <see cref="Playfield"/> hierarchy.
/// </summary>
internal class HitObjectUsageEventBuffer : Component
internal class HitObjectUsageEventBuffer : IDisposable
{
/// <summary>
/// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
@ -91,10 +90,8 @@ namespace osu.Game.Screens.Edit.Compose
}
}
protected override void Update()
public void Update()
{
base.Update();
foreach (var (hitObject, e) in pendingEvents)
{
switch (e)
@ -116,12 +113,13 @@ namespace osu.Game.Screens.Edit.Compose
pendingEvents.Clear();
}
protected override void Dispose(bool isDisposing)
public void Dispose()
{
base.Dispose(isDisposing);
playfield.HitObjectUsageBegan -= onHitObjectUsageBegan;
playfield.HitObjectUsageFinished -= onHitObjectUsageFinished;
if (playfield != null)
{
playfield.HitObjectUsageBegan -= onHitObjectUsageBegan;
playfield.HitObjectUsageFinished -= onHitObjectUsageFinished;
}
}
private enum EventType