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

General fix-ups for slider class.

Browse Source
This commit is contained in:
Dean Herbert 2016-11-28 12:40:24 +09:00
parent 54fc25e163
commit e271bcec63
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,15 +59,15 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
Colour = osuObject.Colour,
}
};
//may not be so correct
Size = circle.DrawSize;
}
protected override void LoadComplete()
{
base.LoadComplete();
//may not be so correct
Size = circle.DrawSize;
//force application of the state that was set before we loaded.
UpdateState(State);
}

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

@ -1,38 +1,53 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Modes.Objects.Drawables;
using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
using OpenTK;
using osu.Framework.Graphics.Sprites;
using OpenTK.Graphics;
namespace osu.Game.Modes.Osu.Objects.Drawables
{
class DrawableSlider : DrawableOsuHitObject
{
private Path path;
private DrawableHitCircle startCircle;
private Slider slider;
public DrawableSlider(Slider s) : base(s)
{
Origin = Anchor.Centre;
Position = new Vector2(s.Position.X, s.Position.Y);
slider = s;
Path sliderPath;
Add(sliderPath = new Path());
Origin = Anchor.TopLeft;
Position = Vector2.Zero;
for (int i = 0; i < s.Curve.Path.Count; ++i)
sliderPath.Positions.Add(s.Curve.Path[i] - s.Position);
Add(new DrawableHitCircle(new HitCircle
Children = new Drawable[]
{
StartTime = s.StartTime,
Position = sliderPath.Positions[0] - s.Position,
})
{
Depth = 1
});
startCircle = new DrawableHitCircle(new HitCircle
{
StartTime = s.StartTime,
Position = s.Position,
Colour = s.Colour,
})
{
Depth = 1 //override time-based depth.
},
path = new Path
{
Colour = s.Colour,
}
};
}
protected override void LoadComplete()
{
base.LoadComplete();
for (int i = 0; i < slider.Curve.Path.Count; ++i)
path.Positions.Add(slider.Curve.Path[i]);
path.PathWidth = startCircle.DrawWidth / 4;
//force application of the state that was set before we loaded.
UpdateState(State);
}