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

Merge branch 'refs/heads/master' into fix-triangles

Browse Source
This commit is contained in:
Dean Herbert 2016-11-28 10:44:27 +09:00
commit 116492df68
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 744ed65bbc3b2ca96135abecddad2d069a1fe817 Subproject commit fdea70aee37b040d56fac5e9b27a18ed77f2bfb9

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

@ -24,7 +24,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
private GlowPiece glow; private GlowPiece glow;
private HitExplosion explosion; private HitExplosion explosion;
public DrawableHitCircle(HitCircle h) : base(h) public DrawableHitCircle(OsuHitObject h) : base(h)
{ {
osuObject = h; osuObject = h;

24
osu.Game.Mode.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -2,6 +2,7 @@
using osu.Game.Modes.Objects.Drawables; using osu.Game.Modes.Objects.Drawables;
using osu.Game.Modes.Osu.Objects.Drawables.Pieces; using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
using OpenTK; using OpenTK;
using osu.Framework.Graphics.Sprites;
namespace osu.Game.Modes.Osu.Objects.Drawables namespace osu.Game.Modes.Osu.Objects.Drawables
{ {
@ -10,17 +11,16 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
public DrawableSlider(Slider h) : base(h) public DrawableSlider(Slider h) : base(h)
{ {
Origin = Anchor.Centre; Origin = Anchor.Centre;
RelativePositionAxes = Axes.Both; Position = new Vector2(h.Position.X, h.Position.Y);
Position = new Vector2(h.Position.X / 512, h.Position.Y / 384);
for (float i = 0; i <= 1; i += 0.1f) Path sliderPath;
{ Add(sliderPath = new Path());
Add(new CirclePiece
{ for (int i = 0; i < h.Curve.Path.Count; ++i)
Colour = h.Colour, sliderPath.Positions.Add(h.Curve.Path[i] - h.Position);
Position = h.Curve.PositionAt(i) - h.Position //non-relative?
}); h.Position = Vector2.Zero;
} Add(new DrawableHitCircle(h));
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -39,10 +39,10 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
Alpha = 0; Alpha = 0;
Delay(HitObject.StartTime - 200 - Time.Current, true); Delay(HitObject.StartTime - 450 - Time.Current, true);
FadeIn(200); FadeIn(200);
Delay(200 + HitObject.Duration); Delay(450 + HitObject.Duration);
FadeOut(200); FadeOut(200);
} }
} }