From da1f6eeab5fd4a86f99b66c6c85169d0fb38cd3b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 16 Nov 2016 16:16:45 +0900 Subject: [PATCH] Circle -> HitCircle. --- osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs | 2 +- osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs | 2 +- osu.Desktop.VisualTests/Tests/TestCasePlayer.cs | 2 +- osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs | 2 +- osu.Game.Mode.Osu/Objects/HitCircle.cs | 2 +- osu.Game.Mode.Osu/Objects/OsuHitObjectParser.cs | 2 +- osu.Game.Mode.Osu/UI/OsuHitRenderer.cs | 4 ++-- osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs index 1ffe76bdda..113e165d6a 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs @@ -43,7 +43,7 @@ namespace osu.Desktop.VisualTests.Tests int time = 500; for (int i = 0; i < 100; i++) { - objects.Add(new Circle() + objects.Add(new HitCircle() { StartTime = time, Position = new Vector2(RNG.Next(0, 512), RNG.Next(0, 384)) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs index 1c6c61d51e..fd29325467 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs @@ -38,7 +38,7 @@ namespace osu.Desktop.VisualTests.Tests for (int i = 0; i < count; i++) { - var h = new Circle + var h = new HitCircle { StartTime = ourClock.CurrentTime + 1000 + i * 80, Position = new Vector2((i - count / 2) * 14), diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs index 862377c131..de285aa6bb 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs @@ -38,7 +38,7 @@ namespace osu.Desktop.VisualTests.Tests int time = 1500; for (int i = 0; i < 50; i++) { - objects.Add(new Circle() + objects.Add(new HitCircle() { StartTime = time, Position = new Vector2(RNG.Next(0, 512), RNG.Next(0, 384)), diff --git a/osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs index 62481b5511..e41f4e05c9 100644 --- a/osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs +++ b/osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs @@ -28,7 +28,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables private GlowLayer glow; private OsuBaseHit h; - public DrawableCircle(Circle h) : base(h) + public DrawableCircle(HitCircle h) : base(h) { this.h = h; diff --git a/osu.Game.Mode.Osu/Objects/HitCircle.cs b/osu.Game.Mode.Osu/Objects/HitCircle.cs index 4caaa5891c..5df73602c8 100644 --- a/osu.Game.Mode.Osu/Objects/HitCircle.cs +++ b/osu.Game.Mode.Osu/Objects/HitCircle.cs @@ -3,7 +3,7 @@ namespace osu.Game.Modes.Osu.Objects { - public class Circle : OsuBaseHit + public class HitCircle : OsuBaseHit { } } diff --git a/osu.Game.Mode.Osu/Objects/OsuHitObjectParser.cs b/osu.Game.Mode.Osu/Objects/OsuHitObjectParser.cs index 81c218e8e1..b6865c0651 100644 --- a/osu.Game.Mode.Osu/Objects/OsuHitObjectParser.cs +++ b/osu.Game.Mode.Osu/Objects/OsuHitObjectParser.cs @@ -22,7 +22,7 @@ namespace osu.Game.Modes.Osu.Objects switch (type) { case OsuBaseHit.HitObjectType.Circle: - result = new Circle(); + result = new HitCircle(); break; case OsuBaseHit.HitObjectType.Slider: result = new Slider(); diff --git a/osu.Game.Mode.Osu/UI/OsuHitRenderer.cs b/osu.Game.Mode.Osu/UI/OsuHitRenderer.cs index 218dc39ba6..9ccd8af2ae 100644 --- a/osu.Game.Mode.Osu/UI/OsuHitRenderer.cs +++ b/osu.Game.Mode.Osu/UI/OsuHitRenderer.cs @@ -3,8 +3,8 @@ using osu.Game.Modes.Objects; using osu.Game.Modes.Objects.Drawables; +using osu.Game.Modes.Osu.Objects; using osu.Game.Modes.UI; -using Circle = osu.Game.Modes.Osu.Objects.Circle; 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 Circle ? new DrawableCircle(h as Circle) : null; + => h is HitCircle ? new DrawableCircle(h as HitCircle) : null; } } diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs index 90b62ef98a..d52eace965 100644 --- a/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs +++ b/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs @@ -136,7 +136,7 @@ namespace osu.Game.Tests.Beatmaps.Formats Assert.AreEqual(new Vector2(192, 168), slider.Position); Assert.AreEqual(956, slider.StartTime); Assert.AreEqual(SampleType.None, slider.Sample.Type); - var circle = beatmap.HitObjects[1] as Circle; + var circle = beatmap.HitObjects[1] as HitCircle; Assert.IsNotNull(circle); Assert.AreEqual(new Vector2(304, 56), circle.Position); Assert.AreEqual(1285, circle.StartTime);