RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 10:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid modulo when finding slider node index

Browse Source
This commit is contained in:
Henry Lin 2021-06-24 10:33:54 +08:00
parent 3eab540bcc
commit 98003ec548
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs
View File

@ -20,6 +20,7 @@ using osu.Game.Graphics.Containers;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Osu.Beatmaps; using osu.Game.Rulesets.Osu.Beatmaps;
using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Objects.Drawables; using osu.Game.Rulesets.Osu.Objects.Drawables;
@ -413,30 +414,48 @@ namespace osu.Game.Rulesets.Osu.Mods
/// <returns>Hit samples</returns> /// <returns>Hit samples</returns>
private IList<HitSampleInfo> getSamplesAtTime(IEnumerable<OsuHitObject> hitObjects, double time) private IList<HitSampleInfo> getSamplesAtTime(IEnumerable<OsuHitObject> hitObjects, double time)
{ {
var sampleObj = hitObjects.FirstOrDefault(x => var sampleObj = hitObjects.FirstOrDefault(hitObject =>
{ {
if (Precision.AlmostEquals(time, x.StartTime)) return true; if (Precision.AlmostEquals(time, hitObject.StartTime))
return true;
if (!(x is Slider s)) if (!(hitObject is IHasPathWithRepeats s))
return false; return false;
if (!Precision.AlmostBigger(time, s.StartTime) if (!Precision.AlmostBigger(time, hitObject.StartTime)
|| !Precision.AlmostBigger(s.EndTime, time)) || !Precision.AlmostBigger(s.EndTime, time))
return false; return false;
return Precision.AlmostEquals((time - s.StartTime) % s.SpanDuration, 0); return nodeIndexFromTime(s, time - hitObject.StartTime) != -1;
}); });
if (sampleObj == null) return null; if (sampleObj == null) return null;
IList<HitSampleInfo> samples; IList<HitSampleInfo> samples;
if (sampleObj is Slider slider) if (sampleObj is Slider slider)
samples = slider.NodeSamples[(int)Math.Round((time - slider.StartTime) % slider.SpanDuration)]; samples = slider.NodeSamples[nodeIndexFromTime(slider, time - slider.StartTime)];
else else
samples = sampleObj.Samples; samples = sampleObj.Samples;
return samples; return samples;
} }
/// <summary>
/// Get the repeat node at a point in time.
/// </summary>
/// <param name="curve">The slider.</param>
/// <param name="timeSinceStart">The time since the start time of the slider.</param>
/// <returns>Index of the node. -1 if there isn't a node at the specific time.</returns>
private int nodeIndexFromTime(IHasPathWithRepeats curve, double timeSinceStart)
{
double spanDuration = curve.Duration / curve.SpanCount();
double nodeIndex = timeSinceStart / spanDuration;
if (Precision.AlmostEquals(nodeIndex - Math.Round(nodeIndex), 0))
return (int)Math.Round(nodeIndex);
return -1;
}
private bool isOverlappingWithRecent(IReadOnlyList<OsuHitObject> hitObjects, int idx) private bool isOverlappingWithRecent(IReadOnlyList<OsuHitObject> hitObjects, int idx)
{ {
var target = hitObjects[idx]; var target = hitObjects[idx];