OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fix edge case where the lightmap lump surface touches the edge of the atlas page

Browse source
This commit is contained in:
RaveYard 2023-09-13 19:57:35 +02:00 • committed by Magnus Norddahl
commit 476c98fdfa
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/maploader/maploader.cpp
View file

@ -3116,7 +3116,7 @@ void MapLoader::LoadLightmap(MapData* map)
fr.Read(&zdrayUvs[0], numTexCoords * 2 * sizeof(float));
// Load lightmap textures
Level->levelMesh->LMTextureData.Resize(Level->levelMesh->LMTextureCount* Level->levelMesh->LMTextureSize * Level->levelMesh->LMTextureSize * 3);
Level->levelMesh->LMTextureData.Resize(Level->levelMesh->LMTextureCount * Level->levelMesh->LMTextureSize * Level->levelMesh->LMTextureSize * 3);
TArray<uint16_t> textureData;
textureData.Resize((numTexBytes + 1) / 2);
@ -3150,7 +3150,9 @@ void MapLoader::LoadLightmap(MapData* map)
int dstPage = realSurface.atlasPageIndex;
// Sanity checks
if (srcMinX < 0 || srcMinY < 0 || dstX < 0 || dstY < 0 || srcMaxX >= textureSize || srcMaxY >= textureSize || dstX + srcW >= textureSize || dstY + srcH >= textureSize || srcPage >= numTextures || dstPage >= Level->levelMesh->LMTextureCount)
if (srcMinX < 0 || srcMinY < 0 || srcMaxX > textureSize || srcMaxY > textureSize ||
dstX < 0 || dstY < 0 || dstX + srcW > Level->levelMesh->LMTextureSize || dstY + srcH > Level->levelMesh->LMTextureSize ||
srcPage >= numTextures || dstPage >= Level->levelMesh->LMTextureCount)
{
errors = true;
if (developer >= 1)