RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-09 23:59:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move CreateCirclePiece to DrawableTaikoHitObject and simplify strong creation.

Browse Source
This commit is contained in:
Dean Herbert 2017-04-04 12:53:06 +09:00
parent cbb669add3
commit 20a5648b05
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
8 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Modes.Taiko/Objects/Drawables/DrawableCentreHit.cs
View File

@ -15,6 +15,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
public DrawableCentreHit(Hit hit) public DrawableCentreHit(Hit hit)
: base(hit) : base(hit)
{ {
Circle.Add(new CentreHitSymbolPiece());
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -22,10 +23,5 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
{ {
Circle.AccentColour = colours.PinkDarker; Circle.AccentColour = colours.PinkDarker;
} }
protected override CirclePiece CreateCirclePiece() => new CirclePiece
{
Children = new[] { new CentreHitSymbolPiece() }
};
} }
} }

2
osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs
View File

@ -110,7 +110,5 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
protected override void UpdateState(ArmedState state) protected override void UpdateState(ArmedState state)
{ {
} }
protected virtual CirclePiece CreateCirclePiece() => new CirclePiece();
} }
} }

2
osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs
View File

@ -109,7 +109,5 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
Expire(); Expire();
} }
protected abstract CirclePiece CreateCirclePiece();
} }
} }

6
osu.Game.Modes.Taiko/Objects/Drawables/DrawableRimHit.cs
View File

@ -15,6 +15,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
public DrawableRimHit(Hit hit) public DrawableRimHit(Hit hit)
: base(hit) : base(hit)
{ {
Circle.Add(new RimHitSymbolPiece());
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -22,10 +23,5 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
{ {
Circle.AccentColour = colours.BlueDarker; Circle.AccentColour = colours.BlueDarker;
} }
protected override CirclePiece CreateCirclePiece() => new CirclePiece
{
Children = new[] { new RimHitSymbolPiece() }
};
} }
} }

6
osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongCentreHit.cs
View File

@ -15,6 +15,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
public DrawableStrongCentreHit(Hit hit) public DrawableStrongCentreHit(Hit hit)
: base(hit) : base(hit)
{ {
Circle.Add(new CentreHitSymbolPiece());
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -22,10 +23,5 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
{ {
Circle.AccentColour = colours.PinkDarker; Circle.AccentColour = colours.PinkDarker;
} }
protected override CirclePiece CreateCirclePiece() => new StrongCirclePiece
{
Children = new[] { new CentreHitSymbolPiece() }
};
} }
} }

3
osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongHit.cs
View File

@ -6,6 +6,7 @@ using System.Linq;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Game.Modes.Objects.Drawables; using osu.Game.Modes.Objects.Drawables;
using osu.Game.Modes.Taiko.Judgements; using osu.Game.Modes.Taiko.Judgements;
using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
using OpenTK.Input; using OpenTK.Input;
namespace osu.Game.Modes.Taiko.Objects.Drawables namespace osu.Game.Modes.Taiko.Objects.Drawables
@ -29,6 +30,8 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
protected override TaikoJudgement CreateJudgement() => new TaikoStrongHitJudgement(); protected override TaikoJudgement CreateJudgement() => new TaikoStrongHitJudgement();
protected override CirclePiece CreateCirclePiece() => new StrongCirclePiece();
protected override void CheckJudgement(bool userTriggered) protected override void CheckJudgement(bool userTriggered)
{ {
if (Judgement.Result == HitResult.None) if (Judgement.Result == HitResult.None)

6
osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongRimHit.cs
View File

@ -15,6 +15,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
public DrawableStrongRimHit(Hit hit) public DrawableStrongRimHit(Hit hit)
: base(hit) : base(hit)
{ {
Circle.Add(new RimHitSymbolPiece());
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -22,10 +23,5 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
{ {
Circle.AccentColour = colours.BlueDarker; Circle.AccentColour = colours.BlueDarker;
} }
protected override CirclePiece CreateCirclePiece() => new StrongCirclePiece
{
Children = new[] { new RimHitSymbolPiece() }
};
} }
} }

3
osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Graphics;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Game.Modes.Objects.Drawables; using osu.Game.Modes.Objects.Drawables;
using osu.Game.Modes.Taiko.Judgements; using osu.Game.Modes.Taiko.Judgements;
using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
using OpenTK.Input; using OpenTK.Input;
namespace osu.Game.Modes.Taiko.Objects.Drawables namespace osu.Game.Modes.Taiko.Objects.Drawables
@ -36,6 +37,8 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
protected override TaikoJudgement CreateJudgement() => new TaikoJudgement(); protected override TaikoJudgement CreateJudgement() => new TaikoJudgement();
protected virtual CirclePiece CreateCirclePiece() => new CirclePiece();
/// <summary> /// <summary>
/// Sets the scroll position of the DrawableHitObject relative to the offset between /// Sets the scroll position of the DrawableHitObject relative to the offset between
/// a time value and the HitObject's StartTime. /// a time value and the HitObject's StartTime.