h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-15 14:47:18 +08:00
Code Issues Releases Wiki Activity

Merge pull request #21559 from OliBomby/stream-tool-1

Browse Source 
Add segment end completions list to SliderPath
This commit is contained in:
Dean Herbert 2023-01-11 15:31:04 +09:00 committed by GitHub
commit d1ca4ebd40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Rulesets/Objects/SliderPath.cs
View File

@ -42,6 +42,7 @@ namespace osu.Game.Rulesets.Objects
private readonly List<Vector2> calculatedPath = new List<Vector2>(); private readonly List<Vector2> calculatedPath = new List<Vector2>();
private readonly List<double> cumulativeLength = new List<double>(); private readonly List<double> cumulativeLength = new List<double>();
private readonly List<int> segmentEnds = new List<int>();
private readonly Cached pathCache = new Cached(); private readonly Cached pathCache = new Cached();
private double calculatedLength; private double calculatedLength;
@ -196,6 +197,16 @@ namespace osu.Game.Rulesets.Objects
return pointsInCurrentSegment; return pointsInCurrentSegment;
} }
/// <summary>
/// Returns the progress values at which segments of the path end.
/// </summary>
public IEnumerable<double> GetSegmentEnds()
{
ensureValid();
return segmentEnds.Select(i => cumulativeLength[i] / calculatedLength);
}
private void invalidate() private void invalidate()
{ {
pathCache.Invalidate(); pathCache.Invalidate();
@ -216,6 +227,7 @@ namespace osu.Game.Rulesets.Objects
private void calculatePath() private void calculatePath()
{ {
calculatedPath.Clear(); calculatedPath.Clear();
segmentEnds.Clear();
if (ControlPoints.Count == 0) if (ControlPoints.Count == 0)
return; return;
@ -241,6 +253,9 @@ namespace osu.Game.Rulesets.Objects
calculatedPath.Add(t); calculatedPath.Add(t);
} }
// Remember the index of the segment end
segmentEnds.Add(calculatedPath.Count - 1);
// Start the new segment at the current vertex // Start the new segment at the current vertex
start = i; start = i;
} }
@ -306,6 +321,10 @@ namespace osu.Game.Rulesets.Objects
{ {
cumulativeLength.RemoveAt(cumulativeLength.Count - 1); cumulativeLength.RemoveAt(cumulativeLength.Count - 1);
calculatedPath.RemoveAt(pathEndIndex--); calculatedPath.RemoveAt(pathEndIndex--);
// Shorten the last segment to the expected distance
if (segmentEnds.Count > 0)
segmentEnds[^1]--;
} }
} }