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

Adjust tuple usage

Browse Source
This commit is contained in:
Leon Gebler 2021-02-23 00:16:35 +01:00
parent 3491021f72
commit 71b30bdbbb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
View File

@ -199,12 +199,12 @@ namespace osu.Game.Rulesets.Osu.Edit
Quad selectionQuad = getSurroundingQuad(new OsuHitObject[] { slider });
Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
(bool X, bool Y) inBounds = isQuadInBounds(scaledQuad);
(bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
if (!inBounds.X)
if (!xInBounds)
pathRelativeDeltaScale.X = 1;
if (!inBounds.Y)
if (!yInBounds)
pathRelativeDeltaScale.Y = 1;
foreach (var point in slider.Path.ControlPoints)
@ -221,17 +221,17 @@ namespace osu.Game.Rulesets.Osu.Edit
Quad selectionQuad = getSurroundingQuad(hitObjects);
Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
(bool X, bool Y) inBounds = isQuadInBounds(scaledQuad);
(bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
foreach (var h in hitObjects)
{
var newPosition = h.Position;
// guard against no-ops and NaN.
if (scale.X != 0 && selectionQuad.Width > 0 && inBounds.X)
if (scale.X != 0 && selectionQuad.Width > 0 && xInBounds)
newPosition.X = selectionQuad.TopLeft.X + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
if (scale.Y != 0 && selectionQuad.Height > 0 && inBounds.Y)
if (scale.Y != 0 && selectionQuad.Height > 0 && yInBounds)
newPosition.Y = selectionQuad.TopLeft.Y + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
h.Position = newPosition;