OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

WIP partial lightmapping

Browse source
This commit is contained in:
RaveYard 2023-09-07 23:27:20 +02:00 • committed by Magnus Norddahl
commit b163901862
10 changed files with 84 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/common/rendering/vulkan/accelstructs/vk_lightmap.cpp
View file

@ -30,6 +30,17 @@ VkLightmap::~VkLightmap()
lights.Buffer->Unmap();
}
static int lastSurfaceCount;
ADD_STAT(lightmapper)
{
FString out;
out.Format("Last batch surface count: %d", lastSurfaceCount);
return out;
}
void VkLightmap::Raytrace(LevelMesh* level, const TArray<LevelMeshSurface*>& surfaces)
{
bool newLevel = (mesh != level);
@ -41,8 +52,15 @@ void VkLightmap::Raytrace(LevelMesh* level, const TArray<LevelMeshSurface*>& sur
CreateAtlasImages();
}
for (auto surface : surfaces)
{
surface->needsUpdate = false;
}
UploadUniforms();
lastSurfaceCount = surfaces.Size();
for (size_t pageIndex = 0; pageIndex < atlasImages.size(); pageIndex++)
{
RenderAtlasImage(pageIndex, surfaces);
@ -52,7 +70,7 @@ void VkLightmap::Raytrace(LevelMesh* level, const TArray<LevelMeshSurface*>& sur
{
ResolveAtlasImage(pageIndex);
BlurAtlasImage(pageIndex);
CopyAtlasImageResult(pageIndex);
CopyAtlasImageResult(pageIndex, surfaces);
}
}
@ -374,14 +392,14 @@ void VkLightmap::BlurAtlasImage(size_t pageIndex)
}
}
void VkLightmap::CopyAtlasImageResult(size_t pageIndex)
void VkLightmap::CopyAtlasImageResult(size_t pageIndex, const TArray<LevelMeshSurface*>& surfaces)
{
LightmapImage& img = atlasImages[pageIndex];
std::vector<VkImageCopy> regions;
for (int i = 0, count = mesh->GetSurfaceCount(); i < count; i++)
for (int i = 0, count = surfaces.Size(); i < count; i++)
{
LevelMeshSurface* surface = mesh->GetSurface(i);
LevelMeshSurface* surface = surfaces[i];
if (surface->lightmapperAtlasPage != pageIndex)
continue;