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

Use IHasRepeats instead of IHasPathWithRepeats

Browse Source
This commit is contained in:
Henry Lin 2021-06-28 11:33:19 +08:00
parent 3eaa04115f
commit ea8993d6d6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,7 +445,7 @@ namespace osu.Game.Rulesets.Osu.Mods
if (almostEquals(time, hitObject.StartTime)) if (almostEquals(time, hitObject.StartTime))
return true; return true;
if (!(hitObject is IHasPathWithRepeats s)) if (!(hitObject is IHasRepeats s))
return false; return false;
if (!almostBigger(time, hitObject.StartTime) if (!almostBigger(time, hitObject.StartTime)
|| !almostBigger(s.EndTime, time)) || !almostBigger(s.EndTime, time))
@ -457,7 +457,7 @@ namespace osu.Game.Rulesets.Osu.Mods
IList<HitSampleInfo> samples; IList<HitSampleInfo> samples;
if (sampleObj is IHasPathWithRepeats slider) if (sampleObj is IHasRepeats slider)
samples = slider.NodeSamples[nodeIndexFromTime(slider, time - sampleObj.StartTime)]; samples = slider.NodeSamples[nodeIndexFromTime(slider, time - sampleObj.StartTime)];
else else
samples = sampleObj.Samples; samples = sampleObj.Samples;
@ -471,7 +471,7 @@ namespace osu.Game.Rulesets.Osu.Mods
/// <param name="curve">The slider.</param> /// <param name="curve">The slider.</param>
/// <param name="timeSinceStart">The time since the start time of 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> /// <returns>Index of the node. -1 if there isn't a node at the specific time.</returns>
private int nodeIndexFromTime(IHasPathWithRepeats curve, double timeSinceStart) private int nodeIndexFromTime(IHasRepeats curve, double timeSinceStart)
{ {
double spanDuration = curve.Duration / curve.SpanCount(); double spanDuration = curve.Duration / curve.SpanCount();
double nodeIndex = timeSinceStart / spanDuration; double nodeIndex = timeSinceStart / spanDuration;