sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09: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> /// <returns>true if hitObject is on a (down-)beat, false otherwise.</returns>
public static bool IsHitObjectOnBeat(OsuBeatmap beatmap, OsuHitObject hitObject, bool downbeatsOnly = false) public static bool IsHitObjectOnBeat(OsuBeatmap beatmap, OsuHitObject hitObject, bool downbeatsOnly = false)
{ {
var timingPoints = beatmap.ControlPointInfo.TimingPoints; var timingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
var currentTimingPoint = timingPoints.LastOrDefault(p => p.Time <= hitObject.StartTime);
if (currentTimingPoint == null) double timeSinceTimingPoint = hitObject.StartTime - timingPoint.Time;
return false;
double timeSinceTimingPoint = hitObject.StartTime - currentTimingPoint.Time; double beatLength = timingPoint.BeatLength;
double length = downbeatsOnly if (downbeatsOnly)
? currentTimingPoint.BeatLength * currentTimingPoint.TimeSignature.Numerator beatLength *= timingPoint.TimeSignature.Numerator;
: currentTimingPoint.BeatLength;
return (timeSinceTimingPoint + 1) % length < 2; // Ensure within 1ms of expected location.
return Math.Abs(timeSinceTimingPoint + 1) % beatLength < 2;
} }
/// <summary> /// <summary>