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 : |
99 |
|
m->otype == MAT_SPOT ? 7 : 3)) |
100 |
|
objerror(m, USER, "bad # arguments"); |
101 |
|
|
92 |
– |
if (m->otype == MAT_GLOW && |
93 |
– |
o->otype != OBJ_SOURCE && |
94 |
– |
m->oargs.farg[3] <= FTINY) |
95 |
– |
continue; /* don't bother */ |
102 |
|
if (m->oargs.farg[0] <= FTINY && m->oargs.farg[1] <= FTINY && |
103 |
|
m->oargs.farg[2] <= FTINY) |
104 |
|
continue; /* don't bother */ |
105 |
< |
|
105 |
> |
if (m->otype == MAT_GLOW && |
106 |
> |
o->otype != OBJ_SOURCE && |
107 |
> |
m->oargs.farg[3] <= FTINY) { |
108 |
> |
foundsource += (ambounce > 0); |
109 |
> |
continue; /* don't track these */ |
110 |
> |
} |
111 |
|
if (sfun[o->otype].of == NULL || |
112 |
|
sfun[o->otype].of->setsrc == NULL) |
113 |
|
objerror(o, USER, "illegal material"); |
120 |
|
if (m->otype == MAT_GLOW) { |
121 |
|
source[ns].sflags |= SPROX; |
122 |
|
source[ns].sl.prox = m->oargs.farg[3]; |
123 |
< |
if (source[ns].sflags & SDISTANT) |
123 |
> |
if (source[ns].sflags & SDISTANT) { |
124 |
|
source[ns].sflags |= SSKIP; |
125 |
+ |
foundsource += (ambounce > 0); |
126 |
+ |
} |
127 |
|
} else if (m->otype == MAT_SPOT) { |
128 |
|
source[ns].sflags |= SSPOT; |
129 |
|
if ((source[ns].sl.s = makespot(m)) == NULL) |
138 |
|
#if SHADCACHE |
139 |
|
initobscache(ns); |
140 |
|
#endif |
141 |
< |
if (!(source[ns].sflags & SSKIP)) |
129 |
< |
foundsource++; |
141 |
> |
foundsource += !(source[ns].sflags & SSKIP); |
142 |
|
} |
143 |
|
if (!foundsource) { |
144 |
|
error(WARNING, "no light sources found"); |
169 |
|
source = NULL; |
170 |
|
nsources = 0; |
171 |
|
} |
172 |
+ |
markclip(NULL); |
173 |
|
if (maxcntr <= 0) |
174 |
|
return; |
175 |
|
free((void *)srccnt); |
187 |
|
SRCINDEX *si /* source sample index */ |
188 |
|
) |
189 |
|
{ |
190 |
< |
double d; /* distance to source */ |
191 |
< |
register SRCREC *srcp; |
190 |
> |
double d; /* distance to source */ |
191 |
> |
register SRCREC *srcp; |
192 |
|
|
193 |
< |
rayorigin(sr, r, SHADOW, 1.0); /* ignore limits */ |
193 |
> |
rayorigin(sr, SHADOW, r, NULL); /* ignore limits */ |
194 |
|
|
195 |
< |
while ((d = nextssamp(sr, si)) != 0.0) { |
196 |
< |
sr->rsrc = si->sn; /* remember source */ |
197 |
< |
srcp = source + si->sn; |
198 |
< |
if (srcp->sflags & SDISTANT) { |
199 |
< |
if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s)) |
200 |
< |
continue; |
201 |
< |
return(1); /* sample OK */ |
202 |
< |
} |
195 |
> |
if (r == NULL) |
196 |
> |
sr->rmax = 0.0; |
197 |
> |
|
198 |
> |
while ((d = nextssamp(sr, si)) != 0.0) { |
199 |
> |
sr->rsrc = si->sn; /* remember source */ |
200 |
> |
srcp = source + si->sn; |
201 |
> |
if (srcp->sflags & SDISTANT) { |
202 |
> |
if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s)) |
203 |
> |
continue; |
204 |
> |
return(1); /* sample OK */ |
205 |
> |
} |
206 |
|
/* local source */ |
207 |
|
/* check proximity */ |
208 |
< |
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)) |
208 |
> |
if (srcp->sflags & SPROX && d > srcp->sl.prox) |
209 |
|
continue; |
210 |
+ |
/* check angle */ |
211 |
+ |
if (srcp->sflags & SSPOT) { |
212 |
+ |
if (spotout(sr, srcp->sl.s)) |
213 |
+ |
continue; |
214 |
|
/* adjust solid angle */ |
215 |
< |
si->dom *= d*d; |
216 |
< |
d += srcp->sl.s->flen; |
217 |
< |
si->dom /= d*d; |
215 |
> |
si->dom *= d*d; |
216 |
> |
d += srcp->sl.s->flen; |
217 |
> |
si->dom /= d*d; |
218 |
> |
} |
219 |
> |
return(1); /* sample OK */ |
220 |
|
} |
221 |
< |
return(1); /* sample OK */ |
204 |
< |
} |
205 |
< |
return(0); /* no more samples */ |
221 |
> |
return(0); /* no more samples */ |
222 |
|
} |
223 |
|
|
224 |
|
|
312 |
|
* If it's a glow or transparent illum, just remember it. |
313 |
|
*/ |
314 |
|
if (source[i].sflags & SSKIP) { |
315 |
< |
glowsrc = i; |
315 |
> |
if (glowsrc < 0) |
316 |
> |
glowsrc = i; |
317 |
|
continue; |
318 |
|
} |
319 |
|
if (transillum(source[i].so->omod)) { |
320 |
< |
transrc = i; |
320 |
> |
if (transrc < 0) |
321 |
> |
transrc = i; |
322 |
|
continue; |
323 |
|
} |
324 |
|
r->ro = source[i].so; /* otherwise, use first hit */ |
400 |
|
scp->sno = sr.rsrc; |
401 |
|
/* compute coefficient */ |
402 |
|
(*f)(scp->coef, p, sr.rdir, si.dom); |
403 |
< |
cntord[sn].brt = bright(scp->coef); |
403 |
> |
cntord[sn].brt = intens(scp->coef); |
404 |
|
if (cntord[sn].brt <= 0.0) |
405 |
|
continue; |
406 |
|
#if SHADCACHE |
411 |
|
} |
412 |
|
#endif |
413 |
|
VCOPY(scp->dir, sr.rdir); |
414 |
+ |
copycolor(sr.rcoef, scp->coef); |
415 |
|
/* compute potential */ |
416 |
|
sr.revf = srcvalue; |
417 |
|
rayvalue(&sr); |
418 |
+ |
multcolor(sr.rcol, sr.rcoef); |
419 |
|
copycolor(scp->val, sr.rcol); |
420 |
< |
multcolor(scp->val, scp->coef); |
401 |
< |
cntord[sn].brt = bright(scp->val); |
420 |
> |
cntord[sn].brt = bright(sr.rcol); |
421 |
|
} |
422 |
|
/* sort contributions */ |
423 |
|
qsort(cntord, sn, sizeof(CNTPTR), cntcmp); |
455 |
|
break; |
456 |
|
scp = srccnt + cntord[sn].sndx; |
457 |
|
/* test for hit */ |
458 |
< |
rayorigin(&sr, r, SHADOW, 1.0); |
458 |
> |
rayorigin(&sr, SHADOW, r, NULL); |
459 |
> |
copycolor(sr.rcoef, scp->coef); |
460 |
|
VCOPY(sr.rdir, scp->dir); |
461 |
|
sr.rsrc = scp->sno; |
462 |
|
/* keep statistics */ |
469 |
|
source[scp->sno].sflags & SFOLLOW )) { |
470 |
|
/* follow entire path */ |
471 |
|
raycont(&sr); |
452 |
– |
rayparticipate(&sr); |
472 |
|
if (trace != NULL) |
473 |
|
(*trace)(&sr); /* trace execution */ |
474 |
|
if (bright(sr.rcol) <= FTINY) { |
480 |
|
#endif |
481 |
|
continue; /* missed! */ |
482 |
|
} |
483 |
+ |
rayparticipate(&sr); |
484 |
+ |
multcolor(sr.rcol, sr.rcoef); |
485 |
|
copycolor(scp->val, sr.rcol); |
486 |
< |
multcolor(scp->val, scp->coef); |
486 |
> |
} else if (trace != NULL && |
487 |
> |
(source[scp->sno].sflags & (SDISTANT|SVIRTUAL|SFOLLOW)) |
488 |
> |
== (SDISTANT|SFOLLOW) && |
489 |
> |
sourcehit(&sr) && rayshade(&sr, sr.ro->omod)) { |
490 |
> |
(*trace)(&sr); /* trace execution */ |
491 |
> |
/* skip call to rayparticipate() & scp->val update */ |
492 |
|
} |
493 |
|
/* add contribution if hit */ |
494 |
|
addcolor(r->rcol, scp->val); |
510 |
|
scp = srccnt + cntord[sn].sndx; |
511 |
|
prob = hwt * (double)source[scp->sno].nhits / |
512 |
|
(double)source[scp->sno].ntests; |
513 |
< |
if (prob > 1.0) |
514 |
< |
prob = 1.0; |
489 |
< |
scalecolor(scp->val, prob); |
513 |
> |
if (prob < 1.0) |
514 |
> |
scalecolor(scp->val, prob); |
515 |
|
addcolor(r->rcol, scp->val); |
516 |
|
} |
517 |
|
} |
558 |
|
sr.rorg[0] = r->rorg[0] + r->rdir[0]*t; |
559 |
|
sr.rorg[1] = r->rorg[1] + r->rdir[1]*t; |
560 |
|
sr.rorg[2] = r->rorg[2] + r->rdir[2]*t; |
536 |
– |
sr.rmax = 0.; |
561 |
|
initsrcindex(&si); /* sample ray to this source */ |
562 |
|
si.sn = r->slights[i]; |
563 |
|
nopart(&si, &sr); |
689 |
|
) |
690 |
|
{ |
691 |
|
/* check for over-counting */ |
692 |
< |
if (badcomponent(m, r)) |
692 |
> |
if (badcomponent(m, r)) { |
693 |
> |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
694 |
|
return(1); |
695 |
< |
if (wrongsource(m, r)) |
695 |
> |
} |
696 |
> |
if (wrongsource(m, r)) { |
697 |
> |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
698 |
|
return(1); |
699 |
+ |
} |
700 |
|
/* check for passed illum */ |
701 |
|
if (passillum(m, r)) { |
702 |
|
if (m->oargs.nsargs && strcmp(m->oargs.sarg[0], VOIDID)) |
704 |
|
raytrans(r); |
705 |
|
return(1); |
706 |
|
} |
707 |
+ |
/* check for invisibility */ |
708 |
+ |
if (srcignore(m, r)) { |
709 |
+ |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
710 |
+ |
return(1); |
711 |
+ |
} |
712 |
|
/* otherwise treat as source */ |
713 |
|
/* check for behind */ |
714 |
|
if (r->rod < 0.0) |
682 |
– |
return(1); |
683 |
– |
/* check for invisibility */ |
684 |
– |
if (srcignore(m, r)) |
715 |
|
return(1); |
716 |
|
/* check for outside spot */ |
717 |
|
if (m->otype==MAT_SPOT && spotout(r, makespot(m))) |