sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Refactor and rename isOverlappingWithRecent

Browse Source
This commit is contained in:
Henry Lin
2021-06-24 12:02:48 +08:00
parent 71b5ed16c0
commit f8fe4ab482
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,7 +331,7 @@ namespace osu.Game.Rulesets.Osu.Mods
tryCount++;
if (tryCount % 10 == 0) distance *= 0.9f;
} while (distance >= obj.Radius * 2 && isOverlappingWithRecent(hitObjects, i));
} while (distance >= obj.Radius * 2 && checkForOverlap(hitObjects.SkipLast(hitObjects.Count - i).TakeLast(overlap_check_count), obj));
if (obj.LastInCombo)
direction = two_pi * nextSingle();
@ -470,11 +470,9 @@ namespace osu.Game.Rulesets.Osu.Mods
return -1;
}
private bool isOverlappingWithRecent(IReadOnlyList<OsuHitObject> hitObjects, int idx)
private bool checkForOverlap(IEnumerable<OsuHitObject> objectsToCheck, OsuHitObject target)
{
var target = hitObjects[idx];
return hitObjects.SkipLast(hitObjects.Count - idx).TakeLast(overlap_check_count)
.Any(h => Vector2.Distance(h.Position, target.Position) < target.Radius * 2);
return objectsToCheck.Any(h => Vector2.Distance(h.Position, target.Position) < target.Radius * 2);
}
/// <summary>