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

Handle proxied approach layer better and add slider's approach circle (previously missing).

Browse Source
This commit is contained in:
Dean Herbert
2017-02-14 10:22:28 +09:00
parent 9a5ac64332
commit fc192906ea
5 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
View File

@ -11,7 +11,7 @@ using OpenTK;
namespace osu.Game.Modes.Osu.Objects.Drawables
{
public class DrawableHitCircle : DrawableOsuHitObject
public class DrawableHitCircle : DrawableOsuHitObject, IDrawableHitObjectWithProxiedApproach
{
private HitCircle osuObject;
@ -156,5 +156,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
break;
}
}
public Drawable ProxiedLayer => ApproachCircle;
}
}

5
osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -6,11 +6,10 @@ using osu.Framework.Graphics;
using osu.Game.Modes.Objects.Drawables;
using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
using OpenTK;
using osu.Framework.Input;
namespace osu.Game.Modes.Osu.Objects.Drawables
{
class DrawableSlider : DrawableOsuHitObject
public class DrawableSlider : DrawableOsuHitObject, IDrawableHitObjectWithProxiedApproach
{
private Slider slider;
@ -133,6 +132,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
FadeOut(800);
}
public Drawable ProxiedLayer => initialCircle.ApproachCircle;
}
internal interface ISliderProgress

4
osu.Game.Modes.Osu/UI/OsuPlayfield.cs
View File

@ -60,10 +60,10 @@ namespace osu.Game.Modes.Osu.UI
public override void Add(DrawableHitObject h)
{
h.Depth = (float)h.HitObject.StartTime;
DrawableHitCircle c = h as DrawableHitCircle;
IDrawableHitObjectWithProxiedApproach c = h as IDrawableHitObjectWithProxiedApproach;
if (c != null)
{
approachCircles.Add(c.ApproachCircle.CreateProxy());
approachCircles.Add(c.ProxiedLayer.CreateProxy());
}
h.OnJudgement += judgement;