10 |
|
#include "copyright.h" |
11 |
|
|
12 |
|
#include "ray.h" |
13 |
< |
|
13 |
> |
#include "source.h" |
14 |
|
#include "otypes.h" |
15 |
– |
|
15 |
|
#include "otspecial.h" |
16 |
+ |
#include "random.h" |
17 |
+ |
#include "pmap.h" |
18 |
|
|
19 |
|
#define MAXCSET ((MAXSET+1)*2-1) /* maximum check set size */ |
20 |
|
|
21 |
< |
unsigned long raynum = 0; /* next unique ray number */ |
22 |
< |
unsigned long nrays = 0; /* number of calls to localhit */ |
21 |
> |
RNUMBER raynum = 0; /* next unique ray number */ |
22 |
> |
RNUMBER nrays = 0; /* number of calls to localhit */ |
23 |
|
|
24 |
|
static RREAL Lambfa[5] = {PI, PI, PI, 0.0, 0.0}; |
25 |
|
OBJREC Lamb = { |
26 |
|
OVOID, MAT_PLASTIC, "Lambertian", |
27 |
< |
{0, 5, NULL, Lambfa}, NULL, |
27 |
> |
{NULL, Lambfa, 0, 5}, NULL |
28 |
|
}; /* a Lambertian surface */ |
29 |
|
|
30 |
|
OBJREC Aftplane; /* aft clipping plane object */ |
31 |
|
|
31 |
– |
static int raymove(), checkhit(); |
32 |
– |
static void checkset(); |
33 |
– |
|
34 |
– |
#ifndef MAXLOOP |
35 |
– |
#define MAXLOOP 0 /* modifier loop detection */ |
36 |
– |
#endif |
37 |
– |
|
32 |
|
#define RAYHIT (-1) /* return value for intercepted ray */ |
33 |
|
|
34 |
+ |
static int raymove(FVECT pos, OBJECT *cxs, int dirf, RAY *r, CUBE *cu); |
35 |
+ |
static int checkhit(RAY *r, CUBE *cu, OBJECT *cxs); |
36 |
+ |
static void checkset(OBJECT *os, OBJECT *cs); |
37 |
|
|
38 |
+ |
|
39 |
|
int |
40 |
< |
rayorigin(r, ro, rt, rw) /* start new ray from old one */ |
41 |
< |
register RAY *r, *ro; |
42 |
< |
int rt; |
43 |
< |
double rw; |
40 |
> |
rayorigin( /* start new ray from old one */ |
41 |
> |
RAY *r, |
42 |
> |
int rt, |
43 |
> |
const RAY *ro, |
44 |
> |
const COLOR rc |
45 |
> |
) |
46 |
|
{ |
47 |
< |
double re; |
48 |
< |
|
47 |
> |
double rw, re; |
48 |
> |
/* assign coefficient/weight */ |
49 |
> |
if (rc == NULL) { |
50 |
> |
rw = 1.0; |
51 |
> |
setcolor(r->rcoef, 1., 1., 1.); |
52 |
> |
} else { |
53 |
> |
rw = intens(rc); |
54 |
> |
if (rc != r->rcoef) |
55 |
> |
copycolor(r->rcoef, rc); |
56 |
> |
} |
57 |
|
if ((r->parent = ro) == NULL) { /* primary ray */ |
58 |
|
r->rlvl = 0; |
59 |
|
r->rweight = rw; |
66 |
|
r->gecc = seccg; |
67 |
|
r->slights = NULL; |
68 |
|
} else { /* spawned ray */ |
69 |
+ |
if (ro->rot >= FHUGE) { |
70 |
+ |
memset(r, 0, sizeof(RAY)); |
71 |
+ |
return(-1); /* illegal continuation */ |
72 |
+ |
} |
73 |
|
r->rlvl = ro->rlvl; |
74 |
|
if (rt & RAYREFL) { |
75 |
|
r->rlvl++; |
89 |
|
r->crtype = ro->crtype | (r->rtype = rt); |
90 |
|
VCOPY(r->rorg, ro->rop); |
91 |
|
r->rweight = ro->rweight * rw; |
92 |
< |
/* estimate absorption */ |
92 |
> |
/* estimate extinction */ |
93 |
|
re = colval(ro->cext,RED) < colval(ro->cext,GRN) ? |
94 |
|
colval(ro->cext,RED) : colval(ro->cext,GRN); |
95 |
|
if (colval(ro->cext,BLU) < re) re = colval(ro->cext,BLU); |
96 |
< |
if (re > 0.) |
97 |
< |
r->rweight *= exp(-re*ro->rot); |
96 |
> |
re *= ro->rot; |
97 |
> |
if (re > 0.1) { |
98 |
> |
if (re > 92.) { |
99 |
> |
r->rweight = 0.0; |
100 |
> |
} else { |
101 |
> |
r->rweight *= exp(-re); |
102 |
> |
} |
103 |
> |
} |
104 |
|
} |
105 |
|
rayclear(r); |
106 |
< |
return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1); |
106 |
> |
if (r->rweight <= 0.0) /* check for expiration */ |
107 |
> |
return(-1); |
108 |
> |
if (r->crtype & SHADOW) /* shadow commitment */ |
109 |
> |
return(0); |
110 |
> |
/* ambient in photon map? */ |
111 |
> |
if (photonMapping && ro != NULL && ro->crtype & AMBIENT) |
112 |
> |
return(-1); |
113 |
> |
if (maxdepth <= 0 && rc != NULL) { /* Russian roulette */ |
114 |
> |
if (minweight <= 0.0) |
115 |
> |
error(USER, "zero ray weight in Russian roulette"); |
116 |
> |
if (maxdepth < 0 && r->rlvl > -maxdepth) |
117 |
> |
return(-1); /* upper reflection limit */ |
118 |
> |
if (r->rweight >= minweight) |
119 |
> |
return(0); |
120 |
> |
if (frandom() > r->rweight/minweight) |
121 |
> |
return(-1); |
122 |
> |
rw = minweight/r->rweight; /* promote survivor */ |
123 |
> |
scalecolor(r->rcoef, rw); |
124 |
> |
r->rweight = minweight; |
125 |
> |
return(0); |
126 |
> |
} |
127 |
> |
return(r->rweight >= minweight && r->rlvl <= abs(maxdepth) ? 0 : -1); |
128 |
|
} |
129 |
|
|
130 |
|
|
131 |
|
void |
132 |
< |
rayclear(r) /* clear a ray for (re)evaluation */ |
133 |
< |
register RAY *r; |
132 |
> |
rayclear( /* clear a ray for (re)evaluation */ |
133 |
> |
RAY *r |
134 |
> |
) |
135 |
|
{ |
136 |
|
r->rno = raynum++; |
137 |
|
r->newcset = r->clipset; |
148 |
|
|
149 |
|
|
150 |
|
void |
151 |
< |
raytrace(r) /* trace a ray and compute its value */ |
152 |
< |
RAY *r; |
151 |
> |
raytrace( /* trace a ray and compute its value */ |
152 |
> |
RAY *r |
153 |
> |
) |
154 |
|
{ |
155 |
|
if (localhit(r, &thescene)) |
156 |
|
raycont(r); /* hit local surface, evaluate */ |
160 |
|
} else if (sourcehit(r)) |
161 |
|
rayshade(r, r->ro->omod); /* distant source */ |
162 |
|
|
122 |
– |
rayparticipate(r); /* for participating medium */ |
123 |
– |
|
163 |
|
if (trace != NULL) |
164 |
|
(*trace)(r); /* trace execution */ |
165 |
+ |
|
166 |
+ |
rayparticipate(r); /* for participating medium */ |
167 |
|
} |
168 |
|
|
169 |
|
|
170 |
|
void |
171 |
< |
raycont(r) /* check for clipped object and continue */ |
172 |
< |
register RAY *r; |
171 |
> |
raycont( /* check for clipped object and continue */ |
172 |
> |
RAY *r |
173 |
> |
) |
174 |
|
{ |
175 |
|
if ((r->clipset != NULL && inset(r->clipset, r->ro->omod)) || |
176 |
|
!rayshade(r, r->ro->omod)) |
179 |
|
|
180 |
|
|
181 |
|
void |
182 |
< |
raytrans(r) /* transmit ray as is */ |
183 |
< |
register RAY *r; |
182 |
> |
raytrans( /* transmit ray as is */ |
183 |
> |
RAY *r |
184 |
> |
) |
185 |
|
{ |
186 |
|
RAY tr; |
187 |
|
|
188 |
< |
if (rayorigin(&tr, r, TRANS, 1.0) == 0) { |
189 |
< |
VCOPY(tr.rdir, r->rdir); |
190 |
< |
rayvalue(&tr); |
191 |
< |
copycolor(r->rcol, tr.rcol); |
192 |
< |
r->rt = r->rot + tr.rt; |
150 |
< |
} |
188 |
> |
rayorigin(&tr, TRANS, r, NULL); /* always continue */ |
189 |
> |
VCOPY(tr.rdir, r->rdir); |
190 |
> |
rayvalue(&tr); |
191 |
> |
copycolor(r->rcol, tr.rcol); |
192 |
> |
r->rt = r->rot + tr.rt; |
193 |
|
} |
194 |
|
|
195 |
|
|
196 |
|
int |
197 |
< |
rayshade(r, mod) /* shade ray r with material mod */ |
198 |
< |
register RAY *r; |
199 |
< |
int mod; |
197 |
> |
rayshade( /* shade ray r with material mod */ |
198 |
> |
RAY *r, |
199 |
> |
int mod |
200 |
> |
) |
201 |
|
{ |
202 |
< |
int gotmat; |
203 |
< |
register OBJREC *m; |
161 |
< |
#if MAXLOOP |
162 |
< |
static int depth = 0; |
163 |
< |
/* check for infinite loop */ |
164 |
< |
if (depth++ >= MAXLOOP) |
165 |
< |
objerror(r->ro, USER, "possible modifier loop"); |
166 |
< |
#endif |
202 |
> |
OBJREC *m; |
203 |
> |
|
204 |
|
r->rt = r->rot; /* set effective ray length */ |
205 |
< |
for (gotmat = 0; !gotmat && mod != OVOID; mod = m->omod) { |
205 |
> |
for ( ; mod != OVOID; mod = m->omod) { |
206 |
|
m = objptr(mod); |
207 |
|
/****** unnecessary test since modifier() is always called |
208 |
|
if (!ismodifier(m->otype)) { |
215 |
|
m->otype != MAT_CLIP && |
216 |
|
(ofun[m->otype].flags & (T_M|T_X))) { |
217 |
|
if (irr_ignore(m->otype)) { |
181 |
– |
#if MAXLOOP |
182 |
– |
depth--; |
183 |
– |
#endif |
218 |
|
raytrans(r); |
219 |
|
return(1); |
220 |
|
} |
221 |
|
if (!islight(m->otype)) |
222 |
|
m = &Lamb; |
223 |
|
} |
224 |
< |
/* materials call raytexture */ |
225 |
< |
gotmat = (*ofun[m->otype].funp)(m, r); |
224 |
> |
if ((*ofun[m->otype].funp)(m, r)) |
225 |
> |
return(1); /* materials call raytexture() */ |
226 |
|
} |
227 |
< |
#if MAXLOOP |
194 |
< |
depth--; |
195 |
< |
#endif |
196 |
< |
return(gotmat); |
227 |
> |
return(0); /* no material! */ |
228 |
|
} |
229 |
|
|
230 |
|
|
231 |
|
void |
232 |
< |
rayparticipate(r) /* compute ray medium participation */ |
233 |
< |
register RAY *r; |
232 |
> |
rayparticipate( /* compute ray medium participation */ |
233 |
> |
RAY *r |
234 |
> |
) |
235 |
|
{ |
236 |
|
COLOR ce, ca; |
237 |
|
double re, ge, be; |
246 |
|
ge *= 1. - colval(r->albedo,GRN); |
247 |
|
be *= 1. - colval(r->albedo,BLU); |
248 |
|
} |
249 |
< |
setcolor(ce, re<=0. ? 1. : re>92. ? 0. : exp(-re), |
250 |
< |
ge<=0. ? 1. : ge>92. ? 0. : exp(-ge), |
251 |
< |
be<=0. ? 1. : be>92. ? 0. : exp(-be)); |
252 |
< |
multcolor(r->rcol, ce); /* path absorption */ |
249 |
> |
setcolor(ce, re<=FTINY ? 1. : re>92. ? 0. : exp(-re), |
250 |
> |
ge<=FTINY ? 1. : ge>92. ? 0. : exp(-ge), |
251 |
> |
be<=FTINY ? 1. : be>92. ? 0. : exp(-be)); |
252 |
> |
multcolor(r->rcol, ce); /* path extinction */ |
253 |
|
if (r->crtype & SHADOW || intens(r->albedo) <= FTINY) |
254 |
|
return; /* no scattering */ |
255 |
< |
setcolor(ca, |
256 |
< |
colval(r->albedo,RED)*colval(ambval,RED)*(1.-colval(ce,RED)), |
257 |
< |
colval(r->albedo,GRN)*colval(ambval,GRN)*(1.-colval(ce,GRN)), |
258 |
< |
colval(r->albedo,BLU)*colval(ambval,BLU)*(1.-colval(ce,BLU))); |
259 |
< |
addcolor(r->rcol, ca); /* ambient in scattering */ |
255 |
> |
|
256 |
> |
/* PMAP: indirect inscattering accounted for by volume photons? */ |
257 |
> |
if (!volumePhotonMapping) { |
258 |
> |
setcolor(ca, |
259 |
> |
colval(r->albedo,RED)*colval(ambval,RED)*(1.-colval(ce,RED)), |
260 |
> |
colval(r->albedo,GRN)*colval(ambval,GRN)*(1.-colval(ce,GRN)), |
261 |
> |
colval(r->albedo,BLU)*colval(ambval,BLU)*(1.-colval(ce,BLU))); |
262 |
> |
addcolor(r->rcol, ca); /* ambient in scattering */ |
263 |
> |
} |
264 |
> |
|
265 |
|
srcscatter(r); /* source in scattering */ |
266 |
|
} |
267 |
|
|
268 |
|
|
269 |
|
void |
270 |
< |
raytexture(r, mod) /* get material modifiers */ |
271 |
< |
RAY *r; |
272 |
< |
OBJECT mod; |
270 |
> |
raytexture( /* get material modifiers */ |
271 |
> |
RAY *r, |
272 |
> |
OBJECT mod |
273 |
> |
) |
274 |
|
{ |
275 |
< |
register OBJREC *m; |
238 |
< |
#if MAXLOOP |
239 |
< |
static int depth = 0; |
240 |
< |
/* check for infinite loop */ |
241 |
< |
if (depth++ >= MAXLOOP) |
242 |
< |
objerror(r->ro, USER, "modifier loop"); |
243 |
< |
#endif |
275 |
> |
OBJREC *m; |
276 |
|
/* execute textures and patterns */ |
277 |
|
for ( ; mod != OVOID; mod = m->omod) { |
278 |
|
m = objptr(mod); |
288 |
|
objerror(r->ro, USER, errmsg); |
289 |
|
} |
290 |
|
} |
259 |
– |
#if MAXLOOP |
260 |
– |
depth--; /* end here */ |
261 |
– |
#endif |
291 |
|
} |
292 |
|
|
293 |
|
|
294 |
|
int |
295 |
< |
raymixture(r, fore, back, coef) /* mix modifiers */ |
296 |
< |
register RAY *r; |
297 |
< |
OBJECT fore, back; |
298 |
< |
double coef; |
295 |
> |
raymixture( /* mix modifiers */ |
296 |
> |
RAY *r, |
297 |
> |
OBJECT fore, |
298 |
> |
OBJECT back, |
299 |
> |
double coef |
300 |
> |
) |
301 |
|
{ |
302 |
|
RAY fr, br; |
303 |
|
int foremat, backmat; |
304 |
< |
register int i; |
304 |
> |
int i; |
305 |
|
/* bound coefficient */ |
306 |
|
if (coef > 1.0) |
307 |
|
coef = 1.0; |
311 |
|
foremat = backmat = 0; |
312 |
|
/* foreground */ |
313 |
|
fr = *r; |
314 |
< |
if (coef > FTINY) |
314 |
> |
if (coef > FTINY) { |
315 |
> |
fr.rweight *= coef; |
316 |
> |
scalecolor(fr.rcoef, coef); |
317 |
|
foremat = rayshade(&fr, fore); |
318 |
+ |
} |
319 |
|
/* background */ |
320 |
|
br = *r; |
321 |
< |
if (coef < 1.0-FTINY) |
321 |
> |
if (coef < 1.0-FTINY) { |
322 |
> |
br.rweight *= 1.0-coef; |
323 |
> |
scalecolor(br.rcoef, 1.0-coef); |
324 |
|
backmat = rayshade(&br, back); |
325 |
+ |
} |
326 |
|
/* check for transparency */ |
327 |
|
if (backmat ^ foremat) { |
328 |
|
if (backmat && coef > FTINY) |
352 |
|
|
353 |
|
|
354 |
|
double |
355 |
< |
raydist(r, flags) /* compute (cumulative) ray distance */ |
356 |
< |
register RAY *r; |
357 |
< |
register int flags; |
355 |
> |
raydist( /* compute (cumulative) ray distance */ |
356 |
> |
const RAY *r, |
357 |
> |
int flags |
358 |
> |
) |
359 |
|
{ |
360 |
|
double sum = 0.0; |
361 |
|
|
367 |
|
} |
368 |
|
|
369 |
|
|
370 |
+ |
void |
371 |
+ |
raycontrib( /* compute (cumulative) ray contribution */ |
372 |
+ |
RREAL rc[3], |
373 |
+ |
const RAY *r, |
374 |
+ |
int flags |
375 |
+ |
) |
376 |
+ |
{ |
377 |
+ |
double eext[3]; |
378 |
+ |
int i; |
379 |
+ |
|
380 |
+ |
eext[0] = eext[1] = eext[2] = 0.; |
381 |
+ |
rc[0] = rc[1] = rc[2] = 1.; |
382 |
+ |
|
383 |
+ |
while (r != NULL && r->crtype&flags) { |
384 |
+ |
for (i = 3; i--; ) { |
385 |
+ |
rc[i] *= colval(r->rcoef,i); |
386 |
+ |
eext[i] += r->rot * colval(r->cext,i); |
387 |
+ |
} |
388 |
+ |
r = r->parent; |
389 |
+ |
} |
390 |
+ |
for (i = 3; i--; ) |
391 |
+ |
rc[i] *= (eext[i] <= FTINY) ? 1. : |
392 |
+ |
(eext[i] > 92.) ? 0. : exp(-eext[i]); |
393 |
+ |
} |
394 |
+ |
|
395 |
+ |
|
396 |
|
double |
397 |
< |
raynormal(norm, r) /* compute perturbed normal for ray */ |
398 |
< |
FVECT norm; |
399 |
< |
register RAY *r; |
397 |
> |
raynormal( /* compute perturbed normal for ray */ |
398 |
> |
FVECT norm, |
399 |
> |
RAY *r |
400 |
> |
) |
401 |
|
{ |
402 |
|
double newdot; |
403 |
< |
register int i; |
403 |
> |
int i; |
404 |
|
|
405 |
|
/* The perturbation is added to the surface normal to obtain |
406 |
|
* the new normal. If the new normal would affect the surface |
430 |
|
|
431 |
|
|
432 |
|
void |
433 |
< |
newrayxf(r) /* get new tranformation matrix for ray */ |
434 |
< |
RAY *r; |
433 |
> |
newrayxf( /* get new tranformation matrix for ray */ |
434 |
> |
RAY *r |
435 |
> |
) |
436 |
|
{ |
437 |
|
static struct xfn { |
438 |
|
struct xfn *next; |
439 |
|
FULLXF xf; |
440 |
|
} xfseed = { &xfseed }, *xflast = &xfseed; |
441 |
< |
register struct xfn *xp; |
442 |
< |
register RAY *rp; |
441 |
> |
struct xfn *xp; |
442 |
> |
const RAY *rp; |
443 |
|
|
444 |
|
/* |
445 |
|
* Search for transform in circular list that |
450 |
|
if (rp->rox == &xp->xf) { /* xp in use */ |
451 |
|
xp = xp->next; /* move to next */ |
452 |
|
if (xp == xflast) { /* need new one */ |
453 |
< |
xp = (struct xfn *)malloc(sizeof(struct xfn)); |
453 |
> |
xp = (struct xfn *)bmalloc(sizeof(struct xfn)); |
454 |
|
if (xp == NULL) |
455 |
|
error(SYSTEM, |
456 |
|
"out of memory in newrayxf"); |
468 |
|
|
469 |
|
|
470 |
|
void |
471 |
< |
flipsurface(r) /* reverse surface orientation */ |
472 |
< |
register RAY *r; |
471 |
> |
flipsurface( /* reverse surface orientation */ |
472 |
> |
RAY *r |
473 |
> |
) |
474 |
|
{ |
475 |
|
r->rod = -r->rod; |
476 |
|
r->ron[0] = -r->ron[0]; |
483 |
|
|
484 |
|
|
485 |
|
void |
486 |
< |
rayhit(oset, r) /* standard ray hit test */ |
487 |
< |
OBJECT *oset; |
488 |
< |
RAY *r; |
486 |
> |
rayhit( /* standard ray hit test */ |
487 |
> |
OBJECT *oset, |
488 |
> |
RAY *r |
489 |
> |
) |
490 |
|
{ |
491 |
|
OBJREC *o; |
492 |
|
int i; |
500 |
|
|
501 |
|
|
502 |
|
int |
503 |
< |
localhit(r, scene) /* check for hit in the octree */ |
504 |
< |
register RAY *r; |
505 |
< |
register CUBE *scene; |
503 |
> |
localhit( /* check for hit in the octree */ |
504 |
> |
RAY *r, |
505 |
> |
CUBE *scene |
506 |
> |
) |
507 |
|
{ |
508 |
|
OBJECT cxset[MAXCSET+1]; /* set of checked objects */ |
509 |
|
FVECT curpos; /* current cube position */ |
510 |
|
int sflags; /* sign flags */ |
511 |
|
double t, dt; |
512 |
< |
register int i; |
512 |
> |
int i; |
513 |
|
|
514 |
|
nrays++; /* increment trace counter */ |
515 |
|
sflags = 0; |
520 |
|
else if (r->rdir[i] < -1e-7) |
521 |
|
sflags |= 0x10 << i; |
522 |
|
} |
523 |
< |
if (sflags == 0) |
524 |
< |
error(CONSISTENCY, "zero ray direction in localhit"); |
523 |
> |
if (!sflags) { |
524 |
> |
error(WARNING, "zero ray direction in localhit"); |
525 |
> |
return(0); |
526 |
> |
} |
527 |
|
/* start off assuming nothing hit */ |
528 |
|
if (r->rmax > FTINY) { /* except aft plane if one */ |
529 |
|
r->ro = &Aftplane; |
530 |
|
r->rot = r->rmax; |
531 |
< |
for (i = 0; i < 3; i++) |
461 |
< |
r->rop[i] = r->rorg[i] + r->rot*r->rdir[i]; |
531 |
> |
VSUM(r->rop, r->rorg, r->rdir, r->rot); |
532 |
|
} |
533 |
|
/* find global cube entrance point */ |
534 |
|
t = 0.0; |
551 |
|
if (t >= r->rot) /* clipped already */ |
552 |
|
return(0); |
553 |
|
/* advance position */ |
554 |
< |
for (i = 0; i < 3; i++) |
485 |
< |
curpos[i] += r->rdir[i]*t; |
554 |
> |
VSUM(curpos, curpos, r->rdir, t); |
555 |
|
|
556 |
|
if (!incube(scene, curpos)) /* non-intersecting ray */ |
557 |
|
return(0); |
563 |
|
|
564 |
|
|
565 |
|
static int |
566 |
< |
raymove(pos, cxs, dirf, r, cu) /* check for hit as we move */ |
567 |
< |
FVECT pos; /* current position, modified herein */ |
568 |
< |
OBJECT *cxs; /* checked objects, modified by checkhit */ |
569 |
< |
int dirf; /* direction indicators to speed tests */ |
570 |
< |
register RAY *r; |
571 |
< |
register CUBE *cu; |
566 |
> |
raymove( /* check for hit as we move */ |
567 |
> |
FVECT pos, /* current position, modified herein */ |
568 |
> |
OBJECT *cxs, /* checked objects, modified by checkhit */ |
569 |
> |
int dirf, /* direction indicators to speed tests */ |
570 |
> |
RAY *r, |
571 |
> |
CUBE *cu |
572 |
> |
) |
573 |
|
{ |
574 |
|
int ax; |
575 |
|
double dt, t; |
576 |
|
|
577 |
|
if (istree(cu->cutree)) { /* recurse on subcubes */ |
578 |
|
CUBE cukid; |
579 |
< |
register int br, sgn; |
579 |
> |
int br, sgn; |
580 |
|
|
581 |
|
cukid.cusize = cu->cusize * 0.5; /* find subcube */ |
582 |
|
VCOPY(cukid.cuorg, cu->cuorg); |
642 |
|
ax = 2; |
643 |
|
} |
644 |
|
} |
645 |
< |
pos[0] += r->rdir[0]*t; |
576 |
< |
pos[1] += r->rdir[1]*t; |
577 |
< |
pos[2] += r->rdir[2]*t; |
645 |
> |
VSUM(pos, pos, r->rdir, t); |
646 |
|
return(ax); |
647 |
|
} |
648 |
|
|
649 |
|
|
650 |
|
static int |
651 |
< |
checkhit(r, cu, cxs) /* check for hit in full cube */ |
652 |
< |
register RAY *r; |
653 |
< |
CUBE *cu; |
654 |
< |
OBJECT *cxs; |
651 |
> |
checkhit( /* check for hit in full cube */ |
652 |
> |
RAY *r, |
653 |
> |
CUBE *cu, |
654 |
> |
OBJECT *cxs |
655 |
> |
) |
656 |
|
{ |
657 |
|
OBJECT oset[MAXSET+1]; |
658 |
|
|
669 |
|
|
670 |
|
|
671 |
|
static void |
672 |
< |
checkset(os, cs) /* modify checked set and set to check */ |
673 |
< |
register OBJECT *os; /* os' = os - cs */ |
674 |
< |
register OBJECT *cs; /* cs' = cs + os */ |
672 |
> |
checkset( /* modify checked set and set to check */ |
673 |
> |
OBJECT *os, /* os' = os - cs */ |
674 |
> |
OBJECT *cs /* cs' = cs + os */ |
675 |
> |
) |
676 |
|
{ |
677 |
|
OBJECT cset[MAXCSET+MAXSET+1]; |
678 |
< |
register int i, j; |
678 |
> |
int i, j; |
679 |
|
int k; |
680 |
|
/* copy os in place, cset <- cs */ |
681 |
|
cset[0] = 0; |