sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-23 14:37:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename DrawableObject -> PoolableDrawableWithLifetime

Browse Source
This commit is contained in:
ekrctb 2021-04-26 12:06:21 +09:00
parent 20e3cadd30
commit 6561a7c7d6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -26,7 +26,7 @@ using osuTK.Graphics;
namespace osu.Game.Rulesets.Objects.Drawables namespace osu.Game.Rulesets.Objects.Drawables
{ {
[Cached(typeof(DrawableHitObject))] [Cached(typeof(DrawableHitObject))]
public abstract class DrawableHitObject : DrawableObject<HitObjectLifetimeEntry> public abstract class DrawableHitObject : PoolableDrawableWithLifetime<HitObjectLifetimeEntry>
{ {
/// <summary> /// <summary>
/// Invoked after this <see cref="DrawableHitObject"/>'s applied <see cref="HitObject"/> has had its defaults applied. /// Invoked after this <see cref="DrawableHitObject"/>'s applied <see cref="HitObject"/> has had its defaults applied.
@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
/// </summary> /// </summary>
/// <param name="initialHitObject"> /// <param name="initialHitObject">
/// The <see cref="HitObject"/> to be initially applied to this <see cref="DrawableHitObject"/>. /// The <see cref="HitObject"/> to be initially applied to this <see cref="DrawableHitObject"/>.
/// If <c>null</c>, a hitobject is expected to be later applied via <see cref="DrawableObject{TEntry}.Apply"/> (or automatically via pooling). /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="PoolableDrawableWithLifetime{TEntry}.Apply"/> (or automatically via pooling).
/// </param> /// </param>
protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null) protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
: base(initialHitObject != null ? new SyntheticHitObjectEntry(initialHitObject) : null) : base(initialHitObject != null ? new SyntheticHitObjectEntry(initialHitObject) : null)

8
osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs → osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
View File

@ -13,15 +13,15 @@ namespace osu.Game.Rulesets.Objects.Pooling
/// A <see cref="PoolableDrawable"/> that is controlled by <see cref="Entry"/> to implement drawable pooling and replay rewinding. /// A <see cref="PoolableDrawable"/> that is controlled by <see cref="Entry"/> to implement drawable pooling and replay rewinding.
/// </summary> /// </summary>
/// <typeparam name="TEntry">The <see cref="LifetimeEntry"/> type storing state and controlling this drawable.</typeparam> /// <typeparam name="TEntry">The <see cref="LifetimeEntry"/> type storing state and controlling this drawable.</typeparam>
public abstract class DrawableObject<TEntry> : PoolableDrawable where TEntry : LifetimeEntry public abstract class PoolableDrawableWithLifetime<TEntry> : PoolableDrawable where TEntry : LifetimeEntry
{ {
/// <summary> /// <summary>
/// The entry holding essential state of this <see cref="DrawableObject{TEntry}"/>. /// The entry holding essential state of this <see cref="PoolableDrawableWithLifetime{TEntry}"/>.
/// </summary> /// </summary>
protected TEntry? Entry { get; private set; } protected TEntry? Entry { get; private set; }
/// <summary> /// <summary>
/// Whether <see cref="Entry"/> is applied to this <see cref="DrawableObject{TEntry}"/>. /// Whether <see cref="Entry"/> is applied to this <see cref="PoolableDrawableWithLifetime{TEntry}"/>.
/// When an initial entry is specified in the constructor, <see cref="Entry"/> is set but not applied until loading is completed. /// When an initial entry is specified in the constructor, <see cref="Entry"/> is set but not applied until loading is completed.
/// </summary> /// </summary>
protected bool HasEntryApplied { get; private set; } protected bool HasEntryApplied { get; private set; }
@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
public override bool RemoveWhenNotAlive => false; public override bool RemoveWhenNotAlive => false;
public override bool RemoveCompletedTransforms => false; public override bool RemoveCompletedTransforms => false;
protected DrawableObject(TEntry? initialEntry = null) protected PoolableDrawableWithLifetime(TEntry? initialEntry = null)
{ {
Entry = initialEntry; Entry = initialEntry;
} }