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

Format code

Browse Source
This commit is contained in:
Wojtek Figat
2021-03-01 11:55:31 +01:00
parent 113fe30d5a
commit 489e8ddc42
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,9 +209,8 @@ namespace
Matrix3x3 TransformCached; Matrix3x3 TransformCached;
Array<ClipMask, InlinedAllocation<64>> ClipLayersStack; Array<ClipMask, InlinedAllocation<64>> ClipLayersStack;
Array<Color, InlinedAllocation<64>> TintLayersStack; Array<Color, InlinedAllocation<64>> TintLayersStack;
// Shader // Shader
AssetReference<Shader> GUIShader; AssetReference<Shader> GUIShader;
CachedPSO PsoDepth; CachedPSO PsoDepth;
@@ -297,7 +296,7 @@ void WriteTri(const Vector2& p0, const Vector2& p1, const Vector2& p2, const Vec
indices[1] = VBIndex + 1; indices[1] = VBIndex + 1;
indices[2] = VBIndex + 2; indices[2] = VBIndex + 2;
IB.Write(indices, sizeof(indices)); IB.Write(indices, sizeof(indices));
VBIndex += 3; VBIndex += 3;
IBIndex += 3; IBIndex += 3;
} }
@@ -635,8 +634,10 @@ void Render2D::Begin(GPUContext* context, GPUTextureView* output, GPUTextureView
ClipLayersStack.Clear(); ClipLayersStack.Clear();
ClipLayersStack.Add({ defaultMask, defaultBounds }); ClipLayersStack.Add({ defaultMask, defaultBounds });
// Initialize default tint stack
TintLayersStack.Clear(); TintLayersStack.Clear();
TintLayersStack.Add({1,1,1,1}); TintLayersStack.Add({ 1, 1, 1, 1 });
// Scissors can be enabled only for 2D orthographic projections // Scissors can be enabled only for 2D orthographic projections
IsScissorsRectEnabled = false; IsScissorsRectEnabled = false;
@@ -815,7 +816,7 @@ void Render2D::PopClip()
void Render2D::PushTint(const Color& tint, bool inherit) void Render2D::PushTint(const Color& tint, bool inherit)
{ {
RENDER2D_CHECK_RENDERING_STATE; RENDER2D_CHECK_RENDERING_STATE;
TintLayersStack.Push(inherit ? tint * TintLayersStack.Peek() : tint); TintLayersStack.Push(inherit ? tint * TintLayersStack.Peek() : tint);
} }
@@ -1804,9 +1805,9 @@ void Render2D::DrawBlur(const Rectangle& rect, float blurStrength)
void Render2D::DrawTexturedTriangles(GPUTexture* t, const Span<Vector2>& vertices, const Span<Vector2>& uvs) void Render2D::DrawTexturedTriangles(GPUTexture* t, const Span<Vector2>& vertices, const Span<Vector2>& uvs)
{ {
CHECK(vertices.Length() == uvs.Length()) CHECK(vertices.Length() == uvs.Length())
RENDER2D_CHECK_RENDERING_STATE; RENDER2D_CHECK_RENDERING_STATE;
Render2DDrawCall& drawCall = DrawCalls.AddOne(); Render2DDrawCall& drawCall = DrawCalls.AddOne();
drawCall.Type = DrawCallType::FillTexture; drawCall.Type = DrawCallType::FillTexture;
drawCall.StartIB = IBIndex; drawCall.StartIB = IBIndex;
@@ -1820,9 +1821,9 @@ void Render2D::DrawTexturedTriangles(GPUTexture* t, const Span<Vector2>& vertice
void Render2D::FillTriangles(const Span<Vector2>& vertices, const Span<Color>& colors, bool useAlpha) void Render2D::FillTriangles(const Span<Vector2>& vertices, const Span<Color>& colors, bool useAlpha)
{ {
CHECK(vertices.Length() == colors.Length()); CHECK(vertices.Length() == colors.Length());
RENDER2D_CHECK_RENDERING_STATE; RENDER2D_CHECK_RENDERING_STATE;
Render2DDrawCall& drawCall = DrawCalls.AddOne(); Render2DDrawCall& drawCall = DrawCalls.AddOne();
drawCall.Type = useAlpha ? DrawCallType::FillRect : DrawCallType::FillRectNoAlpha; drawCall.Type = useAlpha ? DrawCallType::FillRect : DrawCallType::FillRectNoAlpha;
drawCall.StartIB = IBIndex; drawCall.StartIB = IBIndex;
@@ -1835,7 +1836,7 @@ void Render2D::FillTriangles(const Span<Vector2>& vertices, const Span<Color>& c
void Render2D::FillTriangle(const Vector2& p0, const Vector2& p1, const Vector2& p2, const Color& color) void Render2D::FillTriangle(const Vector2& p0, const Vector2& p1, const Vector2& p2, const Color& color)
{ {
RENDER2D_CHECK_RENDERING_STATE; RENDER2D_CHECK_RENDERING_STATE;
Render2DDrawCall& drawCall = DrawCalls.AddOne(); Render2DDrawCall& drawCall = DrawCalls.AddOne();
drawCall.Type = NeedAlphaWithTint(color) ? DrawCallType::FillRect : DrawCallType::FillRectNoAlpha; drawCall.Type = NeedAlphaWithTint(color) ? DrawCallType::FillRect : DrawCallType::FillRectNoAlpha;
drawCall.StartIB = IBIndex; drawCall.StartIB = IBIndex;

4
Source/Engine/Render2D/Render2D.h
View File

@@ -157,7 +157,7 @@ public:
/// Pushes tint color. /// Pushes tint color.
/// </summary> /// </summary>
/// <param name="tint">The tint color.</param> /// <param name="tint">The tint color.</param>
/// <param name="inherit">Multiply <see cref="tint"/> by the last tint on the stack.</param> /// <param name="inherit">Multiply <paramref ref="tint"/> by the last tint on the stack.</param>
API_FUNCTION() static void PushTint(API_PARAM(Ref) const Color& tint, bool inherit = true); API_FUNCTION() static void PushTint(API_PARAM(Ref) const Color& tint, bool inherit = true);
/// <summary> /// <summary>
@@ -366,7 +366,7 @@ public:
/// <param name="vertices">The vertices array.</param> /// <param name="vertices">The vertices array.</param>
/// <param name="uvs">The uvs array.</param> /// <param name="uvs">The uvs array.</param>
API_FUNCTION() static void DrawTexturedTriangles(GPUTexture* t, const Span<Vector2>& vertices, const Span<Vector2>& uvs); API_FUNCTION() static void DrawTexturedTriangles(GPUTexture* t, const Span<Vector2>& vertices, const Span<Vector2>& uvs);
/// <summary> /// <summary>
/// Draws vertices array. /// Draws vertices array.
/// </summary> /// </summary>