55 |
|
ao = objptr(aobj); |
56 |
|
if (ismaterial(ao->otype)) |
57 |
|
return(ao); |
58 |
+ |
if (ao->otype == MOD_ALIAS) { |
59 |
+ |
o = ao; |
60 |
+ |
continue; |
61 |
+ |
} |
62 |
|
} |
63 |
|
if (o->omod == OVOID) |
64 |
|
return(NULL); |
86 |
|
continue; |
87 |
|
/* find material */ |
88 |
|
m = findmaterial(objptr(o->omod)); |
89 |
< |
if (m == NULL || !islight(m->otype)) |
89 |
> |
if (m == NULL) |
90 |
> |
continue; |
91 |
> |
if (m->otype == MAT_CLIP) { |
92 |
> |
markclip(m); /* special case for antimatter */ |
93 |
> |
continue; |
94 |
> |
} |
95 |
> |
if (!islight(m->otype)) |
96 |
|
continue; /* not source modifier */ |
97 |
|
|
98 |
|
if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 : |
167 |
|
source = NULL; |
168 |
|
nsources = 0; |
169 |
|
} |
170 |
+ |
markclip(NULL); |
171 |
|
if (maxcntr <= 0) |
172 |
|
return; |
173 |
|
free((void *)srccnt); |
185 |
|
SRCINDEX *si /* source sample index */ |
186 |
|
) |
187 |
|
{ |
188 |
< |
double d; /* distance to source */ |
189 |
< |
register SRCREC *srcp; |
188 |
> |
double d; /* distance to source */ |
189 |
> |
register SRCREC *srcp; |
190 |
|
|
191 |
< |
rayorigin(sr, r, SHADOW, 1.0); /* ignore limits */ |
191 |
> |
rayorigin(sr, SHADOW, r, NULL); /* ignore limits */ |
192 |
|
|
193 |
< |
while ((d = nextssamp(sr, si)) != 0.0) { |
194 |
< |
sr->rsrc = si->sn; /* remember source */ |
195 |
< |
srcp = source + si->sn; |
196 |
< |
if (srcp->sflags & SDISTANT) { |
197 |
< |
if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s)) |
198 |
< |
continue; |
199 |
< |
return(1); /* sample OK */ |
200 |
< |
} |
193 |
> |
if (r == NULL) |
194 |
> |
sr->rmax = 0.0; |
195 |
> |
|
196 |
> |
while ((d = nextssamp(sr, si)) != 0.0) { |
197 |
> |
sr->rsrc = si->sn; /* remember source */ |
198 |
> |
srcp = source + si->sn; |
199 |
> |
if (srcp->sflags & SDISTANT) { |
200 |
> |
if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s)) |
201 |
> |
continue; |
202 |
> |
return(1); /* sample OK */ |
203 |
> |
} |
204 |
|
/* local source */ |
205 |
|
/* check proximity */ |
206 |
< |
if (srcp->sflags & SPROX && d > srcp->sl.prox) |
193 |
< |
continue; |
194 |
< |
/* check angle */ |
195 |
< |
if (srcp->sflags & SSPOT) { |
196 |
< |
if (spotout(sr, srcp->sl.s)) |
206 |
> |
if (srcp->sflags & SPROX && d > srcp->sl.prox) |
207 |
|
continue; |
208 |
+ |
/* check angle */ |
209 |
+ |
if (srcp->sflags & SSPOT) { |
210 |
+ |
if (spotout(sr, srcp->sl.s)) |
211 |
+ |
continue; |
212 |
|
/* adjust solid angle */ |
213 |
< |
si->dom *= d*d; |
214 |
< |
d += srcp->sl.s->flen; |
215 |
< |
si->dom /= d*d; |
213 |
> |
si->dom *= d*d; |
214 |
> |
d += srcp->sl.s->flen; |
215 |
> |
si->dom /= d*d; |
216 |
> |
} |
217 |
> |
return(1); /* sample OK */ |
218 |
|
} |
219 |
< |
return(1); /* sample OK */ |
204 |
< |
} |
205 |
< |
return(0); /* no more samples */ |
219 |
> |
return(0); /* no more samples */ |
220 |
|
} |
221 |
|
|
222 |
|
|
310 |
|
* If it's a glow or transparent illum, just remember it. |
311 |
|
*/ |
312 |
|
if (source[i].sflags & SSKIP) { |
313 |
< |
glowsrc = i; |
313 |
> |
if (glowsrc < 0) |
314 |
> |
glowsrc = i; |
315 |
|
continue; |
316 |
|
} |
317 |
|
if (transillum(source[i].so->omod)) { |
318 |
< |
transrc = i; |
318 |
> |
if (transrc < 0) |
319 |
> |
transrc = i; |
320 |
|
continue; |
321 |
|
} |
322 |
|
r->ro = source[i].so; /* otherwise, use first hit */ |
398 |
|
scp->sno = sr.rsrc; |
399 |
|
/* compute coefficient */ |
400 |
|
(*f)(scp->coef, p, sr.rdir, si.dom); |
401 |
< |
cntord[sn].brt = bright(scp->coef); |
401 |
> |
cntord[sn].brt = intens(scp->coef); |
402 |
|
if (cntord[sn].brt <= 0.0) |
403 |
|
continue; |
404 |
|
#if SHADCACHE |
409 |
|
} |
410 |
|
#endif |
411 |
|
VCOPY(scp->dir, sr.rdir); |
412 |
+ |
copycolor(sr.rcoef, scp->coef); |
413 |
|
/* compute potential */ |
414 |
< |
srcvalue(&sr); |
414 |
> |
sr.revf = srcvalue; |
415 |
> |
rayvalue(&sr); |
416 |
> |
multcolor(sr.rcol, sr.rcoef); |
417 |
|
copycolor(scp->val, sr.rcol); |
418 |
< |
multcolor(scp->val, scp->coef); |
400 |
< |
cntord[sn].brt = bright(scp->val); |
418 |
> |
cntord[sn].brt = bright(sr.rcol); |
419 |
|
} |
420 |
|
/* sort contributions */ |
421 |
|
qsort(cntord, sn, sizeof(CNTPTR), cntcmp); |
453 |
|
break; |
454 |
|
scp = srccnt + cntord[sn].sndx; |
455 |
|
/* test for hit */ |
456 |
< |
rayorigin(&sr, r, SHADOW, 1.0); |
456 |
> |
rayorigin(&sr, SHADOW, r, NULL); |
457 |
> |
copycolor(sr.rcoef, scp->coef); |
458 |
|
VCOPY(sr.rdir, scp->dir); |
459 |
|
sr.rsrc = scp->sno; |
460 |
|
/* keep statistics */ |
467 |
|
source[scp->sno].sflags & SFOLLOW )) { |
468 |
|
/* follow entire path */ |
469 |
|
raycont(&sr); |
451 |
– |
rayparticipate(&sr); |
470 |
|
if (trace != NULL) |
471 |
|
(*trace)(&sr); /* trace execution */ |
472 |
|
if (bright(sr.rcol) <= FTINY) { |
478 |
|
#endif |
479 |
|
continue; /* missed! */ |
480 |
|
} |
481 |
+ |
rayparticipate(&sr); |
482 |
+ |
multcolor(sr.rcol, sr.rcoef); |
483 |
|
copycolor(scp->val, sr.rcol); |
484 |
< |
multcolor(scp->val, scp->coef); |
484 |
> |
} else if (trace != NULL && |
485 |
> |
(source[scp->sno].sflags & (SDISTANT|SVIRTUAL|SFOLLOW)) |
486 |
> |
== (SDISTANT|SFOLLOW) && |
487 |
> |
sourcehit(&sr) && rayshade(&sr, sr.ro->omod)) { |
488 |
> |
(*trace)(&sr); /* trace execution */ |
489 |
> |
/* skip call to rayparticipate() & scp->val update */ |
490 |
|
} |
491 |
|
/* add contribution if hit */ |
492 |
|
addcolor(r->rcol, scp->val); |
508 |
|
scp = srccnt + cntord[sn].sndx; |
509 |
|
prob = hwt * (double)source[scp->sno].nhits / |
510 |
|
(double)source[scp->sno].ntests; |
511 |
< |
if (prob > 1.0) |
512 |
< |
prob = 1.0; |
488 |
< |
scalecolor(scp->val, prob); |
511 |
> |
if (prob < 1.0) |
512 |
> |
scalecolor(scp->val, prob); |
513 |
|
addcolor(r->rcol, scp->val); |
514 |
|
} |
515 |
|
} |
556 |
|
sr.rorg[0] = r->rorg[0] + r->rdir[0]*t; |
557 |
|
sr.rorg[1] = r->rorg[1] + r->rdir[1]*t; |
558 |
|
sr.rorg[2] = r->rorg[2] + r->rdir[2]*t; |
535 |
– |
sr.rmax = 0.; |
559 |
|
initsrcindex(&si); /* sample ray to this source */ |
560 |
|
si.sn = r->slights[i]; |
561 |
|
nopart(&si, &sr); |
687 |
|
) |
688 |
|
{ |
689 |
|
/* check for over-counting */ |
690 |
< |
if (badcomponent(m, r)) |
690 |
> |
if (badcomponent(m, r)) { |
691 |
> |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
692 |
|
return(1); |
693 |
< |
if (wrongsource(m, r)) |
693 |
> |
} |
694 |
> |
if (wrongsource(m, r)) { |
695 |
> |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
696 |
|
return(1); |
697 |
+ |
} |
698 |
|
/* check for passed illum */ |
699 |
|
if (passillum(m, r)) { |
700 |
|
if (m->oargs.nsargs && strcmp(m->oargs.sarg[0], VOIDID)) |
702 |
|
raytrans(r); |
703 |
|
return(1); |
704 |
|
} |
705 |
+ |
/* check for invisibility */ |
706 |
+ |
if (srcignore(m, r)) { |
707 |
+ |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
708 |
+ |
return(1); |
709 |
+ |
} |
710 |
|
/* otherwise treat as source */ |
711 |
|
/* check for behind */ |
712 |
|
if (r->rod < 0.0) |
681 |
– |
return(1); |
682 |
– |
/* check for invisibility */ |
683 |
– |
if (srcignore(m, r)) |
713 |
|
return(1); |
714 |
|
/* check for outside spot */ |
715 |
|
if (m->otype==MAT_SPOT && spotout(r, makespot(m))) |