OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Include 3d floors in level mesh limits

Browse source
This commit is contained in:
dpjudas 2024-09-03 01:09:50 +02:00
commit d77b9c1e2b
2 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/rendering/hwrenderer/doom_levelmesh.cpp
View file

@ -161,13 +161,7 @@ EXTERN_CVAR(Float, lm_scale);
DoomLevelMesh::DoomLevelMesh(FLevelLocals& doomMap)
{
// Try to estimate what the worst case memory needs are for the level
LevelMeshLimits limits;
limits.MaxVertices = (doomMap.vertexes.Size() * 10) * 2;
limits.MaxSurfaces = (doomMap.sides.Size() * 3 + doomMap.subsectors.Size() * 2) * 2;
limits.MaxUniforms = (doomMap.sides.Size() * 3 + doomMap.sectors.Size() * 2) * 2;
limits.MaxIndexes = limits.MaxVertices * 10;
Reset(limits);
SetLimits(doomMap);
SunColor = doomMap.SunColor; // TODO keep only one copy?
SunDirection = doomMap.SunDirection;
@ -187,6 +181,39 @@ DoomLevelMesh::DoomLevelMesh(FLevelLocals& doomMap)
SortDrawLists();
}
void DoomLevelMesh::SetLimits(FLevelLocals& doomMap)
{
// Try to estimate what the worst case memory needs are for the level
LevelMeshLimits limits;
for (const sector_t& sector : doomMap.sectors)
{
unsigned int ffloors = sector.e ? sector.e->XFloor.ffloors.Size() : 0;
limits.MaxVertices += sector.Lines.Size() * 4 * (3 + ffloors);
limits.MaxIndexes += sector.Lines.Size() * 6 * (3 + ffloors);
limits.MaxSurfaces += sector.Lines.Size() * (3 + ffloors);
limits.MaxUniforms += sector.Lines.Size() * (3 + ffloors);
limits.MaxSurfaces += sector.subsectorcount * (2 + ffloors * 2);
limits.MaxUniforms += 2 + ffloors * 2;
for (int i = 0, count = sector.subsectorcount; i < count; i++)
{
limits.MaxVertices += sector.subsectors[i]->numlines;
limits.MaxIndexes += sector.subsectors[i]->numlines * 3;
}
}
// Double up to leave room for fragmentation
limits.MaxVertices *= 2;
limits.MaxSurfaces *= 2;
limits.MaxUniforms *= 2;
limits.MaxIndexes *= 2;
Reset(limits);
}
void DoomLevelMesh::BeginFrame(FLevelLocals& doomMap)
{
LastFrameStats = CurFrameStats;

2
src/rendering/hwrenderer/doom_levelmesh.h
View file

@ -122,6 +122,8 @@ public:
Stats LastFrameStats, CurFrameStats;
private:
void SetLimits(FLevelLocals& doomMap);
void CreateSurfaces(FLevelLocals& doomMap);
void CreateLightList(FLevelLocals& doomMap, int surfaceIndex);