zdoom/zdray
0
0
Fork 0
mirror of https://github.com/ZDoom/ZDRay.git synced 2024-11-12 23:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Write light cells into the lump

Browse source
This commit is contained in:
Magnus Norddahl 2018-11-07 04:20:11 +01:00
parent 2d970672e8
commit ef3257e062
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/lightmap/lightmap.cpp
View file

@ -706,12 +706,17 @@ void kexLightmapBuilder::AddLightmapLump(FWadWriter &wadFile)
numSurfaces++;
}
}
int numCells = 0;
for (size_t i = 0; i < grid.blocks.size(); i++)
numCells += grid.blocks[i].cells.Size();
int version = 0;
int headerSize = 3 * sizeof(uint32_t) + 2 * sizeof(uint16_t);
int headerSize = 4 * sizeof(uint32_t) + 6 * sizeof(uint16_t);
int cellBlocksSize = grid.blocks.size() * 2 * sizeof(uint16_t);
int cellsSize = numCells * sizeof(float) * 3;
int surfacesSize = surfaces.size() * 5 * sizeof(uint32_t);
int texCoordsSize = numTexCoords * 2 * sizeof(float);
int texDataSize = textures.size() * textureWidth * textureHeight * 3 * 2;
int lumpSize = headerSize + surfacesSize + texCoordsSize + texDataSize;
int lumpSize = headerSize + cellBlocksSize + cellsSize + surfacesSize + texCoordsSize + texDataSize;
// Setup buffer
std::vector<uint8_t> buffer(lumpSize);
@ -724,6 +729,30 @@ void kexLightmapBuilder::AddLightmapLump(FWadWriter &wadFile)
lumpFile.Write16(textures.size());
lumpFile.Write32(numSurfaces);
lumpFile.Write32(numTexCoords);
lumpFile.Write16(grid.x);
lumpFile.Write16(grid.y);
lumpFile.Write16(grid.width);
lumpFile.Write16(grid.height);
lumpFile.Write32(numCells);
// Write cell blocks
for (size_t i = 0; i < grid.blocks.size(); i++)
{
lumpFile.Write16(grid.blocks[i].z);
lumpFile.Write16(grid.blocks[i].layers);
}
// Write cells
for (size_t i = 0; i < grid.blocks.size(); i++)
{
const auto &cells = grid.blocks[i].cells;
for (unsigned int j = 0; j < cells.Size(); j++)
{
lumpFile.WriteFloat(cells[j].x);
lumpFile.WriteFloat(cells[j].y);
lumpFile.WriteFloat(cells[j].z);
}
}
// Write surfaces
int coordOffsets = 0;

2
src/lightmap/lightsurface.cpp
View file

@ -247,7 +247,7 @@ float kexLightSurface::TraceSurface(FLevel *map, const surface_t *fragmentSurfac
return 1.0f; // light surface will always be fullbright
kexVec3 lightSurfaceNormal = surface->plane.Normal();
kexVec3 fragmentNormal = fragmentSurface ? fragmentSurface->plane.Normal() : kexVec3::vecUp;
kexVec3 fragmentNormal = fragmentSurface ? fragmentSurface->plane.Normal() : kexVec3(0.0f, 0.0f, 0.0f);
float gzdoomRadiusScale = 2.0f; // 2.0 because gzdoom's dynlights do this and we want them to match