299 |
|
/* modify threshold */ |
300 |
|
ourthresh = shadthresh / r->rweight; |
301 |
|
/* test for shadows */ |
302 |
< |
nhits = 0; |
303 |
< |
for (sn = 0; sn < ncnts; sn++) { |
302 |
> |
for (nhits = 0, hwt = 0.0, sn = 0; sn < ncnts; |
303 |
> |
hwt += (double)source[scp->sno].nhits / |
304 |
> |
(double)source[scp->sno].ntests, |
305 |
> |
sn++) { |
306 |
|
/* check threshold */ |
307 |
|
if ((sn+nshadcheck>=ncnts ? cntord[sn].brt : |
308 |
|
cntord[sn].brt-cntord[sn+nshadcheck].brt) |
331 |
|
nhits++; |
332 |
|
source[scp->sno].nhits++; |
333 |
|
} |
334 |
< |
/* surface hit rate */ |
335 |
< |
if (sn > 0) |
336 |
< |
hwt = (double)nhits / (double)sn; |
334 |
> |
/* source hit rate */ |
335 |
> |
if (hwt > FTINY) |
336 |
> |
hwt = (double)nhits / hwt; |
337 |
|
else |
338 |
|
hwt = 0.5; |
339 |
|
#ifdef DEBUG |
340 |
< |
sprintf(errmsg, "%d tested, %d untested, %f hit rate\n", |
340 |
> |
sprintf(errmsg, "%d tested, %d untested, %f conditional hit rate\n", |
341 |
|
sn, ncnts-sn, hwt); |
342 |
|
eputs(errmsg); |
343 |
|
#endif |
346 |
|
scp = srccnt + cntord[sn].sndx; |
347 |
|
prob = hwt * (double)source[scp->sno].nhits / |
348 |
|
(double)source[scp->sno].ntests; |
349 |
+ |
if (prob > 1.0) |
350 |
+ |
prob = 1.0; |
351 |
|
scalecolor(scp->val, prob); |
352 |
|
addcolor(r->rcol, scp->val); |
353 |
|
} |
375 |
|
return(o->otype==MAT_ILLUM|o->otype==MAT_GLOW);} |
376 |
|
|
377 |
|
#define illumblock(m, r) (!(source[r->rsrc].sflags&SVIRTUAL) && \ |
378 |
+ |
r->rod > 0.0 && \ |
379 |
|
weaksrcmod(source[r->rsrc].so->omod)) |
380 |
|
|
381 |
|
/* wrongsource * |
412 |
|
!(r->crtype&SHADOW || r->rod < 0.0 || \ |
413 |
|
distglow(m, r))) |
414 |
|
|
410 |
– |
/* overcount * |
411 |
– |
* |
412 |
– |
* All overcounting possibilities are contained here. |
413 |
– |
*/ |
414 |
– |
|
415 |
– |
#define overcount(m, r) (badcomponent(m,r) || wrongsource(m,r)) |
416 |
– |
|
415 |
|
/* passillum * |
416 |
|
* |
417 |
|
* An illum passes to another material type when we didn't hit it |
437 |
|
register RAY *r; |
438 |
|
{ |
439 |
|
/* check for over-counting */ |
440 |
< |
if (overcount(m, r)) |
440 |
> |
if (badcomponent(m, r)) |
441 |
> |
return; |
442 |
> |
if (wrongsource(m,r)) |
443 |
|
return; |
444 |
|
/* check for passed illum */ |
445 |
|
if (passillum(m, r)) { |