sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add StackedPosition/StackedEndPosition and offset slider curves by StackOffset.

Browse Source
This commit is contained in:
Damnae
2017-02-09 08:29:21 +01:00
parent 38b25a7df3
commit a79fde897b
6 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
osuObject = h;
Origin = Anchor.Centre;
Position = osuObject.Position + h.StackOffset;
Position = osuObject.StackedPosition;
Scale = new Vector2(osuObject.Scale);
Children = new Drawable[]

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

@ -31,7 +31,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
{
body = new SliderBody(s)
{
Position = s.Position + s.StackOffset,
Position = s.StackedPosition,
PathWidth = s.Scale * 64,
},
bouncer1 = new SliderBouncer(s, false)
@ -41,7 +41,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
},
bouncer2 = new SliderBouncer(s, true)
{
Position = s.Position + s.StackOffset,
Position = s.StackedPosition,
Scale = new Vector2(s.Scale),
},
ball = new SliderBall(s)
@ -51,7 +51,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
initialCircle = new DrawableHitCircle(new HitCircle
{
StartTime = s.StartTime,
Position = s.Position + s.StackOffset,
Position = s.StackedPosition,
Scale = s.Scale,
Colour = s.Colour,
Sample = s.Sample,
@ -89,11 +89,11 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
if (repeat % 2 == 1)
progress = 1 - progress;
bouncer2.Position = slider.Curve.PositionAt(body.SnakedEnd ?? 0) + slider.StackOffset;
bouncer2.Position = slider.Curve.PositionAt(body.SnakedEnd ?? 0);
//todo: we probably want to reconsider this before adding scoring, but it looks and feels nice.
if (initialCircle.Judgement?.Result != HitResult.Hit)
initialCircle.Position = slider.Curve.PositionAt(progress) + slider.StackOffset;
initialCircle.Position = slider.Curve.PositionAt(progress);
components.ForEach(c => c.UpdateProgress(progress, repeat));
}

2
osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
Direction = FlowDirection.VerticalOnly;
Spacing = new Vector2(0, 2);
Position = (h?.EndPosition ?? Vector2.Zero) + judgement.PositionOffset;
Position = (h?.StackedEndPosition ?? Vector2.Zero) + judgement.PositionOffset;
Children = new Drawable[]
{