1 |
< |
/* Copyright (c) 1994 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1995 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
34 |
|
{0, 5, NULL, Lambfa}, NULL, |
35 |
|
}; /* a Lambertian surface */ |
36 |
|
|
37 |
+ |
OBJREC Aftplane; /* aft clipping plane object */ |
38 |
+ |
|
39 |
|
static int raymove(), checkset(), checkhit(); |
40 |
|
|
41 |
|
#define MAXLOOP 128 /* modifier loop detection */ |
69 |
|
r->rweight = ro->rweight * rw; |
70 |
|
r->crtype = ro->crtype | (r->rtype = rt); |
71 |
|
VCOPY(r->rorg, ro->rop); |
72 |
+ |
r->rmax = 0.0; |
73 |
|
} |
74 |
|
rayclear(r); |
75 |
|
return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1); |
98 |
|
|
99 |
|
if (localhit(r, &thescene)) |
100 |
|
gotmat = raycont(r); |
101 |
< |
else if (sourcehit(r)) |
101 |
> |
else if (r->ro == &Aftplane) { |
102 |
> |
r->ro = NULL; |
103 |
> |
r->rot = FHUGE; |
104 |
> |
} else if (sourcehit(r)) |
105 |
|
gotmat = rayshade(r, r->ro->omod); |
106 |
|
|
107 |
< |
if (!gotmat) |
107 |
> |
if (r->ro != NULL && !gotmat) |
108 |
|
objerror(r->ro, USER, "material not found"); |
109 |
|
|
110 |
|
if (trace != NULL) |
131 |
|
|
132 |
|
if (rayorigin(&tr, r, TRANS, 1.0) == 0) { |
133 |
|
VCOPY(tr.rdir, r->rdir); |
134 |
+ |
if (r->rmax > FTINY) |
135 |
+ |
tr.rmax = r->rmax - r->rot; |
136 |
|
rayvalue(&tr); |
137 |
|
copycolor(r->rcol, tr.rcol); |
138 |
|
r->rt = r->rot + tr.rt; |
164 |
|
if (irr_ignore(m->otype)) { |
165 |
|
depth--; |
166 |
|
raytrans(r); |
167 |
< |
return; |
167 |
> |
return(1); |
168 |
|
} |
169 |
|
if (!islight(m->otype)) |
170 |
|
m = &Lamb; |
195 |
|
error(USER, errmsg); |
196 |
|
} |
197 |
|
******/ |
198 |
< |
if ((*ofun[m->otype].funp)(m, r)) |
199 |
< |
objerror(r->ro, USER, "conflicting materials"); |
198 |
> |
if ((*ofun[m->otype].funp)(m, r)) { |
199 |
> |
sprintf(errmsg, "conflicting material \"%s\"", |
200 |
> |
m->oname); |
201 |
> |
objerror(r->ro, USER, errmsg); |
202 |
> |
} |
203 |
|
} |
204 |
|
depth--; /* end here */ |
205 |
|
} |
364 |
|
} |
365 |
|
if (sflags == 0) |
366 |
|
error(CONSISTENCY, "zero ray direction in localhit"); |
367 |
+ |
/* start off assuming nothing hit */ |
368 |
+ |
if (r->rmax > FTINY) { /* except aft plane if one */ |
369 |
+ |
r->ro = &Aftplane; |
370 |
+ |
r->rot = r->rmax; |
371 |
+ |
for (i = 0; i < 3; i++) |
372 |
+ |
r->rop[i] = r->rorg[i] + r->rot*r->rdir[i]; |
373 |
+ |
} |
374 |
+ |
/* find global cube entrance point */ |
375 |
|
t = 0.0; |
376 |
|
if (!incube(scene, curpos)) { |
377 |
|
/* find distance to entry */ |
389 |
|
t = dt; /* farthest face is the one */ |
390 |
|
} |
391 |
|
t += FTINY; /* fudge to get inside cube */ |
392 |
+ |
if (t >= r->rot) /* clipped already */ |
393 |
+ |
return(0); |
394 |
|
/* advance position */ |
395 |
|
for (i = 0; i < 3; i++) |
396 |
|
curpos[i] += r->rdir[i]*t; |
399 |
|
return(0); |
400 |
|
} |
401 |
|
cxset[0] = 0; |
402 |
< |
return(raymove(curpos, cxset, sflags, r, scene) == RAYHIT); |
402 |
> |
raymove(curpos, cxset, sflags, r, scene); |
403 |
> |
return(r->ro != NULL & r->ro != &Aftplane); |
404 |
|
} |
405 |
|
|
406 |
|
|
455 |
|
} |
456 |
|
/*NOTREACHED*/ |
457 |
|
} |
458 |
< |
if (isfull(cu->cutree) && checkhit(r, cu, cxs)) |
458 |
> |
if (isfull(cu->cutree)) { |
459 |
> |
if (checkhit(r, cu, cxs)) |
460 |
> |
return(RAYHIT); |
461 |
> |
} else if (r->ro == &Aftplane && incube(cu, r->rop)) |
462 |
|
return(RAYHIT); |
463 |
|
/* advance to next cube */ |
464 |
|
if (dirf&0x11) { |