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 : |
306 |
|
* If it's a glow or transparent illum, just remember it. |
307 |
|
*/ |
308 |
|
if (source[i].sflags & SSKIP) { |
309 |
< |
glowsrc = i; |
309 |
> |
if (glowsrc < 0) |
310 |
> |
glowsrc = i; |
311 |
|
continue; |
312 |
|
} |
313 |
|
if (transillum(source[i].so->omod)) { |
314 |
< |
transrc = i; |
314 |
> |
if (transrc < 0) |
315 |
> |
transrc = i; |
316 |
|
continue; |
317 |
|
} |
318 |
|
r->ro = source[i].so; /* otherwise, use first hit */ |
411 |
|
rayvalue(&sr); |
412 |
|
multcolor(sr.rcol, sr.rcoef); |
413 |
|
copycolor(scp->val, sr.rcol); |
414 |
< |
cntord[sn].brt = intens(sr.rcol); |
414 |
> |
cntord[sn].brt = bright(sr.rcol); |
415 |
|
} |
416 |
|
/* sort contributions */ |
417 |
|
qsort(cntord, sn, sizeof(CNTPTR), cntcmp); |
465 |
|
raycont(&sr); |
466 |
|
if (trace != NULL) |
467 |
|
(*trace)(&sr); /* trace execution */ |
456 |
– |
rayparticipate(&sr); |
468 |
|
if (bright(sr.rcol) <= FTINY) { |
469 |
|
#if SHADCACHE |
470 |
|
if ((scp <= srccnt || scp[-1].sno != scp->sno) |
474 |
|
#endif |
475 |
|
continue; /* missed! */ |
476 |
|
} |
477 |
+ |
rayparticipate(&sr); |
478 |
|
multcolor(sr.rcol, sr.rcoef); |
479 |
|
copycolor(scp->val, sr.rcol); |
480 |
|
} else if (trace != NULL && |