OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fix null pointer crash

Browse source
This commit is contained in:
Magnus Norddahl 2023-09-01 00:25:09 +02:00
commit 4d12de45e4
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,6 +84,8 @@ DoomLevelMesh::DoomLevelMesh(FLevelLocals &doomMap)
}
}
// To do: these functions still broken.
SetupLightmapUvs();
BindLightmapSurfacesToGeometry(doomMap);
Collision = std::make_unique<TriangleMeshShape>(MeshVertices.Data(), MeshVertices.Size(), MeshElements.Data(), MeshElements.Size());
@ -124,7 +126,7 @@ void DoomLevelMesh::BindLightmapSurfacesToGeometry(FLevelLocals& doomMap)
// Copy and build properties
size_t index = 0;
for (auto& surface : doomMap.levelMesh->Surfaces)
for (auto& surface : Surfaces)
{
LightmapSurface l;
memset(&l, 0, sizeof(LightmapSurface));
@ -133,7 +135,7 @@ void DoomLevelMesh::BindLightmapSurfacesToGeometry(FLevelLocals& doomMap)
l.Type = surface.type;
l.LightmapNum = 0;
l.TexCoords = (float*)&doomMap.levelMesh->LightmapUvs[surface.startUvIndex];
l.TexCoords = (float*)&LightmapUvs[surface.startUvIndex];
l.LightmapNum = surface.atlasPageIndex;