Change how visible surfaces for a tile are collected by the light mapper

src/common/rendering/hwrenderer/data/hw_levelmesh.cpp

@@ -148,75 +148,6 @@ struct LevelMeshPlaneGroup
 	std::vector<LevelMeshSurface*> surfaces;
 };
 
-void LevelMesh::BuildTileSurfaceLists()
-{
-	// Plane group surface is to be rendered with
-	TArray<LevelMeshPlaneGroup> PlaneGroups;
-	TArray<int> PlaneGroupIndexes(Mesh.Surfaces.Size());
-
-	for (int i = 0, count = Mesh.Surfaces.Size(); i < count; i++)
-	{
-		auto surface = &Mesh.Surfaces[i];
-
-		// Is this surface in the same plane as an existing plane group?
-		int planeGroupIndex = -1;
-
-		for (size_t j = 0; j < PlaneGroups.Size(); j++)
-		{
-			if (surface->SectorGroup == PlaneGroups[j].sectorGroup)
-			{
-				float direction = PlaneGroups[j].plane.XYZ() | surface->Plane.XYZ();
-				if (direction >= 0.999f && direction <= 1.01f)
-				{
-					auto point = (surface->Plane.XYZ() * surface->Plane.W);
-					auto planeDistance = (PlaneGroups[j].plane.XYZ() | point) - PlaneGroups[j].plane.W;
-
-					float dist = std::abs(planeDistance);
-					if (dist <= 0.1f)
-					{
-						planeGroupIndex = (int)j;
-						break;
-					}
-				}
-			}
-		}
-
-		// Surface is in a new plane. Create a plane group for it
-		if (planeGroupIndex == -1)
-		{
-			planeGroupIndex = PlaneGroups.Size();
-
-			LevelMeshPlaneGroup group;
-			group.plane = surface->Plane;
-			group.sectorGroup = surface->SectorGroup;
-			PlaneGroups.Push(group);
-		}
-
-		PlaneGroups[planeGroupIndex].surfaces.push_back(surface);
-		PlaneGroupIndexes.Push(planeGroupIndex);
-	}
-
-	for (auto& tile : LightmapTiles)
-		tile.Surfaces.Clear();
-
-	for (int i = 0, count = Mesh.Surfaces.Size(); i < count; i++)
-	{
-		LevelMeshSurface* targetSurface = &Mesh.Surfaces[i];
-		if (targetSurface->LightmapTileIndex < 0)
-			continue;
-		LightmapTile* tile = &LightmapTiles[targetSurface->LightmapTileIndex];
-		for (LevelMeshSurface* surface : PlaneGroups[PlaneGroupIndexes[i]].surfaces)
-		{
-			FVector2 minUV = tile->ToUV(surface->Bounds.min);
-			FVector2 maxUV = tile->ToUV(surface->Bounds.max);
-			if (surface != targetSurface && (maxUV.X < 0.0f || maxUV.Y < 0.0f || minUV.X > 1.0f || minUV.Y > 1.0f))
-				continue; // Bounding box not visible
-
-			tile->Surfaces.Push((unsigned int)(ptrdiff_t)(surface - Mesh.Surfaces.Data()));
-		}
-	}
-}
-
 void LevelMesh::SetupTileTransforms()
 {
 	for (auto& tile : LightmapTiles)
@@ -227,6 +158,8 @@ void LevelMesh::SetupTileTransforms()
 
 void LevelMesh::PackLightmapAtlas(int lightmapStartIndex)
 {
+	LMAtlasPacked = true;
+
 	std::vector<LightmapTile*> sortedTiles;
 	sortedTiles.reserve(LightmapTiles.Size());
 

src/common/rendering/hwrenderer/data/hw_levelmesh.h

@@ -103,6 +103,8 @@ public:
 	// Sets the sizes of all the GPU buffers and empties the mesh
 	virtual void Reset(const LevelMeshLimits& limits);
 
+	virtual void GetVisibleSurfaces(LightmapTile* tile, TArray<int>& outSurfaces) { }
+
 	// Data placed in GPU buffers
 	struct
 	{
@@ -171,6 +173,7 @@ public:
 	uint16_t LightmapSampleDistance = 16;
 
 	TArray<LightmapTile> LightmapTiles;
+	bool LMAtlasPacked = false; // Tile sizes can't be changed anymore
 
 	uint32_t AtlasPixelCount() const { return uint32_t(LMTextureCount * LMTextureSize * LMTextureSize); }
 

src/common/rendering/hwrenderer/data/hw_lightmaptile.h

@@ -44,9 +44,6 @@ struct LightmapTile
 
 	LightmapTileBinding Binding;
 
-	// Surfaces that are visible within the lightmap tile
-	TArray<int> Surfaces;
-
 	BBox Bounds;
 	uint16_t SampleDimension = 0;
 	FVector4 Plane = FVector4(0.0f, 0.0f, 1.0f, 0.0f);

src/common/rendering/vulkan/vk_lightmapper.cpp

@@ -194,7 +194,10 @@ void VkLightmapper::Render()
 		bool buffersFull = false;
 
 		// Paint all surfaces visible in the tile
-		for (int surfaceIndex : targetTile->Surfaces)
+
+		visibleSurfaces.Clear();
+		mesh->GetVisibleSurfaces(targetTile, visibleSurfaces);
+		for (int surfaceIndex : visibleSurfaces)
 		{
 			LevelMeshSurface* surface = &mesh->Mesh.Surfaces[surfaceIndex];
 			pc.SurfaceIndex = surfaceIndex;

src/common/rendering/vulkan/vk_lightmapper.h

@@ -149,6 +149,8 @@ private:
 	TArray<SelectedTile> selectedTiles;
 	TArray<TArray<SelectedTile*>> copylists;
 
+	TArray<int> visibleSurfaces;
+
 	struct
 	{
 		std::unique_ptr<VulkanBuffer> Buffer;