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

Merge branch '1.5' into dotnet7

Browse Source
This commit is contained in:
Wojciech Figat
2022-12-21 10:35:58 +01:00
parent aea28ce499 1cf6c5233e
commit 9a5c105db9
330 changed files with 3405 additions and 1555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Render2D/FontTextureAtlas.cpp
View File

@@ -1,11 +1,13 @@
// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
#include "FontTextureAtlas.h"
#include "Engine/Core/Log.h"
#include "Engine/Core/Types/DataContainer.h"
#include "Engine/Content/Factories/BinaryAssetFactory.h"
#include "Engine/Graphics/PixelFormat.h"
#include "Engine/Graphics/PixelFormatExtensions.h"
#include "Engine/Graphics/GPUDevice.h"
#include "Engine/Graphics/Async/GPUTask.h"
REGISTER_BINARY_ASSET(FontTextureAtlas, "FlaxEngine.FontTextureAtlas", true);

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

@@ -20,6 +20,7 @@
#include "Engine/Graphics/Shaders/GPUShader.h"
#include "Engine/Graphics/Shaders/GPUConstantBuffer.h"
#include "Engine/Animations/AnimationUtils.h"
#include "Engine/Core/Log.h"
#include "Engine/Core/Math/Half.h"
#include "Engine/Core/Math/Math.h"
#include "Engine/Engine/EngineService.h"
@@ -1073,6 +1074,8 @@ void DrawBatch(int32 startIndex, int32 count)
auto desc = GPUTextureDescription::New2D(renderTargetWidth, renderTargetHeight, PS_Blur_Format);
auto blurA = RenderTargetPool::Get(desc);
auto blurB = RenderTargetPool::Get(desc);
RENDER_TARGET_POOL_SET_NAME(blurA, "Render2D.BlurA");
RENDER_TARGET_POOL_SET_NAME(blurB, "Render2D.BlurB");
// Prepare blur data
BlurData data;