h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 08:02:55 +08:00
Code Issues Releases Wiki Activity

DrawableCircle -> DrawableHitCircle.

Browse Source
This commit is contained in:
Dean Herbert 2016-11-16 16:20:58 +09:00
parent da1f6eeab5
commit fba748b24e
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ namespace osu.Desktop.VisualTests.Tests
Position = new Vector2((i - count / 2) * 14), Position = new Vector2((i - count / 2) * 14),
}; };
Add(new DrawableCircle(h) Add(new DrawableHitCircle(h)
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,

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

@ -11,13 +11,12 @@ using osu.Framework.Graphics.Textures;
using osu.Framework.Graphics.Transformations; using osu.Framework.Graphics.Transformations;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
using osu.Game.Modes.Objects;
using osu.Game.Modes.Objects.Drawables; using osu.Game.Modes.Objects.Drawables;
using OpenTK; using OpenTK;
namespace osu.Game.Modes.Osu.Objects.Drawables namespace osu.Game.Modes.Osu.Objects.Drawables
{ {
public class DrawableCircle : DrawableHitObject public class DrawableHitCircle : DrawableHitObject
{ {
private Sprite approachCircle; private Sprite approachCircle;
private CircleLayer circle; private CircleLayer circle;
@ -28,7 +27,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
private GlowLayer glow; private GlowLayer glow;
private OsuBaseHit h; private OsuBaseHit h;
public DrawableCircle(HitCircle h) : base(h) public DrawableHitCircle(HitCircle h) : base(h)
{ {
this.h = h; this.h = h;

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

@ -4,8 +4,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.Osu.Objects;
using osu.Game.Modes.Osu.Objects.Drawables;
using osu.Game.Modes.UI; using osu.Game.Modes.UI;
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 HitCircle ? new DrawableCircle(h as HitCircle) : null; => h is HitCircle ? new DrawableHitCircle(h as HitCircle) : null;
} }
} }