zdoom/zdray
0
0
Fork 0
mirror of https://github.com/ZDoom/ZDRay.git synced 2024-11-26 05:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

- make the closest sample still decide the distance

Browse source
This commit is contained in:
Magnus Norddahl 2018-11-03 00:25:42 +01:00
parent 664be1eca5
commit a034992280
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/lightmap/lightsurface.cpp
View file

@ -269,7 +269,10 @@ float kexLightSurface::TraceSurface(FLevel *doomMap, kexTrace &trace, const surf
normal = kexVec3::vecUp; normal = kexVec3::vecUp;
} }
float gzdoomRadiusScale = 2.0f; // 2.0 because gzdoom's dynlights do this and we want them to match
float total = 0.0f; float total = 0.0f;
float closestDistance = distance * gzdoomRadiusScale;
for (unsigned int i = 0; i < origins.Length(); ++i) for (unsigned int i = 0; i < origins.Length(); ++i)
{ {
kexVec3 center = origins[i]; kexVec3 center = origins[i];
@ -310,10 +313,11 @@ float kexLightSurface::TraceSurface(FLevel *doomMap, kexTrace &trace, const surf
} }
float d = origin.Distance(center); float d = origin.Distance(center);
attenuation *= 1.0f - d / (distance * 2.0f); // 2.0 because gzdoom's dynlights do this and we want them to match if (d < closestDistance)
if (attenuation > 0.0f) closestDistance = d;
total += attenuation; total += attenuation;
} }
return total / origins.Length(); float attenuation = 1.0f - closestDistance / (distance * gzdoomRadiusScale);
return attenuation * total / origins.Length();
} }