Merge pull request #29476 from EVAST9919/buffered-editor-grid

Improve draw performance of editor grids
ppy · Aug 19, 2024 · 24a0a3c · 24a0a3c
2 parents 03188e4 + 3cd5820
commit 24a0a3c
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/osu.Game/Screens/Edit/Compose/Components/PositionSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/PositionSnapGrid.cs
@@ -2,15 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Layout;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
-    public abstract partial class PositionSnapGrid : CompositeDrawable
+    public abstract partial class PositionSnapGrid : BufferedContainer
     {
         /// <summary>
         /// The position of the origin of this <see cref="PositionSnapGrid"/> in local coordinates.
@@ -20,7 +22,10 @@ public abstract partial class PositionSnapGrid : CompositeDrawable
         protected readonly LayoutValue GridCache = new LayoutValue(Invalidation.RequiredParentSizeToFit);
 
         protected PositionSnapGrid()
+            : base(cachedFrameBuffer: true)
         {
+            BackgroundColour = Color4.White.Opacity(0);
+
             StartPosition.BindValueChanged(_ => GridCache.Invalidate());
 
             AddLayout(GridCache);
@@ -30,14 +35,16 @@ protected override void Update()
         {
             base.Update();
 
-            if (GridCache.IsValid) return;
+            if (GridCache.IsValid)
+                return;
 
             ClearInternal();
 
             if (DrawWidth > 0 && DrawHeight > 0)
                 CreateContent();
 
             GridCache.Validate();
+            ForceRedraw();
         }
 
         protected abstract void CreateContent();
@@ -53,7 +60,6 @@ protected void GenerateOutline(Vector2 drawSize)
                 {
                     Colour = Colour4.White,
                     Alpha = 0.3f,
-                    Origin = Anchor.CentreLeft,
                     RelativeSizeAxes = Axes.X,
                     Height = lineWidth,
                     Y = 0,
@@ -62,28 +68,26 @@ protected void GenerateOutline(Vector2 drawSize)
                 {
                     Colour = Colour4.White,
                     Alpha = 0.3f,
-                    Origin = Anchor.CentreLeft,
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.X,
-                    Height = lineWidth,
-                    Y = drawSize.Y,
+                    Height = lineWidth
                 },
                 new Box
                 {
                     Colour = Colour4.White,
                     Alpha = 0.3f,
-                    Origin = Anchor.TopCentre,
                     RelativeSizeAxes = Axes.Y,
-                    Width = lineWidth,
-                    X = 0,
+                    Width = lineWidth
                 },
                 new Box
                 {
                     Colour = Colour4.White,
                     Alpha = 0.3f,
-                    Origin = Anchor.TopCentre,
+                    Origin = Anchor.TopRight,
+                    Anchor = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Y,
-                    Width = lineWidth,
-                    X = drawSize.X,
+                    Width = lineWidth
                 },
             });
         }