22 |
|
|
23 |
|
long nrays = 0L; /* number of rays traced */ |
24 |
|
|
25 |
< |
#define MAXLOOP 32 /* modifier loop detection */ |
25 |
> |
#define MAXLOOP 128 /* modifier loop detection */ |
26 |
|
|
27 |
|
#define RAYHIT (-1) /* return value for intercepted ray */ |
28 |
|
|
68 |
|
{ |
69 |
|
extern int (*trace)(); |
70 |
|
|
71 |
< |
if (localhit(r, &thescene)) |
71 |
> |
if (localhit(r, &thescene) || sourcehit(r)) |
72 |
> |
/* check for clipped object */ |
73 |
|
if (r->clipset != NULL && inset(r->clipset, r->ro->omod)) |
74 |
< |
raytrans(r); /* object is clipped */ |
74 |
> |
raytrans(r); |
75 |
|
else |
76 |
|
rayshade(r, r->ro->omod); |
76 |
– |
else if (sourcehit(r)) |
77 |
– |
rayshade(r, r->ro->omod); |
77 |
|
|
78 |
|
if (trace != NULL) |
79 |
|
(*trace)(r); /* trace execution */ |
101 |
|
register OBJREC *m; |
102 |
|
/* check for infinite loop */ |
103 |
|
if (depth++ >= MAXLOOP) |
104 |
< |
objerror(r->ro, USER, "material loop"); |
104 |
> |
objerror(r->ro, USER, "possible modifier loop"); |
105 |
|
for ( ; mod != OVOID; mod = m->omod) { |
106 |
|
m = objptr(mod); |
107 |
+ |
/****** unnecessary test since modifier() is always called |
108 |
|
if (!ismodifier(m->otype)) { |
109 |
|
sprintf(errmsg, "illegal modifier \"%s\"", m->oname); |
110 |
|
error(USER, errmsg); |
111 |
|
} |
112 |
+ |
******/ |
113 |
|
(*ofun[m->otype].funp)(m, r); /* execute function */ |
114 |
|
m->lastrno = r->rno; |
115 |
|
if (ismaterial(m->otype)) { /* materials call raytexture */ |