14 |
|
#include "otypes.h" |
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 */ |
36 |
|
static void checkset(OBJECT *os, OBJECT *cs); |
37 |
|
|
38 |
|
|
39 |
< |
extern int |
39 |
> |
int |
40 |
|
rayorigin( /* start new ray from old one */ |
41 |
|
RAY *r, |
42 |
|
int rt, |
51 |
|
setcolor(r->rcoef, 1., 1., 1.); |
52 |
|
} else { |
53 |
|
rw = intens(rc); |
54 |
+ |
if (rw > 1.0) |
55 |
+ |
rw = 1.0; /* avoid calculation growth */ |
56 |
|
if (rc != r->rcoef) |
57 |
|
copycolor(r->rcoef, rc); |
58 |
|
} |
68 |
|
r->gecc = seccg; |
69 |
|
r->slights = NULL; |
70 |
|
} else { /* spawned ray */ |
71 |
< |
if (ro->rot >= FHUGE) { |
71 |
> |
if (ro->rot >= FHUGE*.99) { |
72 |
|
memset(r, 0, sizeof(RAY)); |
73 |
|
return(-1); /* illegal continuation */ |
74 |
|
} |
96 |
|
colval(ro->cext,RED) : colval(ro->cext,GRN); |
97 |
|
if (colval(ro->cext,BLU) < re) re = colval(ro->cext,BLU); |
98 |
|
re *= ro->rot; |
99 |
< |
if (re > .1) |
100 |
< |
r->rweight *= exp(-re); |
99 |
> |
if (re > 0.1) { |
100 |
> |
if (re > 92.) { |
101 |
> |
r->rweight = 0.0; |
102 |
> |
} else { |
103 |
> |
r->rweight *= exp(-re); |
104 |
> |
} |
105 |
> |
} |
106 |
|
} |
107 |
|
rayclear(r); |
108 |
+ |
if (r->rweight <= 0.0) /* check for expiration */ |
109 |
+ |
return(-1); |
110 |
|
if (r->crtype & SHADOW) /* shadow commitment */ |
111 |
|
return(0); |
112 |
< |
if (maxdepth <= 0 && rc != NULL) { /* Russian roulette */ |
112 |
> |
/* ambient in photon map? */ |
113 |
> |
if (ro != NULL && ro->crtype & AMBIENT) { |
114 |
> |
if (causticPhotonMapping) |
115 |
> |
return(-1); |
116 |
> |
if (photonMapping && rt != TRANS) |
117 |
> |
return(-1); |
118 |
> |
} |
119 |
> |
if ((maxdepth <= 0) & (rc != NULL)) { /* Russian roulette */ |
120 |
|
if (minweight <= 0.0) |
121 |
|
error(USER, "zero ray weight in Russian roulette"); |
122 |
< |
if (maxdepth < 0 && r->rlvl > -maxdepth) |
122 |
> |
if ((maxdepth < 0) & (r->rlvl > -maxdepth)) |
123 |
|
return(-1); /* upper reflection limit */ |
124 |
|
if (r->rweight >= minweight) |
125 |
|
return(0); |
126 |
< |
if (frandom() < r->rweight/minweight) |
126 |
> |
if (frandom() > r->rweight/minweight) |
127 |
|
return(-1); |
128 |
|
rw = minweight/r->rweight; /* promote survivor */ |
129 |
|
scalecolor(r->rcoef, rw); |
130 |
|
r->rweight = minweight; |
131 |
|
return(0); |
132 |
|
} |
133 |
< |
return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1); |
133 |
> |
return((r->rweight >= minweight) & (r->rlvl <= abs(maxdepth)) ? 0 : -1); |
134 |
|
} |
135 |
|
|
136 |
|
|
137 |
< |
extern void |
137 |
> |
void |
138 |
|
rayclear( /* clear a ray for (re)evaluation */ |
139 |
< |
register RAY *r |
139 |
> |
RAY *r |
140 |
|
) |
141 |
|
{ |
142 |
|
r->rno = raynum++; |
145 |
|
r->robj = OVOID; |
146 |
|
r->ro = NULL; |
147 |
|
r->rox = NULL; |
148 |
< |
r->rt = r->rot = FHUGE; |
148 |
> |
r->rxt = r->rmt = r->rot = FHUGE; |
149 |
> |
VCOPY(r->rop, r->rorg); |
150 |
> |
r->ron[0] = -r->rdir[0]; r->ron[1] = -r->rdir[1]; r->ron[2] = -r->rdir[2]; |
151 |
> |
r->rod = 1.0; |
152 |
|
r->pert[0] = r->pert[1] = r->pert[2] = 0.0; |
153 |
+ |
r->rflips = 0; |
154 |
|
r->uv[0] = r->uv[1] = 0.0; |
155 |
|
setcolor(r->pcol, 1.0, 1.0, 1.0); |
156 |
+ |
setcolor(r->mcol, 0.0, 0.0, 0.0); |
157 |
|
setcolor(r->rcol, 0.0, 0.0, 0.0); |
158 |
|
} |
159 |
|
|
160 |
|
|
161 |
< |
extern void |
161 |
> |
void |
162 |
|
raytrace( /* trace a ray and compute its value */ |
163 |
|
RAY *r |
164 |
|
) |
178 |
|
} |
179 |
|
|
180 |
|
|
181 |
< |
extern void |
181 |
> |
void |
182 |
|
raycont( /* check for clipped object and continue */ |
183 |
< |
register RAY *r |
183 |
> |
RAY *r |
184 |
|
) |
185 |
|
{ |
186 |
|
if ((r->clipset != NULL && inset(r->clipset, r->ro->omod)) || |
189 |
|
} |
190 |
|
|
191 |
|
|
192 |
< |
extern void |
192 |
> |
void |
193 |
|
raytrans( /* transmit ray as is */ |
194 |
< |
register RAY *r |
194 |
> |
RAY *r |
195 |
|
) |
196 |
|
{ |
197 |
|
RAY tr; |
198 |
|
|
199 |
< |
if (rayorigin(&tr, TRANS, r, NULL) == 0) { |
200 |
< |
VCOPY(tr.rdir, r->rdir); |
201 |
< |
rayvalue(&tr); |
202 |
< |
copycolor(r->rcol, tr.rcol); |
203 |
< |
r->rt = r->rot + tr.rt; |
199 |
> |
rayorigin(&tr, TRANS, r, NULL); /* always continue */ |
200 |
> |
VCOPY(tr.rdir, r->rdir); |
201 |
> |
rayvalue(&tr); |
202 |
> |
copycolor(r->mcol, tr.mcol); |
203 |
> |
copycolor(r->rcol, tr.rcol); |
204 |
> |
r->rmt = r->rot + tr.rmt; |
205 |
> |
r->rxt = r->rot + tr.rxt; |
206 |
> |
} |
207 |
> |
|
208 |
> |
|
209 |
> |
int |
210 |
> |
raytirrad( /* irradiance hack */ |
211 |
> |
OBJREC *m, |
212 |
> |
RAY *r |
213 |
> |
) |
214 |
> |
{ |
215 |
> |
if (ofun[m->otype].flags & (T_M|T_X) && m->otype != MAT_CLIP) { |
216 |
> |
if (istransp(m->otype) || isBSDFproxy(m)) { |
217 |
> |
raytrans(r); |
218 |
> |
return(1); |
219 |
> |
} |
220 |
> |
if (!islight(m->otype)) { |
221 |
> |
setcolor(r->pcol, 1.0, 1.0, 1.0); |
222 |
> |
return((*ofun[Lamb.otype].funp)(&Lamb, r)); |
223 |
> |
} |
224 |
|
} |
225 |
+ |
return(0); /* not a qualifying surface */ |
226 |
|
} |
227 |
|
|
228 |
|
|
229 |
< |
extern int |
229 |
> |
int |
230 |
|
rayshade( /* shade ray r with material mod */ |
231 |
< |
register RAY *r, |
231 |
> |
RAY *r, |
232 |
|
int mod |
233 |
|
) |
234 |
|
{ |
235 |
< |
register OBJREC *m; |
235 |
> |
int tst_irrad = do_irrad && !(r->crtype & ~(PRIMARY|TRANS)); |
236 |
> |
OBJREC *m; |
237 |
|
|
238 |
< |
r->rt = r->rot; /* set effective ray length */ |
238 |
> |
r->rxt = r->rot; /* preset effective ray length */ |
239 |
|
for ( ; mod != OVOID; mod = m->omod) { |
240 |
|
m = objptr(mod); |
241 |
|
/****** unnecessary test since modifier() is always called |
245 |
|
} |
246 |
|
******/ |
247 |
|
/* hack for irradiance calculation */ |
248 |
< |
if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS)) && |
249 |
< |
m->otype != MAT_CLIP && |
250 |
< |
(ofun[m->otype].flags & (T_M|T_X))) { |
207 |
< |
if (irr_ignore(m->otype)) { |
208 |
< |
raytrans(r); |
209 |
< |
return(1); |
210 |
< |
} |
211 |
< |
if (!islight(m->otype)) |
212 |
< |
m = &Lamb; |
213 |
< |
} |
248 |
> |
if (tst_irrad && raytirrad(m, r)) |
249 |
> |
return(1); |
250 |
> |
|
251 |
|
if ((*ofun[m->otype].funp)(m, r)) |
252 |
|
return(1); /* materials call raytexture() */ |
253 |
|
} |
255 |
|
} |
256 |
|
|
257 |
|
|
258 |
< |
extern void |
258 |
> |
void |
259 |
|
rayparticipate( /* compute ray medium participation */ |
260 |
< |
register RAY *r |
260 |
> |
RAY *r |
261 |
|
) |
262 |
|
{ |
263 |
|
COLOR ce, ca; |
279 |
|
multcolor(r->rcol, ce); /* path extinction */ |
280 |
|
if (r->crtype & SHADOW || intens(r->albedo) <= FTINY) |
281 |
|
return; /* no scattering */ |
282 |
< |
setcolor(ca, |
283 |
< |
colval(r->albedo,RED)*colval(ambval,RED)*(1.-colval(ce,RED)), |
284 |
< |
colval(r->albedo,GRN)*colval(ambval,GRN)*(1.-colval(ce,GRN)), |
285 |
< |
colval(r->albedo,BLU)*colval(ambval,BLU)*(1.-colval(ce,BLU))); |
286 |
< |
addcolor(r->rcol, ca); /* ambient in scattering */ |
282 |
> |
|
283 |
> |
/* PMAP: indirect inscattering accounted for by volume photons? */ |
284 |
> |
if (!volumePhotonMapping) { |
285 |
> |
setcolor(ca, |
286 |
> |
colval(r->albedo,RED)*colval(ambval,RED)*(1.-colval(ce,RED)), |
287 |
> |
colval(r->albedo,GRN)*colval(ambval,GRN)*(1.-colval(ce,GRN)), |
288 |
> |
colval(r->albedo,BLU)*colval(ambval,BLU)*(1.-colval(ce,BLU))); |
289 |
> |
addcolor(r->rcol, ca); /* ambient in scattering */ |
290 |
> |
} |
291 |
> |
|
292 |
|
srcscatter(r); /* source in scattering */ |
293 |
|
} |
294 |
|
|
295 |
|
|
296 |
< |
extern void |
296 |
> |
void |
297 |
|
raytexture( /* get material modifiers */ |
298 |
|
RAY *r, |
299 |
|
OBJECT mod |
300 |
|
) |
301 |
|
{ |
302 |
< |
register OBJREC *m; |
302 |
> |
OBJREC *m; |
303 |
|
/* execute textures and patterns */ |
304 |
|
for ( ; mod != OVOID; mod = m->omod) { |
305 |
|
m = objptr(mod); |
318 |
|
} |
319 |
|
|
320 |
|
|
321 |
< |
extern int |
321 |
> |
int |
322 |
|
raymixture( /* mix modifiers */ |
323 |
< |
register RAY *r, |
323 |
> |
RAY *r, |
324 |
|
OBJECT fore, |
325 |
|
OBJECT back, |
326 |
|
double coef |
327 |
|
) |
328 |
|
{ |
329 |
|
RAY fr, br; |
330 |
+ |
double mfore, mback; |
331 |
|
int foremat, backmat; |
332 |
< |
register int i; |
332 |
> |
int i; |
333 |
|
/* bound coefficient */ |
334 |
|
if (coef > 1.0) |
335 |
|
coef = 1.0; |
339 |
|
foremat = backmat = 0; |
340 |
|
/* foreground */ |
341 |
|
fr = *r; |
342 |
< |
if (coef > FTINY) |
342 |
> |
if (coef > FTINY) { |
343 |
> |
fr.rweight *= coef; |
344 |
> |
scalecolor(fr.rcoef, coef); |
345 |
|
foremat = rayshade(&fr, fore); |
346 |
+ |
} |
347 |
|
/* background */ |
348 |
|
br = *r; |
349 |
< |
if (coef < 1.0-FTINY) |
349 |
> |
if (coef < 1.0-FTINY) { |
350 |
> |
br.rweight *= 1.0-coef; |
351 |
> |
scalecolor(br.rcoef, 1.0-coef); |
352 |
|
backmat = rayshade(&br, back); |
353 |
+ |
} |
354 |
|
/* check for transparency */ |
355 |
|
if (backmat ^ foremat) { |
356 |
|
if (backmat && coef > FTINY) |
374 |
|
scalecolor(br.rcol, 1.0-coef); |
375 |
|
copycolor(r->rcol, fr.rcol); |
376 |
|
addcolor(r->rcol, br.rcol); |
377 |
< |
r->rt = bright(fr.rcol) > bright(br.rcol) ? fr.rt : br.rt; |
377 |
> |
scalecolor(fr.mcol, coef); |
378 |
> |
scalecolor(br.mcol, 1.0-coef); |
379 |
> |
copycolor(r->mcol, fr.mcol); |
380 |
> |
addcolor(r->mcol, br.mcol); |
381 |
> |
mfore = bright(fr.mcol); mback = bright(br.mcol); |
382 |
> |
r->rmt = mfore > mback ? fr.rmt : br.rmt; |
383 |
> |
r->rxt = bright(fr.rcol)-mfore > bright(br.rcol)-mback ? |
384 |
> |
fr.rxt : br.rxt; |
385 |
|
return(1); |
386 |
|
} |
387 |
|
|
388 |
|
|
389 |
< |
extern double |
389 |
> |
double |
390 |
|
raydist( /* compute (cumulative) ray distance */ |
391 |
< |
register const RAY *r, |
392 |
< |
register int flags |
391 |
> |
const RAY *r, |
392 |
> |
int flags |
393 |
|
) |
394 |
|
{ |
395 |
|
double sum = 0.0; |
402 |
|
} |
403 |
|
|
404 |
|
|
405 |
< |
extern void |
405 |
> |
void |
406 |
|
raycontrib( /* compute (cumulative) ray contribution */ |
407 |
< |
double rc[3], |
407 |
> |
RREAL rc[3], |
408 |
|
const RAY *r, |
409 |
|
int flags |
410 |
|
) |
411 |
|
{ |
412 |
< |
double eext[3]; |
357 |
< |
int i; |
412 |
> |
static int warnedPM = 0; |
413 |
|
|
359 |
– |
eext[0] = eext[1] = eext[2] = 0.; |
414 |
|
rc[0] = rc[1] = rc[2] = 1.; |
415 |
|
|
416 |
|
while (r != NULL && r->crtype&flags) { |
417 |
< |
for (i = 3; i--; ) { |
417 |
> |
int i = 3; |
418 |
> |
while (i--) |
419 |
|
rc[i] *= colval(r->rcoef,i); |
420 |
< |
eext[i] += r->rot * colval(r->cext,i); |
420 |
> |
/* check for participating medium */ |
421 |
> |
if (!warnedPM && (bright(r->cext) > FTINY) | |
422 |
> |
(bright(r->albedo) > FTINY)) { |
423 |
> |
error(WARNING, |
424 |
> |
"ray contribution calculation does not support participating media"); |
425 |
> |
warnedPM++; |
426 |
|
} |
427 |
|
r = r->parent; |
428 |
|
} |
369 |
– |
for (i = 3; i--; ) |
370 |
– |
rc[i] *= (eext[i] <= FTINY) ? 1. : |
371 |
– |
(eext[i] > 300.) ? 0. : exp(-eext[i]); |
429 |
|
} |
430 |
|
|
431 |
|
|
432 |
< |
extern double |
432 |
> |
double |
433 |
|
raynormal( /* compute perturbed normal for ray */ |
434 |
|
FVECT norm, |
435 |
< |
register RAY *r |
435 |
> |
RAY *r |
436 |
|
) |
437 |
|
{ |
438 |
|
double newdot; |
439 |
< |
register int i; |
439 |
> |
int i; |
440 |
|
|
441 |
|
/* The perturbation is added to the surface normal to obtain |
442 |
|
* the new normal. If the new normal would affect the surface |
465 |
|
} |
466 |
|
|
467 |
|
|
468 |
< |
extern void |
468 |
> |
void |
469 |
|
newrayxf( /* get new tranformation matrix for ray */ |
470 |
|
RAY *r |
471 |
|
) |
474 |
|
struct xfn *next; |
475 |
|
FULLXF xf; |
476 |
|
} xfseed = { &xfseed }, *xflast = &xfseed; |
477 |
< |
register struct xfn *xp; |
478 |
< |
register const RAY *rp; |
477 |
> |
struct xfn *xp; |
478 |
> |
const RAY *rp; |
479 |
|
|
480 |
|
/* |
481 |
|
* Search for transform in circular list that |
486 |
|
if (rp->rox == &xp->xf) { /* xp in use */ |
487 |
|
xp = xp->next; /* move to next */ |
488 |
|
if (xp == xflast) { /* need new one */ |
489 |
< |
xp = (struct xfn *)malloc(sizeof(struct xfn)); |
489 |
> |
xp = (struct xfn *)bmalloc(sizeof(struct xfn)); |
490 |
|
if (xp == NULL) |
491 |
|
error(SYSTEM, |
492 |
|
"out of memory in newrayxf"); |
503 |
|
} |
504 |
|
|
505 |
|
|
506 |
< |
extern void |
506 |
> |
void |
507 |
|
flipsurface( /* reverse surface orientation */ |
508 |
< |
register RAY *r |
508 |
> |
RAY *r |
509 |
|
) |
510 |
|
{ |
511 |
|
r->rod = -r->rod; |
515 |
|
r->pert[0] = -r->pert[0]; |
516 |
|
r->pert[1] = -r->pert[1]; |
517 |
|
r->pert[2] = -r->pert[2]; |
518 |
+ |
r->rflips++; |
519 |
|
} |
520 |
|
|
521 |
|
|
522 |
< |
extern void |
522 |
> |
int |
523 |
> |
rayreject( /* check if candidate hit is worse than current */ |
524 |
> |
OBJREC *o, |
525 |
> |
RAY *r, |
526 |
> |
double t |
527 |
> |
) |
528 |
> |
{ |
529 |
> |
OBJREC *mnew, *mray; |
530 |
> |
|
531 |
> |
if ((t <= FTINY) | (t > r->rot + FTINY)) |
532 |
> |
return(1); |
533 |
> |
if (t < r->rot - FTINY) /* is new hit significantly closer? */ |
534 |
> |
return(0); |
535 |
> |
/* coincident point, so decide... */ |
536 |
> |
if (o == r->ro) |
537 |
> |
return(1); /* shouldn't happen */ |
538 |
> |
if (r->ro == NULL) |
539 |
> |
return(0); /* ditto */ |
540 |
> |
mnew = findmaterial(o); |
541 |
> |
mray = findmaterial(r->ro); /* check material transparencies */ |
542 |
> |
if (mnew == NULL) { |
543 |
> |
if (mray != NULL) |
544 |
> |
return(1); /* new has no material */ |
545 |
> |
} else if (mray == NULL) { |
546 |
> |
return(0); /* old has no material(!) */ |
547 |
> |
} else if (istransp(mnew->otype)) { |
548 |
> |
if (!istransp(mray->otype)) |
549 |
> |
return(1); /* new is transparent */ |
550 |
> |
} else if (istransp(mray->otype)) { |
551 |
> |
return(0); /* old is transparent */ |
552 |
> |
} |
553 |
> |
/* weakest priority to later modifier definition */ |
554 |
> |
return (r->ro->omod >= o->omod); |
555 |
> |
} |
556 |
> |
|
557 |
> |
void |
558 |
|
rayhit( /* standard ray hit test */ |
559 |
|
OBJECT *oset, |
560 |
|
RAY *r |
571 |
|
} |
572 |
|
|
573 |
|
|
574 |
< |
extern int |
574 |
> |
int |
575 |
|
localhit( /* check for hit in the octree */ |
576 |
< |
register RAY *r, |
577 |
< |
register CUBE *scene |
576 |
> |
RAY *r, |
577 |
> |
CUBE *scene |
578 |
|
) |
579 |
|
{ |
580 |
|
OBJECT cxset[MAXCSET+1]; /* set of checked objects */ |
581 |
|
FVECT curpos; /* current cube position */ |
582 |
|
int sflags; /* sign flags */ |
583 |
|
double t, dt; |
584 |
< |
register int i; |
584 |
> |
int i; |
585 |
|
|
586 |
|
nrays++; /* increment trace counter */ |
587 |
|
sflags = 0; |
592 |
|
else if (r->rdir[i] < -1e-7) |
593 |
|
sflags |= 0x10 << i; |
594 |
|
} |
595 |
< |
if (sflags == 0) |
596 |
< |
error(CONSISTENCY, "zero ray direction in localhit"); |
595 |
> |
if (!sflags) { |
596 |
> |
error(WARNING, "zero ray direction in localhit"); |
597 |
> |
return(0); |
598 |
> |
} |
599 |
|
/* start off assuming nothing hit */ |
600 |
|
if (r->rmax > FTINY) { /* except aft plane if one */ |
601 |
|
r->ro = &Aftplane; |
602 |
|
r->rot = r->rmax; |
603 |
< |
for (i = 0; i < 3; i++) |
509 |
< |
r->rop[i] = r->rorg[i] + r->rot*r->rdir[i]; |
603 |
> |
VSUM(r->rop, r->rorg, r->rdir, r->rot); |
604 |
|
} |
605 |
|
/* find global cube entrance point */ |
606 |
|
t = 0.0; |
623 |
|
if (t >= r->rot) /* clipped already */ |
624 |
|
return(0); |
625 |
|
/* advance position */ |
626 |
< |
for (i = 0; i < 3; i++) |
533 |
< |
curpos[i] += r->rdir[i]*t; |
626 |
> |
VSUM(curpos, curpos, r->rdir, t); |
627 |
|
|
628 |
|
if (!incube(scene, curpos)) /* non-intersecting ray */ |
629 |
|
return(0); |
639 |
|
FVECT pos, /* current position, modified herein */ |
640 |
|
OBJECT *cxs, /* checked objects, modified by checkhit */ |
641 |
|
int dirf, /* direction indicators to speed tests */ |
642 |
< |
register RAY *r, |
643 |
< |
register CUBE *cu |
642 |
> |
RAY *r, |
643 |
> |
CUBE *cu |
644 |
|
) |
645 |
|
{ |
646 |
|
int ax; |
648 |
|
|
649 |
|
if (istree(cu->cutree)) { /* recurse on subcubes */ |
650 |
|
CUBE cukid; |
651 |
< |
register int br, sgn; |
651 |
> |
int br, sgn; |
652 |
|
|
653 |
|
cukid.cusize = cu->cusize * 0.5; /* find subcube */ |
654 |
|
VCOPY(cukid.cuorg, cu->cuorg); |
714 |
|
ax = 2; |
715 |
|
} |
716 |
|
} |
717 |
< |
pos[0] += r->rdir[0]*t; |
625 |
< |
pos[1] += r->rdir[1]*t; |
626 |
< |
pos[2] += r->rdir[2]*t; |
717 |
> |
VSUM(pos, pos, r->rdir, t); |
718 |
|
return(ax); |
719 |
|
} |
720 |
|
|
721 |
|
|
722 |
|
static int |
723 |
|
checkhit( /* check for hit in full cube */ |
724 |
< |
register RAY *r, |
724 |
> |
RAY *r, |
725 |
|
CUBE *cu, |
726 |
|
OBJECT *cxs |
727 |
|
) |
742 |
|
|
743 |
|
static void |
744 |
|
checkset( /* modify checked set and set to check */ |
745 |
< |
register OBJECT *os, /* os' = os - cs */ |
746 |
< |
register OBJECT *cs /* cs' = cs + os */ |
745 |
> |
OBJECT *os, /* os' = os - cs */ |
746 |
> |
OBJECT *cs /* cs' = cs + os */ |
747 |
|
) |
748 |
|
{ |
749 |
|
OBJECT cset[MAXCSET+MAXSET+1]; |
750 |
< |
register int i, j; |
750 |
> |
int i, j; |
751 |
|
int k; |
752 |
|
/* copy os in place, cset <- cs */ |
753 |
|
cset[0] = 0; |