RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify variables for snake start/end.

This commit is contained in:
Dean Herbert 2016-12-07 16:00:29 +09:00
parent 2ba77746c0
commit 41b9a55460
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,11 +73,11 @@ protected override void Update()
if (repeat % 2 == 1)
progress = 1 - progress;
bouncer2.Position = slider.Curve.PositionAt(body.SnakedEnd);
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(body.SnakedStart);
initialCircle.Position = slider.Curve.PositionAt(body.SnakedStart ?? 0);
components.ForEach(c => c.UpdateProgress(progress, repeat));
}

25
osu.Game.Mode.Osu/Objects/Drawables/Pieces/SliderBody.cs
View File

@ -30,8 +30,8 @@ public float PathWidth
}
}
private double? drawnProgressStart;
private double? drawnProgressEnd;
public double? SnakedStart { get; private set; }
public double? SnakedEnd { get; private set; }
private Slider slider;
public SliderBody(Slider s)
@ -122,16 +122,13 @@ private void load(OsuConfigManager config)
path.Texture = texture;
}
public double SnakedEnd { get; private set; }
public double SnakedStart { get; private set; }
private List<Vector2> currentCurve = new List<Vector2>();
private bool updateSnaking(double p0, double p1)
{
if (drawnProgressStart == p0 && drawnProgressEnd == p1) return false;
if (SnakedStart == p0 && SnakedEnd == p1) return false;
drawnProgressStart = p0;
drawnProgressEnd = p1;
SnakedStart = p0;
SnakedEnd = p1;
slider.Curve.GetPathToProgress(currentCurve, p0, p1);
@ -144,23 +141,23 @@ private bool updateSnaking(double p0, double p1)
public void UpdateProgress(double progress, int repeat)
{
SnakedStart = 0;
SnakedEnd = snakingIn ? MathHelper.Clamp((Time.Current - (slider.StartTime - DrawableOsuHitObject.TIME_PREEMPT)) / DrawableOsuHitObject.TIME_FADEIN, 0, 1) : 1;
double start = 0;
double end = snakingIn ? MathHelper.Clamp((Time.Current - (slider.StartTime - DrawableOsuHitObject.TIME_PREEMPT)) / DrawableOsuHitObject.TIME_FADEIN, 0, 1) : 1;
if (repeat >= slider.RepeatCount - 1)
{
if (Math.Min(repeat, slider.RepeatCount - 1) % 2 == 1)
{
SnakedStart = 0;
SnakedEnd = snakingOut ? progress : 1;
start = 0;
end = snakingOut ? progress : 1;
}
else
{
SnakedStart = snakingOut ? progress : 0;
start = snakingOut ? progress : 0;
}
}
SetRange(SnakedStart, SnakedEnd);
SetRange(start, end);
}
}
}