1 |
< |
/* Copyright (c) 1990 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1991 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
23 |
|
extern double minweight; /* minimum ray weight */ |
24 |
|
extern int do_irrad; /* compute irradiance? */ |
25 |
|
|
26 |
< |
long nrays = 0L; /* number of rays traced */ |
26 |
> |
long raynum = 0L; /* next unique ray number */ |
27 |
> |
long nrays = 0L; /* number of calls to localhit */ |
28 |
|
|
29 |
|
static double Lambfa[5] = {PI, PI, PI, 0.0, 0.0}; |
30 |
|
OBJREC Lamb = { |
48 |
|
r->crtype = r->rtype = rt; |
49 |
|
r->rsrc = -1; |
50 |
|
r->clipset = NULL; |
51 |
+ |
r->revf = raytrace; |
52 |
|
} else { /* spawned ray */ |
53 |
|
r->rlvl = ro->rlvl; |
54 |
|
if (rt & RAYREFL) { |
59 |
|
r->rsrc = ro->rsrc; |
60 |
|
r->clipset = ro->newcset; |
61 |
|
} |
62 |
+ |
r->revf = ro->revf; |
63 |
|
r->rweight = ro->rweight * rw; |
64 |
|
r->crtype = ro->crtype | (r->rtype = rt); |
65 |
|
VCOPY(r->rorg, ro->rop); |
66 |
|
} |
67 |
< |
r->rno = nrays; |
67 |
> |
r->rno = raynum++; |
68 |
|
r->newcset = r->clipset; |
69 |
|
r->ro = NULL; |
70 |
|
r->rot = FHUGE; |
76 |
|
} |
77 |
|
|
78 |
|
|
79 |
< |
rayvalue(r) /* compute a ray's value */ |
79 |
> |
raytrace(r) /* trace a ray and compute its value */ |
80 |
|
RAY *r; |
81 |
|
{ |
82 |
|
extern int (*trace)(); |
124 |
|
/* check for infinite loop */ |
125 |
|
if (depth++ >= MAXLOOP) |
126 |
|
objerror(r->ro, USER, "possible modifier loop"); |
127 |
+ |
r->rt = r->rot; /* set effective ray length */ |
128 |
|
for ( ; mod != OVOID; mod = m->omod) { |
129 |
|
m = objptr(mod); |
130 |
|
/****** unnecessary test since modifier() is always called |
140 |
|
raytrans(r); |
141 |
|
return; |
142 |
|
} |
143 |
< |
if (m->otype != MAT_ILLUM) |
143 |
> |
if (!islight(m->otype)) |
144 |
|
m = &Lamb; |
145 |
|
} |
146 |
|
(*ofun[m->otype].funp)(m, r); /* execute function */ |
317 |
|
register int i; |
318 |
|
|
319 |
|
nrays++; /* increment trace counter */ |
316 |
– |
|
320 |
|
sflags = 0; |
321 |
|
for (i = 0; i < 3; i++) { |
322 |
|
curpos[i] = r->rorg[i]; |
325 |
|
else if (r->rdir[i] < -FTINY) |
326 |
|
sflags |= 0x10 << i; |
327 |
|
} |
328 |
+ |
if (sflags == 0) |
329 |
+ |
error(CONSISTENCY, "zero ray direction in localhit"); |
330 |
|
t = 0.0; |
331 |
|
if (!incube(scene, curpos)) { |
332 |
|
/* find distance to entry */ |