RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-23 22:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor IsHitObjectOnBeat to be understandable

Browse Source
This commit is contained in:
Dean Herbert 2022-09-09 18:00:51 +09:00
parent a2f96ea120
commit 31cd7cdca0
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
View File

@ -195,19 +195,17 @@ namespace osu.Game.Rulesets.Osu.Utils
/// <returns>true if hitObject is on a (down-)beat, false otherwise.</returns>
public static bool IsHitObjectOnBeat(OsuBeatmap beatmap, OsuHitObject hitObject, bool downbeatsOnly = false)
{
var timingPoints = beatmap.ControlPointInfo.TimingPoints;
var currentTimingPoint = timingPoints.LastOrDefault(p => p.Time <= hitObject.StartTime);
var timingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
if (currentTimingPoint == null)
return false;
double timeSinceTimingPoint = hitObject.StartTime - timingPoint.Time;
double timeSinceTimingPoint = hitObject.StartTime - currentTimingPoint.Time;
double beatLength = timingPoint.BeatLength;
double length = downbeatsOnly
? currentTimingPoint.BeatLength * currentTimingPoint.TimeSignature.Numerator
: currentTimingPoint.BeatLength;
if (downbeatsOnly)
beatLength *= timingPoint.TimeSignature.Numerator;
return (timeSinceTimingPoint + 1) % length < 2;
// Ensure within 1ms of expected location.
return Math.Abs(timeSinceTimingPoint + 1) % beatLength < 2;
}
/// <summary>