zdoom/zdray
0
0
Fork 0
mirror of https://github.com/ZDoom/ZDRay.git synced 2025-02-09 07:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only create 3 probe layers per sector (covering the entire volume is too many probes)

Browse source
This commit is contained in:
Magnus Norddahl 2021-10-15 01:26:32 +02:00
parent 199d5d7043
commit 539bd9fd1d
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/lightmap/lightmap.cpp
View file

@ -646,6 +646,7 @@ void LightmapBuilder::CreateLightProbes()
float maxY = std::floor(map->MaxY / 65536.0f) + 1.0f; float maxY = std::floor(map->MaxY / 65536.0f) + 1.0f;
float halfGridSize = GridSize * 0.5f; float halfGridSize = GridSize * 0.5f;
float doubleGridSize = GridSize * 2.0f;
std::vector<std::vector<LightProbeSample>> probes; // order probes by subsector std::vector<std::vector<LightProbeSample>> probes; // order probes by subsector
probes.resize(map->NumGLSubsectors); probes.resize(map->NumGLSubsectors);
@ -661,13 +662,27 @@ void LightmapBuilder::CreateLightProbes()
{ {
float z0 = sec->floorplane.zAt(x, y); float z0 = sec->floorplane.zAt(x, y);
float z1 = sec->ceilingplane.zAt(x, y); float z1 = sec->ceilingplane.zAt(x, y);
float startZ = (z1 - z0 < halfGridSize) ? (z0 + z1) * 0.5f : z0 + halfGridSize; float delta = z1 - z0;
for (float z = startZ; z < z1; z += GridSize) if (delta > doubleGridSize)
{
LightProbeSample p[3];
p[0].Position = Vec3(x, y, z0 + halfGridSize);
p[1].Position = Vec3(x, y, z0 + (z1 - z0) * 0.5f);
p[2].Position = Vec3(x, y, z1 - halfGridSize);
for (int i = 0; i < 3; i++)
{
size_t index = (ptrdiff_t)(ssec - map->GLSubsectors);
probes[index].push_back(p[i]);
totalProbes++;
}
}
else if (delta > 0.0f)
{ {
LightProbeSample probe; LightProbeSample probe;
probe.Position.x = x; probe.Position.x = x;
probe.Position.y = y; probe.Position.y = y;
probe.Position.z = z; probe.Position.z = z0 + (z1 - z0) * 0.5f;
size_t index = (ptrdiff_t)(ssec - map->GLSubsectors); size_t index = (ptrdiff_t)(ssec - map->GLSubsectors);
probes[index].push_back(probe); probes[index].push_back(probe);