h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 00:22:58 +08:00
Code Issues Releases Wiki Activity

Merge pull request #10953 from ekrctb/remove-tobject-catch

Browse Source 
Remove type parameter from DrawableCatchHitObject
This commit is contained in:
Dan Balasescu 2020-11-24 19:23:42 +09:00 committed by GitHub
commit 7bf4ff7557
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
View File

@ -9,7 +9,7 @@ using osu.Game.Rulesets.Objects.Drawables;
namespace osu.Game.Rulesets.Catch.Objects.Drawables namespace osu.Game.Rulesets.Catch.Objects.Drawables
{ {
public class DrawableBananaShower : DrawableCatchHitObject<BananaShower> public class DrawableBananaShower : DrawableCatchHitObject
{ {
private readonly Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation; private readonly Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation;
private readonly Container bananaContainer; private readonly Container bananaContainer;

19
osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
View File

@ -13,12 +13,11 @@ using osuTK.Graphics;
namespace osu.Game.Rulesets.Catch.Objects.Drawables namespace osu.Game.Rulesets.Catch.Objects.Drawables
{ {
public abstract class PalpableDrawableCatchHitObject<TObject> : DrawableCatchHitObject<TObject> public abstract class PalpableDrawableCatchHitObject : DrawableCatchHitObject
where TObject : PalpableCatchHitObject
{ {
protected Container ScaleContainer { get; private set; } protected Container ScaleContainer { get; private set; }
protected PalpableDrawableCatchHitObject(TObject hitObject) protected PalpableDrawableCatchHitObject(CatchHitObject hitObject)
: base(hitObject) : base(hitObject)
{ {
Origin = Anchor.Centre; Origin = Anchor.Centre;
@ -46,19 +45,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count]; comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
} }
public abstract class DrawableCatchHitObject<TObject> : DrawableCatchHitObject
where TObject : CatchHitObject
{
public new TObject HitObject;
protected DrawableCatchHitObject(TObject hitObject)
: base(hitObject)
{
HitObject = hitObject;
Anchor = Anchor.BottomLeft;
}
}
public abstract class DrawableCatchHitObject : DrawableHitObject<CatchHitObject> public abstract class DrawableCatchHitObject : DrawableHitObject<CatchHitObject>
{ {
protected override double InitialLifetimeOffset => HitObject.TimePreempt; protected override double InitialLifetimeOffset => HitObject.TimePreempt;
@ -73,6 +59,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
: base(hitObject) : base(hitObject)
{ {
X = hitObject.X; X = hitObject.X;
Anchor = Anchor.BottomLeft;
} }
public Func<CatchHitObject, bool> CheckPosition; public Func<CatchHitObject, bool> CheckPosition;

4
osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
View File

@ -8,11 +8,11 @@ using osu.Game.Skinning;
namespace osu.Game.Rulesets.Catch.Objects.Drawables namespace osu.Game.Rulesets.Catch.Objects.Drawables
{ {
public class DrawableDroplet : PalpableDrawableCatchHitObject<Droplet> public class DrawableDroplet : PalpableDrawableCatchHitObject
{ {
public override bool StaysOnPlate => false; public override bool StaysOnPlate => false;
public DrawableDroplet(Droplet h) public DrawableDroplet(CatchHitObject h)
: base(h) : base(h)
{ {
} }

4
osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
View File

@ -8,9 +8,9 @@ using osu.Game.Skinning;
namespace osu.Game.Rulesets.Catch.Objects.Drawables namespace osu.Game.Rulesets.Catch.Objects.Drawables
{ {
public class DrawableFruit : PalpableDrawableCatchHitObject<Fruit> public class DrawableFruit : PalpableDrawableCatchHitObject
{ {
public DrawableFruit(Fruit h) public DrawableFruit(CatchHitObject h)
: base(h) : base(h)
{ {
} }

2
osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
View File

@ -10,7 +10,7 @@ using osuTK;
namespace osu.Game.Rulesets.Catch.Objects.Drawables namespace osu.Game.Rulesets.Catch.Objects.Drawables
{ {
public class DrawableJuiceStream : DrawableCatchHitObject<JuiceStream> public class DrawableJuiceStream : DrawableCatchHitObject
{ {
private readonly Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation; private readonly Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation;
private readonly Container dropletContainer; private readonly Container dropletContainer;