h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 23:23:04 +08:00
Code Issues Releases Wiki Activity

Fix break generation not accounting for concurrent hitobjects correctly

Browse Source
This commit is contained in:
Dean Herbert 2024-06-27 12:10:26 +09:00
parent bbacfc8d23
commit 7ef7e5f163
No known key found for this signature in database
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Screens/Edit/EditorBeatmapProcessor.cs
View File

@ -48,15 +48,20 @@ namespace osu.Game.Screens.Edit
} }
} }
double currentMaxEndTime = double.MinValue;
for (int i = 1; i < Beatmap.HitObjects.Count; ++i) for (int i = 1; i < Beatmap.HitObjects.Count; ++i)
{ {
double previousObjectEndTime = Beatmap.HitObjects[i - 1].GetEndTime(); // Keep track of the maximum end time encountered thus far.
// This handles cases like osu!mania's hold notes, which could have concurrent other objects after their start time.
currentMaxEndTime = Math.Max(currentMaxEndTime, Beatmap.HitObjects[i - 1].GetEndTime());
double nextObjectStartTime = Beatmap.HitObjects[i].StartTime; double nextObjectStartTime = Beatmap.HitObjects[i].StartTime;
if (nextObjectStartTime - previousObjectEndTime < BreakPeriod.MIN_GAP_DURATION) if (nextObjectStartTime - currentMaxEndTime < BreakPeriod.MIN_GAP_DURATION)
continue; continue;
double breakStartTime = previousObjectEndTime + BreakPeriod.GAP_BEFORE_BREAK; double breakStartTime = currentMaxEndTime + BreakPeriod.GAP_BEFORE_BREAK;
double breakEndTime = nextObjectStartTime - Math.Max(BreakPeriod.GAP_AFTER_BREAK, Beatmap.ControlPointInfo.TimingPointAt(nextObjectStartTime).BeatLength * 2); double breakEndTime = nextObjectStartTime - Math.Max(BreakPeriod.GAP_AFTER_BREAK, Beatmap.ControlPointInfo.TimingPointAt(nextObjectStartTime).BeatLength * 2);
if (breakEndTime - breakStartTime < BreakPeriod.MIN_BREAK_DURATION) if (breakEndTime - breakStartTime < BreakPeriod.MIN_BREAK_DURATION)