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

Make the code more clear

Browse Source
This commit is contained in:
Huo Yaoyuan 2024-02-29 20:02:04 +08:00
parent 9a40a4f700
commit a11e63b184
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,49 +265,59 @@ namespace osu.Game.Rulesets.Objects.Legacy
private PathControlPoint[] convertPathString(string pointString, Vector2 offset) private PathControlPoint[] convertPathString(string pointString, Vector2 offset)
{ {
// This code takes on the responsibility of handling explicit segments of the path ("X" & "Y" from above). Implicit segments are handled by calls to convertPoints(). // This code takes on the responsibility of handling explicit segments of the path ("X" & "Y" from above). Implicit segments are handled by calls to convertPoints().
string[] pointSplit = pointString.Split('|'); string[] pointStringSplit = pointString.Split('|');
var points = ArrayPool<Vector2>.Shared.Rent(pointSplit.Length); var pointsBuffer = ArrayPool<Vector2>.Shared.Rent(pointStringSplit.Length);
var segments = ArrayPool<(PathType Type, int StartIndex)>.Shared.Rent(pointSplit.Length); var segmentsBuffer = ArrayPool<(PathType Type, int StartIndex)>.Shared.Rent(pointStringSplit.Length);
int pointsCount = 0; int currentPointsIndex = 0;
int segmentsCount = 0; int currentSegmentsIndex = 0;
try try
{ {
foreach (string s in pointSplit) foreach (string s in pointStringSplit)
{ {
if (char.IsLetter(s[0])) if (char.IsLetter(s[0]))
{ {
// The start of a new segment(indicated by having an alpha character at position 0). // The start of a new segment(indicated by having an alpha character at position 0).
var pathType = convertPathType(s); var pathType = convertPathType(s);
segments[segmentsCount++] = (pathType, pointsCount); segmentsBuffer[currentSegmentsIndex++] = (pathType, currentPointsIndex);
// First segment is prepended by an extra zero point // First segment is prepended by an extra zero point
if (pointsCount == 0) if (currentPointsIndex == 0)
points[pointsCount++] = Vector2.Zero; pointsBuffer[currentPointsIndex++] = Vector2.Zero;
} }
else else
{ {
points[pointsCount++] = readPoint(s, offset); pointsBuffer[currentPointsIndex++] = readPoint(s, offset);
} }
} }
int pointsCount = currentPointsIndex;
int segmentsCount = currentSegmentsIndex;
var controlPoints = new List<ArraySegment<PathControlPoint>>(pointsCount); var controlPoints = new List<ArraySegment<PathControlPoint>>(pointsCount);
var allPoints = new ArraySegment<Vector2>(pointsBuffer, 0, pointsCount);
for (int i = 0; i < segmentsCount; i++) for (int i = 0; i < segmentsCount; i++)
{ {
int startIndex = segments[i].StartIndex; if (i < segmentsCount - 1)
int endIndex = i < segmentsCount - 1 ? segments[i + 1].StartIndex : pointsCount; {
Vector2? endPoint = i < segmentsCount - 1 ? points[endIndex] : null; int startIndex = segmentsBuffer[i].StartIndex;
controlPoints.AddRange(convertPoints(segments[i].Type, new ArraySegment<Vector2>(points, startIndex, endIndex - startIndex), endPoint)); int endIndex = segmentsBuffer[i + 1].StartIndex;
controlPoints.AddRange(convertPoints(segmentsBuffer[i].Type, allPoints[startIndex..endIndex], pointsBuffer[endIndex]));
}
else
{
int startIndex = segmentsBuffer[i].StartIndex;
controlPoints.AddRange(convertPoints(segmentsBuffer[i].Type, allPoints[startIndex..], null));
}
} }
return mergePointsLists(controlPoints); return mergePointsLists(controlPoints);
} }
finally finally
{ {
ArrayPool<Vector2>.Shared.Return(points); ArrayPool<Vector2>.Shared.Return(pointsBuffer);
ArrayPool<(PathType Type, int StartIndex)>.Shared.Return(segments); ArrayPool<(PathType, int)>.Shared.Return(segmentsBuffer);
} }
static Vector2 readPoint(string value, Vector2 startPos) static Vector2 readPoint(string value, Vector2 startPos)