From fba748b24e6fde3753e091df215846e62a3348c5 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 16 Nov 2016 16:20:58 +0900 Subject: [PATCH] DrawableCircle -> DrawableHitCircle. --- osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs | 2 +- osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs | 5 ++--- osu.Game.Mode.Osu/UI/OsuHitRenderer.cs | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs index fd29325467..4c7b7ec577 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs @@ -44,7 +44,7 @@ namespace osu.Desktop.VisualTests.Tests Position = new Vector2((i - count / 2) * 14), }; - Add(new DrawableCircle(h) + Add(new DrawableHitCircle(h) { Anchor = Anchor.Centre, Origin = Anchor.Centre, diff --git a/osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs index e41f4e05c9..e035fab581 100644 --- a/osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs +++ b/osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs @@ -11,13 +11,12 @@ using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Transformations; using osu.Framework.Input; using osu.Framework.MathUtils; -using osu.Game.Modes.Objects; using osu.Game.Modes.Objects.Drawables; using OpenTK; namespace osu.Game.Modes.Osu.Objects.Drawables { - public class DrawableCircle : DrawableHitObject + public class DrawableHitCircle : DrawableHitObject { private Sprite approachCircle; private CircleLayer circle; @@ -28,7 +27,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables private GlowLayer glow; private OsuBaseHit h; - public DrawableCircle(HitCircle h) : base(h) + public DrawableHitCircle(HitCircle h) : base(h) { this.h = h; diff --git a/osu.Game.Mode.Osu/UI/OsuHitRenderer.cs b/osu.Game.Mode.Osu/UI/OsuHitRenderer.cs index 9ccd8af2ae..c8f8b7b3e7 100644 --- a/osu.Game.Mode.Osu/UI/OsuHitRenderer.cs +++ b/osu.Game.Mode.Osu/UI/OsuHitRenderer.cs @@ -4,8 +4,8 @@ using osu.Game.Modes.Objects; using osu.Game.Modes.Objects.Drawables; using osu.Game.Modes.Osu.Objects; +using osu.Game.Modes.Osu.Objects.Drawables; using osu.Game.Modes.UI; -using DrawableCircle = osu.Game.Modes.Osu.Objects.Drawables.DrawableCircle; using OsuBaseHit = osu.Game.Modes.Osu.Objects.OsuBaseHit; using OsuConverter = osu.Game.Modes.Osu.Objects.OsuConverter; @@ -18,6 +18,6 @@ namespace osu.Game.Modes.Osu.UI protected override Playfield CreatePlayfield() => new OsuPlayfield(); protected override DrawableHitObject GetVisualRepresentation(OsuBaseHit h) - => h is HitCircle ? new DrawableCircle(h as HitCircle) : null; + => h is HitCircle ? new DrawableHitCircle(h as HitCircle) : null; } }