Resolve more compile errors

smoogipoo · Aug 20, 2024 · 331256e · 331256e
1 parent 19f3f64
commit 331256e
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
@@ -83,11 +83,11 @@ private bool passCondition()
                     break;
 
                 case 1:
-                    InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.BottomLeft);
+                    InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.BottomLeft.Xy);
                     break;
 
                 case 2:
-                    InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.BottomRight);
+                    InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.BottomRight.Xy);
                     break;
 
                 case 3:

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
@@ -183,8 +183,8 @@ public void TestDragHoldNoteSelectionVertically()
                 InputManager.ReleaseButton(MouseButton.Left);
             });
 
-            AddAssert("head note positioned correctly", () => Precision.AlmostEquals(holdNote.ScreenSpaceDrawQuad.BottomLeft, holdNote.Head.ScreenSpaceDrawQuad.BottomLeft));
-            AddAssert("tail note positioned correctly", () => Precision.AlmostEquals(holdNote.ScreenSpaceDrawQuad.TopLeft, holdNote.Tail.ScreenSpaceDrawQuad.BottomLeft));
+            AddAssert("head note positioned correctly", () => Precision.AlmostEquals(holdNote.ScreenSpaceDrawQuad.BottomLeft.Xy, holdNote.Head.ScreenSpaceDrawQuad.BottomLeft.Xy));
+            AddAssert("tail note positioned correctly", () => Precision.AlmostEquals(holdNote.ScreenSpaceDrawQuad.TopLeft.Xy, holdNote.Tail.ScreenSpaceDrawQuad.BottomLeft.Xy));
 
             AddAssert("head blueprint positioned correctly", () => this.ChildrenOfType<EditHoldNoteEndPiece>().ElementAt(0).DrawPosition == holdNote.Head.DrawPosition);
             AddAssert("tail blueprint positioned correctly", () => this.ChildrenOfType<EditHoldNoteEndPiece>().ElementAt(1).DrawPosition == holdNote.Tail.DrawPosition);
@@ -232,8 +232,8 @@ public void TestDragHoldNoteHead()
             AddAssert("start time moved back", () => holdNote!.StartTime, () => Is.LessThan(250));
             AddAssert("end time unchanged", () => holdNote.EndTime, () => Is.EqualTo(750));
 
-            AddAssert("head note positioned correctly", () => Precision.AlmostEquals(drawableHoldNote.ScreenSpaceDrawQuad.BottomLeft, drawableHoldNote.Head.ScreenSpaceDrawQuad.BottomLeft));
-            AddAssert("tail note positioned correctly", () => Precision.AlmostEquals(drawableHoldNote.ScreenSpaceDrawQuad.TopLeft, drawableHoldNote.Tail.ScreenSpaceDrawQuad.BottomLeft));
+            AddAssert("head note positioned correctly", () => Precision.AlmostEquals(drawableHoldNote.ScreenSpaceDrawQuad.BottomLeft.Xy, drawableHoldNote.Head.ScreenSpaceDrawQuad.BottomLeft.Xy));
+            AddAssert("tail note positioned correctly", () => Precision.AlmostEquals(drawableHoldNote.ScreenSpaceDrawQuad.TopLeft.Xy, drawableHoldNote.Tail.ScreenSpaceDrawQuad.BottomLeft.Xy));
 
             AddAssert("head blueprint positioned correctly", () => this.ChildrenOfType<EditHoldNoteEndPiece>().ElementAt(0).DrawPosition == drawableHoldNote.Head.DrawPosition);
             AddAssert("tail blueprint positioned correctly", () => this.ChildrenOfType<EditHoldNoteEndPiece>().ElementAt(1).DrawPosition == drawableHoldNote.Tail.DrawPosition);
@@ -281,8 +281,8 @@ public void TestDragHoldNoteTail()
             AddAssert("start time unchanged", () => holdNote!.StartTime, () => Is.EqualTo(250));
             AddAssert("end time moved forward", () => holdNote.EndTime, () => Is.GreaterThan(750));
 
-            AddAssert("head note positioned correctly", () => Precision.AlmostEquals(drawableHoldNote.ScreenSpaceDrawQuad.BottomLeft, drawableHoldNote.Head.ScreenSpaceDrawQuad.BottomLeft));
-            AddAssert("tail note positioned correctly", () => Precision.AlmostEquals(drawableHoldNote.ScreenSpaceDrawQuad.TopLeft, drawableHoldNote.Tail.ScreenSpaceDrawQuad.BottomLeft));
+            AddAssert("head note positioned correctly", () => Precision.AlmostEquals(drawableHoldNote.ScreenSpaceDrawQuad.BottomLeft.Xy, drawableHoldNote.Head.ScreenSpaceDrawQuad.BottomLeft.Xy));
+            AddAssert("tail note positioned correctly", () => Precision.AlmostEquals(drawableHoldNote.ScreenSpaceDrawQuad.TopLeft.Xy, drawableHoldNote.Tail.ScreenSpaceDrawQuad.BottomLeft.Xy));
 
             AddAssert("head blueprint positioned correctly", () => this.ChildrenOfType<EditHoldNoteEndPiece>().ElementAt(0).DrawPosition == drawableHoldNote.Head.DrawPosition);
             AddAssert("tail blueprint positioned correctly", () => this.ChildrenOfType<EditHoldNoteEndPiece>().ElementAt(1).DrawPosition == drawableHoldNote.Tail.DrawPosition);

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionScaleHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionScaleHandler.cs
@@ -191,10 +191,10 @@ public Vector2 ClampScaleToPlayfieldBounds(Vector2 scale, Vector2? origin = null
             Vector2 actualOrigin = origin ?? defaultOrigin.Value;
             var selectionQuad = OriginalSurroundingQuad.Value;
 
-            var tl1 = Vector2.Divide(-actualOrigin, selectionQuad.TopLeft - actualOrigin);
-            var tl2 = Vector2.Divide(OsuPlayfield.BASE_SIZE - actualOrigin, selectionQuad.TopLeft - actualOrigin);
-            var br1 = Vector2.Divide(-actualOrigin, selectionQuad.BottomRight - actualOrigin);
-            var br2 = Vector2.Divide(OsuPlayfield.BASE_SIZE - actualOrigin, selectionQuad.BottomRight - actualOrigin);
+            var tl1 = Vector2.Divide(-actualOrigin, selectionQuad.TopLeft.Xy - actualOrigin);
+            var tl2 = Vector2.Divide(OsuPlayfield.BASE_SIZE - actualOrigin, selectionQuad.TopLeft.Xy - actualOrigin);
+            var br1 = Vector2.Divide(-actualOrigin, selectionQuad.BottomRight.Xy - actualOrigin);
+            var br2 = Vector2.Divide(OsuPlayfield.BASE_SIZE - actualOrigin, selectionQuad.BottomRight.Xy - actualOrigin);
 
             if (!Precision.AlmostEquals(selectionQuad.TopLeft.X - actualOrigin.X, 0))
                 scale.X = selectionQuad.TopLeft.X - actualOrigin.X < 0 ? MathHelper.Clamp(scale.X, tl2.X, tl1.X) : MathHelper.Clamp(scale.X, tl1.X, tl2.X);

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -96,7 +96,7 @@ protected override void UpdateAfterChildren()
             var playfieldScreen = Playfield.ScreenSpaceDrawQuad;
 
             if (scroller != null)
-                scroller.Height = ToLocalSpace(playfieldScreen.TopLeft + new Vector2(0, playfieldScreen.Height / 20)).Y;
+                scroller.Height = ToLocalSpace(playfieldScreen.TopLeft.Xy + new Vector2(0, playfieldScreen.Height / 20)).Y;
         }
 
         public MultiplierControlPoint ControlPointAt(double time)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBreakDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBreakDisplay.cs
@@ -47,8 +47,8 @@ protected override void Update()
             if (DrawWidth <= 0) return;
 
             (float, float) newRange = (
-                (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X) / DrawWidth * Content.RelativeChildSize.X,
-                (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X) / DrawWidth * Content.RelativeChildSize.X);
+                (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft.Xy).X) / DrawWidth * Content.RelativeChildSize.X,
+                (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight.Xy).X) / DrawWidth * Content.RelativeChildSize.X);
 
             if (visibleRange != newRange)
             {

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
@@ -42,8 +42,8 @@ protected override void Update()
             if (DrawWidth <= 0) return;
 
             (float, float) newRange = (
-                (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X - TopPointPiece.WIDTH) / DrawWidth * Content.RelativeChildSize.X,
-                (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X) / DrawWidth * Content.RelativeChildSize.X);
+                (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft.Xy).X - TopPointPiece.WIDTH) / DrawWidth * Content.RelativeChildSize.X,
+                (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight.Xy).X) / DrawWidth * Content.RelativeChildSize.X);
 
             if (visibleRange != newRange)
             {

diff --git a/osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeScoreBreakdown.cs b/osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeScoreBreakdown.cs
@@ -112,7 +112,7 @@ protected override void Update()
 
                 Scheduler.AddDelayed(() =>
                 {
-                    float startY = ToLocalSpace(barsContainer[targetBin].CircularBar.ScreenSpaceDrawQuad.TopLeft).Y;
+                    float startY = ToLocalSpace(barsContainer[targetBin].CircularBar.ScreenSpaceDrawQuad.TopLeft.Xy).Y;
                     text.FadeInFromZero()
                         .ScaleTo(new Vector2(0.8f), 500, Easing.OutElasticHalf)
                         .MoveToY(startY)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -249,9 +249,9 @@ protected override void Update()
             {
                 Quad playfieldScreenSpaceDrawQuad = drawableRuleset.Playfield.SkinnableComponentScreenSpaceDrawQuad;
 
-                PlayfieldSkinLayer.Position = ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
-                PlayfieldSkinLayer.Width = (ToLocalSpace(playfieldScreenSpaceDrawQuad.TopRight) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft)).Length;
-                PlayfieldSkinLayer.Height = (ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomLeft) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft)).Length;
+                PlayfieldSkinLayer.Position = ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft.Xy);
+                PlayfieldSkinLayer.Width = (ToLocalSpace(playfieldScreenSpaceDrawQuad.TopRight.Xy) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft.Xy)).Length;
+                PlayfieldSkinLayer.Height = (ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomLeft.Xy) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft.Xy)).Length;
                 PlayfieldSkinLayer.Rotation = drawableRuleset.Playfield.Rotation;
             }
 
@@ -321,7 +321,7 @@ void processDrawable(ISerialisableDrawable element)
                 {
                     var topLeft = element.ScreenSpaceDrawQuad.TopLeft;
                     if (highestBottomScreenSpace == null || topLeft.Y < highestBottomScreenSpace.Value.Y)
-                        highestBottomScreenSpace = topLeft;
+                        highestBottomScreenSpace = topLeft.Xy;
                 }
             }
         }