sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

operate on vectors instead of vector components

Browse Source
This commit is contained in:
Gabe Livengood 2022-07-06 15:58:25 -04:00
parent a17e18103f
commit 0281bf672c
No known key found for this signature in database
GPG Key ID: 70321B78DAECE683
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game.Rulesets.Osu/Mods/OsuModRepel.cs
View File

@ -51,24 +51,19 @@ namespace osu.Game.Rulesets.Osu.Mods
foreach (var drawable in playfield.HitObjectContainer.AliveObjects) foreach (var drawable in playfield.HitObjectContainer.AliveObjects)
{ {
float x = Math.Clamp(2 * drawable.X - cursorPos.X, 0, OsuPlayfield.BASE_SIZE.X); var destination = Vector2.Clamp(2 * drawable.Position - cursorPos, Vector2.Zero, OsuPlayfield.BASE_SIZE);
float y = Math.Clamp(2 * drawable.Y - cursorPos.Y, 0, OsuPlayfield.BASE_SIZE.Y);
if (drawable.HitObject is Slider thisSlider) if (drawable.HitObject is Slider thisSlider)
{ {
var possibleMovementBounds = OsuHitObjectGenerationUtils.CalculatePossibleMovementBounds(thisSlider); var possibleMovementBounds = OsuHitObjectGenerationUtils.CalculatePossibleMovementBounds(thisSlider);
x = possibleMovementBounds.Width < 0 destination = Vector2.Clamp(
? x destination,
: Math.Clamp(x, possibleMovementBounds.Left, possibleMovementBounds.Right); new Vector2(possibleMovementBounds.Left, possibleMovementBounds.Top),
new Vector2(possibleMovementBounds.Right, possibleMovementBounds.Bottom)
y = possibleMovementBounds.Height < 0 );
? y
: Math.Clamp(y, possibleMovementBounds.Top, possibleMovementBounds.Bottom);
} }
var destination = new Vector2(x, y);
switch (drawable) switch (drawable)
{ {
case DrawableHitCircle circle: case DrawableHitCircle circle: