177 |
|
double d; /* distance to source */ |
178 |
|
register SRCREC *srcp; |
179 |
|
|
180 |
< |
rayorigin(sr, r, SHADOW, 1.0); /* ignore limits */ |
180 |
> |
rayorigin(sr, SHADOW, r, NULL); /* ignore limits */ |
181 |
|
|
182 |
|
while ((d = nextssamp(sr, si)) != 0.0) { |
183 |
|
sr->rsrc = si->sn; /* remember source */ |
393 |
|
} |
394 |
|
#endif |
395 |
|
VCOPY(scp->dir, sr.rdir); |
396 |
+ |
copycolor(sr.rcoef, scp->coef); |
397 |
|
/* compute potential */ |
398 |
|
sr.revf = srcvalue; |
399 |
|
rayvalue(&sr); |
400 |
+ |
multcolor(sr.rcol, sr.rcoef); |
401 |
|
copycolor(scp->val, sr.rcol); |
400 |
– |
multcolor(scp->val, scp->coef); |
402 |
|
cntord[sn].brt = bright(scp->val); |
403 |
|
} |
404 |
|
/* sort contributions */ |
437 |
|
break; |
438 |
|
scp = srccnt + cntord[sn].sndx; |
439 |
|
/* test for hit */ |
440 |
< |
rayorigin(&sr, r, SHADOW, 1.0); |
440 |
> |
rayorigin(&sr, SHADOW, r, NULL); |
441 |
> |
copycolor(sr.rcoef, scp->coef); |
442 |
|
VCOPY(sr.rdir, scp->dir); |
443 |
|
sr.rsrc = scp->sno; |
444 |
|
/* keep statistics */ |
451 |
|
source[scp->sno].sflags & SFOLLOW )) { |
452 |
|
/* follow entire path */ |
453 |
|
raycont(&sr); |
452 |
– |
rayparticipate(&sr); |
454 |
|
if (trace != NULL) |
455 |
|
(*trace)(&sr); /* trace execution */ |
456 |
+ |
rayparticipate(&sr); |
457 |
|
if (bright(sr.rcol) <= FTINY) { |
458 |
|
#if SHADCACHE |
459 |
|
if ((scp <= srccnt || scp[-1].sno != scp->sno) |
463 |
|
#endif |
464 |
|
continue; /* missed! */ |
465 |
|
} |
466 |
+ |
multcolor(sr.rcol, sr.rcoef); |
467 |
|
copycolor(scp->val, sr.rcol); |
468 |
< |
multcolor(scp->val, scp->coef); |
468 |
> |
} else if (trace != NULL && |
469 |
> |
(source[scp->sno].sflags & (SDISTANT|SVIRTUAL|SFOLLOW)) |
470 |
> |
== (SDISTANT|SFOLLOW) && |
471 |
> |
sourcehit(&sr) && rayshade(&sr, sr.ro->omod)) { |
472 |
> |
(*trace)(&sr); /* trace execution */ |
473 |
> |
/* skip call to rayparticipate() & scp->val update */ |
474 |
|
} |
475 |
|
/* add contribution if hit */ |
476 |
|
addcolor(r->rcol, scp->val); |
492 |
|
scp = srccnt + cntord[sn].sndx; |
493 |
|
prob = hwt * (double)source[scp->sno].nhits / |
494 |
|
(double)source[scp->sno].ntests; |
495 |
< |
if (prob > 1.0) |
496 |
< |
prob = 1.0; |
489 |
< |
scalecolor(scp->val, prob); |
495 |
> |
if (prob < 1.0) |
496 |
> |
scalecolor(scp->val, prob); |
497 |
|
addcolor(r->rcol, scp->val); |
498 |
|
} |
499 |
|
} |
672 |
|
) |
673 |
|
{ |
674 |
|
/* check for over-counting */ |
675 |
< |
if (badcomponent(m, r)) |
675 |
> |
if (badcomponent(m, r)) { |
676 |
> |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
677 |
|
return(1); |
678 |
< |
if (wrongsource(m, r)) |
678 |
> |
} |
679 |
> |
if (wrongsource(m, r)) { |
680 |
> |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
681 |
|
return(1); |
682 |
+ |
} |
683 |
|
/* check for passed illum */ |
684 |
|
if (passillum(m, r)) { |
685 |
|
if (m->oargs.nsargs && strcmp(m->oargs.sarg[0], VOIDID)) |
687 |
|
raytrans(r); |
688 |
|
return(1); |
689 |
|
} |
690 |
+ |
/* check for invisibility */ |
691 |
+ |
if (srcignore(m, r)) { |
692 |
+ |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
693 |
+ |
return(1); |
694 |
+ |
} |
695 |
|
/* otherwise treat as source */ |
696 |
|
/* check for behind */ |
697 |
|
if (r->rod < 0.0) |
682 |
– |
return(1); |
683 |
– |
/* check for invisibility */ |
684 |
– |
if (srcignore(m, r)) |
698 |
|
return(1); |
699 |
|
/* check for outside spot */ |
700 |
|
if (m->otype==MAT_SPOT && spotout(r, makespot(m))) |