GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix sprite and texture 9-slice rendering brush to properly calculate border size

Browse Source
This commit is contained in:
Wojtek Figat
2025-02-24 14:19:51 +01:00
parent 09ead0cc7a
commit afc4158dd3
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Engine/Render2D/Render2D.cpp
View File

@@ -363,17 +363,17 @@ void Write9SlicingRect(const Rectangle& rect, const Color& color, const Float4&
const Float2 bottomLeftUV(borderUVs.X, 1.0f - borderUVs.W); const Float2 bottomLeftUV(borderUVs.X, 1.0f - borderUVs.W);
const Float2 bottomRightUV(1.0f - borderUVs.Y, 1.0f - borderUVs.W); const Float2 bottomRightUV(1.0f - borderUVs.Y, 1.0f - borderUVs.W);
WriteRect(upperLeft, color, Float2::Zero, upperLeftUV); WriteRect(upperLeft, color, Float2::Zero, upperLeftUV); // Upper left corner
WriteRect(upperRight, color, Float2(upperRightUV.X, 0), Float2(1, upperLeftUV.Y)); WriteRect(upperRight, color, Float2(upperRightUV.X, 0), Float2(1, upperLeftUV.Y)); // Upper right corner
WriteRect(bottomLeft, color, Float2(0, bottomLeftUV.Y), Float2(bottomLeftUV.X, 1)); WriteRect(bottomLeft, color, Float2(0, bottomLeftUV.Y), Float2(bottomLeftUV.X, 1)); // Bottom left corner
WriteRect(bottomRight, color, bottomRightUV, Float2::One); WriteRect(bottomRight, color, bottomRightUV, Float2::One); // Bottom right corner
WriteRect(Rectangle(upperLeft.GetUpperRight(), upperRight.GetBottomLeft() - upperLeft.GetUpperRight()), color, Float2(upperLeftUV.X, 0), upperRightUV); WriteRect(Rectangle(upperLeft.GetUpperRight(), upperRight.GetBottomLeft() - upperLeft.GetUpperRight()), color, Float2(upperLeftUV.X, 0), upperRightUV); // Top side
WriteRect(Rectangle(upperLeft.GetBottomLeft(), bottomLeft.GetUpperRight() - upperLeft.GetBottomLeft()), color, Float2(0, upperLeftUV.Y), bottomLeftUV); WriteRect(Rectangle(upperLeft.GetBottomLeft(), bottomLeft.GetUpperRight() - upperLeft.GetBottomLeft()), color, Float2(0, upperLeftUV.Y), bottomLeftUV); // Left side
WriteRect(Rectangle(bottomLeft.GetUpperRight(), bottomRight.GetBottomLeft() - bottomLeft.GetUpperRight()), color, bottomLeftUV, Float2(bottomRightUV.X, 1)); WriteRect(Rectangle(bottomLeft.GetUpperRight(), bottomRight.GetBottomLeft() - bottomLeft.GetUpperRight()), color, bottomLeftUV, Float2(bottomRightUV.X, 1)); // Bottom side
WriteRect(Rectangle(upperRight.GetBottomLeft(), bottomRight.GetUpperRight() - upperRight.GetBottomLeft()), color, upperRightUV, Float2(1, bottomRightUV.Y)); WriteRect(Rectangle(upperRight.GetBottomLeft(), bottomRight.GetUpperRight() - upperRight.GetBottomLeft()), color, upperRightUV, Float2(1, bottomRightUV.Y)); // Right Side
WriteRect(Rectangle(upperLeft.GetBottomRight(), bottomRight.GetUpperLeft() - upperLeft.GetBottomRight()), color, upperRightUV, bottomRightUV); WriteRect(Rectangle(upperLeft.GetBottomRight(), bottomRight.GetUpperLeft() - upperLeft.GetBottomRight()), color, upperLeftUV, bottomRightUV); // Center
} }
void Write9SlicingRect(const Rectangle& rect, const Color& color, const Float4& border, const Float4& borderUVs, const Float2& uvLocation, const Float2& uvSize) void Write9SlicingRect(const Rectangle& rect, const Color& color, const Float4& border, const Float4& borderUVs, const Float2& uvLocation, const Float2& uvSize)

4
Source/Engine/UI/GUI/Brushes/SpriteBrush.cs
View File

@@ -100,9 +100,11 @@ namespace FlaxEngine.GUI
/// <inheritdoc /> /// <inheritdoc />
public unsafe void Draw(Rectangle rect, Color color) public unsafe void Draw(Rectangle rect, Color color)
{ {
if (!Sprite.IsValid)
return;
var border = Border; var border = Border;
var borderUV = *(Float4*)&border; var borderUV = *(Float4*)&border;
var borderSize = borderUV * new Float4(BorderSize, BorderSize, BorderSize, BorderSize); var borderSize = new Float4(BorderSize, BorderSize, BorderSize, BorderSize);
if (Filter == BrushFilter.Point) if (Filter == BrushFilter.Point)
Render2D.Draw9SlicingSpritePoint(Sprite, rect, borderSize, borderUV, color); Render2D.Draw9SlicingSpritePoint(Sprite, rect, borderSize, borderUV, color);
else else

2
Source/Engine/UI/GUI/Brushes/TextureBrush.cs
View File

@@ -113,7 +113,7 @@ namespace FlaxEngine.GUI
return; return;
var border = Border; var border = Border;
var borderUV = *(Float4*)&border; var borderUV = *(Float4*)&border;
var borderSize = borderUV * new Float4(BorderSize, BorderSize, BorderSize, BorderSize); var borderSize = new Float4(BorderSize, BorderSize, BorderSize, BorderSize);
if (Filter == BrushFilter.Point) if (Filter == BrushFilter.Point)
Render2D.Draw9SlicingTexturePoint(Texture, rect, borderSize, borderUV, color); Render2D.Draw9SlicingTexturePoint(Texture, rect, borderSize, borderUV, color);
else else