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

Merge pull request #208 from Tom94/fix-multi-segment-sliders 

Add treatment of slider segments encoded by the same vertex appearing…
This commit is contained in:
Dean Herbert 2016-11-30 12:20:27 +09:00 committed by GitHub
parent d0065d2d20 e2f279bda4
commit b56dec8f98
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
osu.Game.Mode.Osu/Objects/SliderCurve.cs
View File

@ -13,17 +13,40 @@ public class SliderCurve
private List<Vector2> calculatedPath;
public void Calculate()
private List<Vector2> calculateSubpath(List<Vector2> subpath)
{
switch (CurveType)
{
case CurveTypes.Linear:
calculatedPath = Path;
break;
return subpath;
default:
var bezier = new BezierApproximator(Path);
calculatedPath = bezier.CreateBezier();
break;
return new BezierApproximator(subpath).CreateBezier();
}
}
public void Calculate()
{
calculatedPath = new List<Vector2>();
// Sliders may consist of various subpaths separated by two consecutive vertices
// with the same position. The following loop parses these subpaths and computes
// their shape independently, consecutively appending them to calculatedPath.
List<Vector2> subpath = new List<Vector2>();
for (int i = 0; i < Path.Count; ++i)
{
subpath.Add(Path[i]);
if (i == Path.Count - 1 || Path[i] == Path[i + 1])
{
// If we already constructed a subpath previously, then the new subpath
// will have as starting position the end position of the previous subpath.
// Hence we can and should remove the previous endpoint to avoid a segment
// with 0 length.
if (calculatedPath.Count > 0)
calculatedPath.RemoveAt(calculatedPath.Count - 1);
calculatedPath.AddRange(calculateSubpath(subpath));
subpath.Clear();
}
}
}