sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-18 03:57:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move "drawable" to first prefix

Browse Source
This commit is contained in:
Dean Herbert 2020-11-14 18:05:30 +09:00
parent 90f37ff4ab
commit 7ac4d2c4be
4 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.Osu/Edit/OsuEditDrawablePool.cs → osu.Game.Rulesets.Osu/Edit/DrawableOsuEditPool.cs
View File

@ -9,7 +9,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
namespace osu.Game.Rulesets.Osu.Edit namespace osu.Game.Rulesets.Osu.Edit
{ {
public class OsuEditDrawablePool<T> : OsuDrawablePool<T> public class DrawableOsuEditPool<T> : DrawableOsuPool<T>
where T : DrawableHitObject, new() where T : DrawableHitObject, new()
{ {
/// <summary> /// <summary>
@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Edit
/// </summary> /// </summary>
private const double editor_hit_object_fade_out_extension = 700; private const double editor_hit_object_fade_out_extension = 700;
public OsuEditDrawablePool(Func<DrawableHitObject, double, bool> checkHittable, Action<Drawable> onLoaded, int initialSize, int? maximumSize = null) public DrawableOsuEditPool(Func<DrawableHitObject, double, bool> checkHittable, Action<Drawable> onLoaded, int initialSize, int? maximumSize = null)
: base(checkHittable, onLoaded, initialSize, maximumSize) : base(checkHittable, onLoaded, initialSize, maximumSize)
{ {
} }

2
osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Edit
protected override GameplayCursorContainer CreateCursor() => null; protected override GameplayCursorContainer CreateCursor() => null;
protected override DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null) protected override DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
=> new OsuEditDrawablePool<TDrawable>(CheckHittable, OnHitObjectLoaded, initialSize, maximumSize); => new DrawableOsuEditPool<TDrawable>(CheckHittable, OnHitObjectLoaded, initialSize, maximumSize);
} }
} }
} }

4
osu.Game.Rulesets.Osu/Objects/Drawables/OsuDrawablePool.cs → osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuPool.cs
View File

@ -8,13 +8,13 @@ using osu.Game.Rulesets.Objects.Drawables;
namespace osu.Game.Rulesets.Osu.Objects.Drawables namespace osu.Game.Rulesets.Osu.Objects.Drawables
{ {
public class OsuDrawablePool<T> : DrawablePool<T> public class DrawableOsuPool<T> : DrawablePool<T>
where T : DrawableHitObject, new() where T : DrawableHitObject, new()
{ {
private readonly Func<DrawableHitObject, double, bool> checkHittable; private readonly Func<DrawableHitObject, double, bool> checkHittable;
private readonly Action<Drawable> onLoaded; private readonly Action<Drawable> onLoaded;
public OsuDrawablePool(Func<DrawableHitObject, double, bool> checkHittable, Action<Drawable> onLoaded, int initialSize, int? maximumSize = null) public DrawableOsuPool(Func<DrawableHitObject, double, bool> checkHittable, Action<Drawable> onLoaded, int initialSize, int? maximumSize = null)
: base(initialSize, maximumSize) : base(initialSize, maximumSize)
{ {
this.checkHittable = checkHittable; this.checkHittable = checkHittable;

2
osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
View File

@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Osu.UI
protected virtual DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null) protected virtual DrawablePool<TDrawable> CreatePool<TDrawable>(int initialSize, int? maximumSize = null)
where TDrawable : DrawableHitObject, new() where TDrawable : DrawableHitObject, new()
=> new OsuDrawablePool<TDrawable>(CheckHittable, OnHitObjectLoaded, initialSize, maximumSize); => new DrawableOsuPool<TDrawable>(CheckHittable, OnHitObjectLoaded, initialSize, maximumSize);
protected override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject) => new OsuHitObjectLifetimeEntry(hitObject); protected override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject) => new OsuHitObjectLifetimeEntry(hitObject);