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); |
386 |
|
scp->sno = sr.rsrc; |
387 |
|
/* compute coefficient */ |
388 |
|
(*f)(scp->coef, p, sr.rdir, si.dom); |
389 |
< |
cntord[sn].brt = bright(scp->coef); |
389 |
> |
cntord[sn].brt = intens(scp->coef); |
390 |
|
if (cntord[sn].brt <= 0.0) |
391 |
|
continue; |
392 |
|
#if SHADCACHE |
403 |
|
rayvalue(&sr); |
404 |
|
multcolor(sr.rcol, sr.rcoef); |
405 |
|
copycolor(scp->val, sr.rcol); |
406 |
< |
cntord[sn].brt = bright(scp->val); |
406 |
> |
cntord[sn].brt = intens(sr.rcol); |
407 |
|
} |
408 |
|
/* sort contributions */ |
409 |
|
qsort(cntord, sn, sizeof(CNTPTR), cntcmp); |
441 |
|
break; |
442 |
|
scp = srccnt + cntord[sn].sndx; |
443 |
|
/* test for hit */ |
444 |
< |
rayorigin(&sr, SHADOW, r, scp->coef); |
444 |
> |
rayorigin(&sr, SHADOW, r, NULL); |
445 |
> |
copycolor(sr.rcoef, scp->coef); |
446 |
|
VCOPY(sr.rdir, scp->dir); |
447 |
|
sr.rsrc = scp->sno; |
448 |
|
/* keep statistics */ |