sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Circle -> HitCircle.

Browse Source
This commit is contained in:
Dean Herbert 2016-11-16 16:16:45 +09:00
parent 37edbd355e
commit da1f6eeab5
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
View File

@ -43,7 +43,7 @@ namespace osu.Desktop.VisualTests.Tests
int time = 500; int time = 500;
for (int i = 0; i < 100; i++) for (int i = 0; i < 100; i++)
{ {
objects.Add(new Circle() objects.Add(new HitCircle()
{ {
StartTime = time, StartTime = time,
Position = new Vector2(RNG.Next(0, 512), RNG.Next(0, 384)) Position = new Vector2(RNG.Next(0, 512), RNG.Next(0, 384))

2
osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
View File

@ -38,7 +38,7 @@ namespace osu.Desktop.VisualTests.Tests
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
var h = new Circle var h = new HitCircle
{ {
StartTime = ourClock.CurrentTime + 1000 + i * 80, StartTime = ourClock.CurrentTime + 1000 + i * 80,
Position = new Vector2((i - count / 2) * 14), Position = new Vector2((i - count / 2) * 14),

2
osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
View File

@ -38,7 +38,7 @@ namespace osu.Desktop.VisualTests.Tests
int time = 1500; int time = 1500;
for (int i = 0; i < 50; i++) for (int i = 0; i < 50; i++)
{ {
objects.Add(new Circle() objects.Add(new HitCircle()
{ {
StartTime = time, StartTime = time,
Position = new Vector2(RNG.Next(0, 512), RNG.Next(0, 384)), Position = new Vector2(RNG.Next(0, 512), RNG.Next(0, 384)),

2
osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
private GlowLayer glow; private GlowLayer glow;
private OsuBaseHit h; private OsuBaseHit h;
public DrawableCircle(Circle h) : base(h) public DrawableCircle(HitCircle h) : base(h)
{ {
this.h = h; this.h = h;

2
osu.Game.Mode.Osu/Objects/HitCircle.cs
View File

@ -3,7 +3,7 @@
namespace osu.Game.Modes.Osu.Objects namespace osu.Game.Modes.Osu.Objects
{ {
public class Circle : OsuBaseHit public class HitCircle : OsuBaseHit
{ {
} }
} }

2
osu.Game.Mode.Osu/Objects/OsuHitObjectParser.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Modes.Osu.Objects
switch (type) switch (type)
{ {
case OsuBaseHit.HitObjectType.Circle: case OsuBaseHit.HitObjectType.Circle:
result = new Circle(); result = new HitCircle();
break; break;
case OsuBaseHit.HitObjectType.Slider: case OsuBaseHit.HitObjectType.Slider:
result = new Slider(); result = new Slider();

4
osu.Game.Mode.Osu/UI/OsuHitRenderer.cs
View File

@ -3,8 +3,8 @@
using osu.Game.Modes.Objects; using osu.Game.Modes.Objects;
using osu.Game.Modes.Objects.Drawables; using osu.Game.Modes.Objects.Drawables;
using osu.Game.Modes.Osu.Objects;
using osu.Game.Modes.UI; using osu.Game.Modes.UI;
using Circle = osu.Game.Modes.Osu.Objects.Circle;
using DrawableCircle = osu.Game.Modes.Osu.Objects.Drawables.DrawableCircle; using DrawableCircle = osu.Game.Modes.Osu.Objects.Drawables.DrawableCircle;
using OsuBaseHit = osu.Game.Modes.Osu.Objects.OsuBaseHit; using OsuBaseHit = osu.Game.Modes.Osu.Objects.OsuBaseHit;
using OsuConverter = osu.Game.Modes.Osu.Objects.OsuConverter; 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 Playfield CreatePlayfield() => new OsuPlayfield();
protected override DrawableHitObject GetVisualRepresentation(OsuBaseHit h) protected override DrawableHitObject GetVisualRepresentation(OsuBaseHit h)
=> h is Circle ? new DrawableCircle(h as Circle) : null; => h is HitCircle ? new DrawableCircle(h as HitCircle) : null;
} }
} }

2
osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs
View File

@ -136,7 +136,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
Assert.AreEqual(new Vector2(192, 168), slider.Position); Assert.AreEqual(new Vector2(192, 168), slider.Position);
Assert.AreEqual(956, slider.StartTime); Assert.AreEqual(956, slider.StartTime);
Assert.AreEqual(SampleType.None, slider.Sample.Type); 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.IsNotNull(circle);
Assert.AreEqual(new Vector2(304, 56), circle.Position); Assert.AreEqual(new Vector2(304, 56), circle.Position);
Assert.AreEqual(1285, circle.StartTime); Assert.AreEqual(1285, circle.StartTime);