sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add special case for timing points

Browse Source 
Timing points can't fallback to defaults and must be added at least once.
This commit is contained in:
Dean Herbert
2019-10-26 11:38:05 +09:00
parent 7502b64541
commit 4290a71f44
1 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,28 +85,6 @@ namespace osu.Game.Beatmaps.ControlPoints
/// <returns>The timing control point.</returns> /// <returns>The timing control point.</returns>
public TimingControlPoint TimingPointAt(double time) => binarySearchWithFallback(TimingPoints, time, TimingPoints.Count > 0 ? TimingPoints[0] : null); public TimingControlPoint TimingPointAt(double time) => binarySearchWithFallback(TimingPoints, time, TimingPoints.Count > 0 ? TimingPoints[0] : null);
/// <summary>
/// Finds the closest <see cref="ControlPoint"/> of the same type as <see cref="referencePoint"/> that is active at <paramref name="time"/>.
/// </summary>
/// <param name="time">The time to find the timing control point at.</param>
/// <param name="referencePoint">A reference point to infer type.</param>
/// <returns>The timing control point.</returns>
public ControlPoint SimilarPointAt(double time, ControlPoint referencePoint)
{
switch (referencePoint)
{
case TimingControlPoint _: return TimingPointAt(time);
case EffectControlPoint _: return EffectPointAt(time);
case SampleControlPoint _: return SamplePointAt(time);
case DifficultyControlPoint _: return DifficultyPointAt(time);
}
return null;
}
/// <summary> /// <summary>
/// Finds the maximum BPM represented by any timing control point. /// Finds the maximum BPM represented by any timing control point.
/// </summary> /// </summary>
@ -184,7 +162,7 @@ namespace osu.Game.Beatmaps.ControlPoints
public void Add(double time, ControlPoint newPoint, bool force = false) public void Add(double time, ControlPoint newPoint, bool force = false)
{ {
if (!force && SimilarPointAt(time, newPoint)?.EquivalentTo(newPoint) == true) if (!force && checkAlreadyExisting(time, newPoint))
return; return;
GroupAt(time, true).Add(newPoint); GroupAt(time, true).Add(newPoint);
@ -209,6 +187,39 @@ namespace osu.Game.Beatmaps.ControlPoints
return null; return null;
} }
/// <summary>
/// Check whether <see cref="newPoint"/> should be added.
/// </summary>
/// <param name="time">The time to find the timing control point at.</param>
/// <param name="newPoint">A point to be added.</param>
/// <returns>Whether the new point should be added.</returns>
private bool checkAlreadyExisting(double time, ControlPoint newPoint)
{
ControlPoint existing = null;
switch (newPoint)
{
case TimingControlPoint _:
// Timing points are a special case and need to be added regardless of fallback availability.
existing = binarySearch(TimingPoints, time);
break;
case EffectControlPoint _:
existing = EffectPointAt(time);
break;
case SampleControlPoint _:
existing = SamplePointAt(time);
break;
case DifficultyControlPoint _:
existing = DifficultyPointAt(time);
break;
}
return existing?.EquivalentTo(newPoint) == true;
}
private void groupItemRemoved(ControlPoint obj) private void groupItemRemoved(ControlPoint obj)
{ {
switch (obj) switch (obj)