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 : |
184 |
|
SRCINDEX *si /* source sample index */ |
185 |
|
) |
186 |
|
{ |
187 |
< |
double d; /* distance to source */ |
188 |
< |
register SRCREC *srcp; |
187 |
> |
double d; /* distance to source */ |
188 |
> |
register SRCREC *srcp; |
189 |
|
|
190 |
< |
rayorigin(sr, SHADOW, r, NULL); /* ignore limits */ |
190 |
> |
rayorigin(sr, SHADOW, r, NULL); /* ignore limits */ |
191 |
|
|
192 |
< |
while ((d = nextssamp(sr, si)) != 0.0) { |
193 |
< |
sr->rsrc = si->sn; /* remember source */ |
194 |
< |
srcp = source + si->sn; |
195 |
< |
if (srcp->sflags & SDISTANT) { |
196 |
< |
if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s)) |
197 |
< |
continue; |
198 |
< |
return(1); /* sample OK */ |
199 |
< |
} |
192 |
> |
if (r == NULL) |
193 |
> |
sr->rmax = 0.0; |
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 |
> |
} |
203 |
|
/* local source */ |
204 |
|
/* check proximity */ |
205 |
< |
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)) |
205 |
> |
if (srcp->sflags & SPROX && d > srcp->sl.prox) |
206 |
|
continue; |
207 |
+ |
/* check angle */ |
208 |
+ |
if (srcp->sflags & SSPOT) { |
209 |
+ |
if (spotout(sr, srcp->sl.s)) |
210 |
+ |
continue; |
211 |
|
/* adjust solid angle */ |
212 |
< |
si->dom *= d*d; |
213 |
< |
d += srcp->sl.s->flen; |
214 |
< |
si->dom /= d*d; |
212 |
> |
si->dom *= d*d; |
213 |
> |
d += srcp->sl.s->flen; |
214 |
> |
si->dom /= d*d; |
215 |
> |
} |
216 |
> |
return(1); /* sample OK */ |
217 |
|
} |
218 |
< |
return(1); /* sample OK */ |
204 |
< |
} |
205 |
< |
return(0); /* no more samples */ |
218 |
> |
return(0); /* no more samples */ |
219 |
|
} |
220 |
|
|
221 |
|
|
309 |
|
* If it's a glow or transparent illum, just remember it. |
310 |
|
*/ |
311 |
|
if (source[i].sflags & SSKIP) { |
312 |
< |
glowsrc = i; |
312 |
> |
if (glowsrc < 0) |
313 |
> |
glowsrc = i; |
314 |
|
continue; |
315 |
|
} |
316 |
|
if (transillum(source[i].so->omod)) { |
317 |
< |
transrc = i; |
317 |
> |
if (transrc < 0) |
318 |
> |
transrc = i; |
319 |
|
continue; |
320 |
|
} |
321 |
|
r->ro = source[i].so; /* otherwise, use first hit */ |
397 |
|
scp->sno = sr.rsrc; |
398 |
|
/* compute coefficient */ |
399 |
|
(*f)(scp->coef, p, sr.rdir, si.dom); |
400 |
< |
cntord[sn].brt = bright(scp->coef); |
400 |
> |
cntord[sn].brt = intens(scp->coef); |
401 |
|
if (cntord[sn].brt <= 0.0) |
402 |
|
continue; |
403 |
|
#if SHADCACHE |
414 |
|
rayvalue(&sr); |
415 |
|
multcolor(sr.rcol, sr.rcoef); |
416 |
|
copycolor(scp->val, sr.rcol); |
417 |
< |
cntord[sn].brt = bright(scp->val); |
417 |
> |
cntord[sn].brt = bright(sr.rcol); |
418 |
|
} |
419 |
|
/* sort contributions */ |
420 |
|
qsort(cntord, sn, sizeof(CNTPTR), cntcmp); |
468 |
|
raycont(&sr); |
469 |
|
if (trace != NULL) |
470 |
|
(*trace)(&sr); /* trace execution */ |
456 |
– |
rayparticipate(&sr); |
471 |
|
if (bright(sr.rcol) <= FTINY) { |
472 |
|
#if SHADCACHE |
473 |
|
if ((scp <= srccnt || scp[-1].sno != scp->sno) |
477 |
|
#endif |
478 |
|
continue; /* missed! */ |
479 |
|
} |
480 |
+ |
rayparticipate(&sr); |
481 |
|
multcolor(sr.rcol, sr.rcoef); |
482 |
|
copycolor(scp->val, sr.rcol); |
483 |
|
} else if (trace != NULL && |
555 |
|
sr.rorg[0] = r->rorg[0] + r->rdir[0]*t; |
556 |
|
sr.rorg[1] = r->rorg[1] + r->rdir[1]*t; |
557 |
|
sr.rorg[2] = r->rorg[2] + r->rdir[2]*t; |
543 |
– |
sr.rmax = 0.; |
558 |
|
initsrcindex(&si); /* sample ray to this source */ |
559 |
|
si.sn = r->slights[i]; |
560 |
|
nopart(&si, &sr); |