sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 09:03:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #841 from smoogipooo/controlpoint-rework

Browse Source 
Fix negative beatIndex NewBeats not being correctly fired
This commit is contained in:
Dean Herbert
2017-05-24 12:14:17 +09:00
committed by GitHub
parent 5efe693e79 c4916426f5
commit 03c745abc3
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
View File

@ -55,7 +55,7 @@ namespace osu.Game.Beatmaps.ControlPoints
/// </summary> /// </summary>
/// <param name="time">The time to find the timing control point at.</param> /// <param name="time">The time to find the timing control point at.</param>
/// <returns>The timing control point.</returns> /// <returns>The timing control point.</returns>
public TimingControlPoint TimingPointAt(double time) => binarySearch(TimingPoints, time); public TimingControlPoint TimingPointAt(double time) => binarySearch(TimingPoints, time, TimingPoints.FirstOrDefault());
/// <summary> /// <summary>
/// Finds the maximum BPM represented by any timing control point. /// Finds the maximum BPM represented by any timing control point.
@ -75,14 +75,21 @@ namespace osu.Game.Beatmaps.ControlPoints
public double BPMMode => public double BPMMode =>
60000 / (TimingPoints.GroupBy(c => c.BeatLength).OrderByDescending(grp => grp.Count()).FirstOrDefault()?.FirstOrDefault() ?? new TimingControlPoint()).BeatLength; 60000 / (TimingPoints.GroupBy(c => c.BeatLength).OrderByDescending(grp => grp.Count()).FirstOrDefault()?.FirstOrDefault() ?? new TimingControlPoint()).BeatLength;
private T binarySearch<T>(SortedList<T> list, double time) /// <summary>
/// Binary searches one of the control point lists to find the active control point at <paramref name="time"/>.
/// </summary>
/// <param name="list">The list to search.</param>
/// <param name="time">The time to find the control point at.</param>
/// <param name="prePoint">The control point to use when <paramref name="time"/> is before any control points. If null, a new control point will be constructed.</param>
/// <returns>The active control point at <paramref name="time"/>.</returns>
private T binarySearch<T>(SortedList<T> list, double time, T prePoint = null)
where T : ControlPoint, new() where T : ControlPoint, new()
{ {
if (list.Count == 0) if (list.Count == 0)
return new T(); return new T();
if (time < list[0].Time) if (time < list[0].Time)
return new T(); return prePoint ?? new T();
int index = list.BinarySearch(new T() { Time = time }); int index = list.BinarySearch(new T() { Time = time });
@ -92,8 +99,8 @@ namespace osu.Game.Beatmaps.ControlPoints
index = ~index; index = ~index;
if (index == list.Count) // BinarySearch will return the index of the first element _greater_ than the search
return list[list.Count - 1]; // This is the inactive point - the active point is the one before it (index - 1)
return list[index - 1]; return list[index - 1];
} }
} }