h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-31 13:33:20 +08:00
Code Issues Releases Wiki Activity

add back protection against perfect curve segments with > 3 points

Browse Source
This commit is contained in:
OliBomby 2024-08-21 12:03:15 +02:00
parent db568bfb79
commit eefd7cf083
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
View File

@ -347,17 +347,23 @@ namespace osu.Game.Rulesets.Objects.Legacy
vertices[i] = new PathControlPoint { Position = points[i] }; vertices[i] = new PathControlPoint { Position = points[i] };
// Edge-case rules (to match stable). // Edge-case rules (to match stable).
if (type == PathType.PERFECT_CURVE && FormatVersion < LegacyBeatmapEncoder.FIRST_LAZER_VERSION) if (type == PathType.PERFECT_CURVE)
{ {
int endPointLength = endPoint == null ? 0 : 1; int endPointLength = endPoint == null ? 0 : 1;
if (vertices.Length + endPointLength != 3) if (FormatVersion < LegacyBeatmapEncoder.FIRST_LAZER_VERSION)
type = PathType.BEZIER;
else if (isLinear(points[0], points[1], endPoint ?? points[2]))
{ {
// osu-stable special-cased colinear perfect curves to a linear path if (vertices.Length + endPointLength != 3)
type = PathType.LINEAR; type = PathType.BEZIER;
else if (isLinear(points[0], points[1], endPoint ?? points[2]))
{
// osu-stable special-cased colinear perfect curves to a linear path
type = PathType.LINEAR;
}
} }
else if (vertices.Length + endPointLength > 3)
// Lazer supports perfect curves with less than 3 points and colinear points
type = PathType.BEZIER;
} }
// The first control point must have a definite type. // The first control point must have a definite type.