1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 07:22:55 +08:00

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

Improve draw performance of editor grids
This commit is contained in:
Bartłomiej Dach 2024-08-19 12:44:08 +02:00 committed by GitHub
commit 24a0a3c47f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -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 @@ namespace osu.Game.Screens.Edit.Compose.Components
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,7 +35,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
{
base.Update();
if (GridCache.IsValid) return;
if (GridCache.IsValid)
return;
ClearInternal();
@ -38,6 +44,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
CreateContent();
GridCache.Validate();
ForceRedraw();
}
protected abstract void CreateContent();
@ -53,7 +60,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
{
Colour = Colour4.White,
Alpha = 0.3f,
Origin = Anchor.CentreLeft,
RelativeSizeAxes = Axes.X,
Height = lineWidth,
Y = 0,
@ -62,28 +68,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
{
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
},
});
}