diff --git a/osu.Game.Modes.Taiko/UI/RingExplosion.cs b/osu.Game.Modes.Taiko/UI/HitExplosion.cs similarity index 79% rename from osu.Game.Modes.Taiko/UI/RingExplosion.cs rename to osu.Game.Modes.Taiko/UI/HitExplosion.cs index 2bc1d2d3eb..c3059ef713 100644 --- a/osu.Game.Modes.Taiko/UI/RingExplosion.cs +++ b/osu.Game.Modes.Taiko/UI/HitExplosion.cs @@ -15,19 +15,17 @@ using osu.Game.Modes.Taiko.Objects; namespace osu.Game.Modes.Taiko.UI { /// - /// A ring that explodes to indicate a judgement has occurred. + /// A circle explodes from the hit target to indicate a hitobject has been hit. /// - internal class RingExplosion : CircularContainer + internal class HitExplosion : CircularContainer { - /// - /// The Judgement to display. - /// - public TaikoJudgementInfo Judgement; - + private TaikoJudgementInfo judgement; private Box innerFill; - public RingExplosion() + public HitExplosion(TaikoJudgementInfo judgement) { + this.judgement = judgement; + Size = new Vector2(TaikoHitObject.CIRCLE_RADIUS * 2); Anchor = Anchor.Centre; @@ -53,10 +51,10 @@ namespace osu.Game.Modes.Taiko.UI [BackgroundDependencyLoader] private void load(OsuColour colours) { - if (Judgement.SecondHit) + if (judgement.SecondHit) Size *= 1.5f; - switch (Judgement.TaikoResult) + switch (judgement.TaikoResult) { case TaikoHitResult.Good: innerFill.Colour = colours.Green; diff --git a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs index 38100df38d..77fe511108 100644 --- a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs +++ b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs @@ -46,7 +46,7 @@ namespace osu.Game.Modes.Taiko.UI protected override Container Content => hitObjectContainer; - private Container ringExplosionContainer; + private Container hitExplosionContainer; //private Container barLineContainer; private Container judgementContainer; @@ -96,7 +96,7 @@ namespace osu.Game.Modes.Taiko.UI RelativeSizeAxes = Axes.Both, Children = new Drawable[] { - ringExplosionContainer = new Container + hitExplosionContainer = new Container { Anchor = Anchor.CentreLeft, Origin = Anchor.Centre, @@ -183,10 +183,7 @@ namespace osu.Game.Modes.Taiko.UI { if (judgedObject.Judgement.Result == HitResult.Hit) { - ringExplosionContainer.Add(new RingExplosion - { - Judgement = judgedObject.Judgement - }); + hitExplosionContainer.Add(new HitExplosion(judgedObject.Judgement)); } float judgementOffset = judgedObject.Judgement.Result == HitResult.Hit ? judgedObject.Position.X : 0; diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj index 2bd9ddc327..6c97ed3391 100644 --- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj +++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj @@ -62,7 +62,7 @@ - +