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

Sort beat lengths rather than linear search

Browse Source
This commit is contained in:
smoogipoo 2021-02-08 19:03:19 +09:00
parent b40b159acb
commit 18e3f8c233
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game/Beatmaps/Beatmap.cs
View File

@ -55,7 +55,7 @@ namespace osu.Game.Beatmaps
// Note: This is more accurate and may present different results because osu-stable didn't have the ability to calculate slider durations in this context.
double lastTime = HitObjects.LastOrDefault()?.GetEndTime() ?? ControlPointInfo.TimingPoints.LastOrDefault()?.Time ?? 0;
var beatLengthsAndDurations =
var mostCommon =
// Construct a set of (beatLength, duration) tuples for each individual timing point.
ControlPointInfo.TimingPoints.Select((t, i) =>
{
@ -68,23 +68,10 @@ namespace osu.Game.Beatmaps
// Aggregate durations into a set of (beatLength, duration) tuples for each beat length
.GroupBy(t => Math.Round(t.beatLength * 1000) / 1000)
.Select(g => (beatLength: g.Key, duration: g.Sum(t => t.duration)))
// And if there are no timing points, use a default.
.DefaultIfEmpty((TimingControlPoint.DEFAULT_BEAT_LENGTH, 0));
// Get the most common one, or 0 as a suitable default
.OrderByDescending(i => i.duration).FirstOrDefault();
// Find the single beat length with the maximum aggregate duration.
double maxDurationBeatLength = double.NegativeInfinity;
double maxDuration = double.NegativeInfinity;
foreach (var (beatLength, duration) in beatLengthsAndDurations)
{
if (duration > maxDuration)
{
maxDuration = duration;
maxDurationBeatLength = beatLength;
}
}
return maxDurationBeatLength;
return mostCommon.beatLength;
}
IBeatmap IBeatmap.Clone() => Clone();