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

Fix RectAtlas regression

Browse Source
This commit is contained in:
Wojtek Figat
2024-06-21 16:24:47 +02:00
parent 6d9f504639
commit c119750896
8 changed files with 60 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp
View File

@@ -73,8 +73,8 @@ struct GlobalSurfaceAtlasTile : RectPackNode<uint16>
uint32 Address;
uint32 ObjectAddressOffset;
GlobalSurfaceAtlasTile(uint16 x, uint16 y, uint16 width, uint16 height)
: RectPackNode<uint16>(x, y, width, height)
GlobalSurfaceAtlasTile(Size x, Size y, Size width, Size height)
: RectPackNode(x, y, width, height)
{
}
@@ -1236,7 +1236,7 @@ void GlobalSurfaceAtlasPass::RasterizeActor(Actor* actor, void* actorObject, con
uint16 tilePixels = tileResolution * tileResolution;
GlobalSurfaceAtlasTile* tile = nullptr;
if (tilePixels <= surfaceAtlasData.AtlasPixelsTotal - surfaceAtlasData.AtlasPixelsUsed)
tile = surfaceAtlasData.Atlas.Insert(tileResolution, tileResolution, 0, &surfaceAtlasData, actorObject, tileIndex);
tile = surfaceAtlasData.Atlas.Insert(tileResolution, tileResolution, &surfaceAtlasData, actorObject, tileIndex);
if (tile)
{
if (!object)

8
Source/Engine/Renderer/ShadowsPass.cpp
View File

@@ -43,8 +43,8 @@ struct ShadowsAtlasRectTile : RectPackNode<uint16>
{
bool IsStatic;
ShadowsAtlasRectTile(uint16 x, uint16 y, uint16 width, uint16 height)
: RectPackNode<uint16>(x, y, width, height)
ShadowsAtlasRectTile(Size x, Size y, Size width, Size height)
: RectPackNode(x, y, width, height)
{
}
@@ -682,7 +682,7 @@ bool ShadowsPass::SetupLight(ShadowsCustomBuffer& shadows, RenderContext& render
auto& tile = atlasLight.Tiles[tileIndex];
if (tile.StaticRectTile == nullptr)
{
tile.StaticRectTile = shadows.StaticAtlas.Insert(atlasLight.StaticResolution, atlasLight.StaticResolution, 0, &shadows, true);
tile.StaticRectTile = shadows.StaticAtlas.Insert(atlasLight.StaticResolution, atlasLight.StaticResolution, &shadows, true);
if (!tile.StaticRectTile)
{
// Failed to insert tile to switch back to the default rendering
@@ -1225,7 +1225,7 @@ RETRY_ATLAS_SETUP:
bool failedToInsert = false;
for (int32 tileIndex = 0; tileIndex < atlasLight.TilesNeeded; tileIndex++)
{
auto rectTile = shadows.Atlas.Insert(atlasLight.Resolution, atlasLight.Resolution, 0, &shadows, false);
auto rectTile = shadows.Atlas.Insert(atlasLight.Resolution, atlasLight.Resolution, &shadows, false);
if (!rectTile)
{
// Free any previous tiles that were added