499 |
|
extern int ambssamp; |
500 |
|
extern int ambounce; |
501 |
|
extern COLOR cextinction; |
502 |
< |
extern double salbedo; |
502 |
> |
extern COLOR salbedo; |
503 |
|
extern double seccg; |
504 |
|
extern double ssampdist; |
505 |
|
extern int directvis; |
605 |
|
(COLOR *)cextinction); |
606 |
|
break; |
607 |
|
case 'a': /* scattering albedo */ |
608 |
< |
getparam(s+2, "scattering albedo", 'r', &salbedo); |
608 |
> |
getparam(s+2, "scattering albedo", 'C', |
609 |
> |
(COLOR *)salbedo); |
610 |
|
break; |
611 |
|
case 'g': /* scattering eccentricity */ |
612 |
|
getparam(s+2, "scattering eccentricity", 'r', &seccg); |
662 |
|
{ |
663 |
|
char buf[128]; |
664 |
|
int x, y; |
665 |
+ |
OBJREC *inst; |
666 |
|
RAY thisray; |
667 |
|
|
668 |
|
thisray.rmax = 0.0; |
700 |
|
objptr(thisray.ro->omod)->oname, |
701 |
|
ofun[thisray.ro->otype].funame, |
702 |
|
thisray.ro->oname); |
703 |
+ |
if ((inst = objptr(thisray.robj)) != thisray.ro) |
704 |
+ |
sprintf(buf+strlen(buf), " in instance \"%s\"", |
705 |
+ |
inst->oname); |
706 |
|
(*dev->comout)(buf); |
707 |
|
(*dev->comin)(buf, NULL); |
708 |
|
if (thisray.rot >= FHUGE) |