olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

light: MakeBounceLightsThread: avoid zero-area or small patches, which were getting NaN colors

This commit is contained in:
Eric Wasylishen 2016-09-19 11:59:44 -06:00
parent 8dab875adc
commit b4e30032a3
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
light/light.cc
View File

@ -875,15 +875,19 @@ MakeBounceLightsThread (void *arg)
// average them, area weighted // average them, area weighted
vec3_t sum = {0,0,0}; vec3_t sum = {0,0,0};
float totalarea = 0; float totalarea = 0;
if (patches.size()) {
for (const auto &patch : patches) { for (const auto &patch : patches) {
const float patcharea = WindingArea(patch->w); const float patcharea = WindingArea(patch->w);
totalarea += patcharea; totalarea += patcharea;
VectorMA(sum, patcharea, patch->directlight, sum); VectorMA(sum, patcharea, patch->directlight, sum);
// printf(" %f %f %f\n", patch->directlight[0], patch->directlight[1], patch->directlight[2]); // printf(" %f %f %f\n", patch->directlight[0], patch->directlight[1], patch->directlight[2]);
} }
VectorScale(sum, 1.0/totalarea, sum); VectorScale(sum, 1.0/totalarea, sum);
// avoid small, or zero-area patches ("sum" would be nan)
if (totalarea < 1) {
continue;
} }
vec3_t texturecolor; vec3_t texturecolor;
@ -910,6 +914,9 @@ MakeBounceLightsThread (void *arg)
static void static void
AddBounceLight(const vec3_t pos, const vec3_t color, const vec3_t surfnormal, vec_t area, const bsp2_t *bsp) AddBounceLight(const vec3_t pos, const vec3_t color, const vec3_t surfnormal, vec_t area, const bsp2_t *bsp)
{ {
Q_assert(!isnan(color[0]));
Q_assert(area > 0);
bouncelight_t l = {0}; bouncelight_t l = {0};
VectorCopy(pos, l.pos); VectorCopy(pos, l.pos);
VectorCopy(color, l.color); VectorCopy(color, l.color);