16 |
|
#include "rtprocess.h" /* win_popen() */ |
17 |
|
#include "paths.h" |
18 |
|
#include "ray.h" |
19 |
– |
#include "source.h" |
19 |
|
#include "ambient.h" |
20 |
|
#include "otypes.h" |
21 |
+ |
#include "otspecial.h" |
22 |
|
#include "rpaint.h" |
23 |
|
|
24 |
|
extern int psample; /* pixel sample size */ |
793 |
|
matspec[0] = '\0'; |
794 |
|
if (thisray.ro->omod != OVOID) { |
795 |
|
mod = objptr(thisray.ro->omod); |
796 |
< |
mat = findmaterial(mod); |
796 |
> |
mat = findmaterial(thisray.ro); |
797 |
|
} |
798 |
|
if (thisray.rod < 0.0) |
799 |
|
strcpy(matspec, "back of "); |
812 |
|
ofun[ino->otype].funame, ino->oname); |
813 |
|
(*dev->comout)(buf); |
814 |
|
(*dev->comin)(buf, NULL); |
815 |
< |
if (thisray.rot >= FHUGE) |
815 |
> |
if (thisray.rot >= FHUGE*.99) |
816 |
|
(*dev->comout)("at infinity"); |
817 |
|
else { |
818 |
|
sprintf(buf, "at (%.6g %.6g %.6g) (%.6g)", |
819 |
|
thisray.rop[0], thisray.rop[1], |
820 |
< |
thisray.rop[2], thisray.rt); |
820 |
> |
thisray.rop[2], raydistance(&thisray)); |
821 |
|
(*dev->comout)(buf); |
822 |
|
} |
823 |
|
(*dev->comin)(buf, NULL); |