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 FLOAT Lambfa[5] = {PI, PI, PI, 0.0, 0.0}; |
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 (ro != NULL && ro->crtype & AMBIENT) { |
112 |
> |
if (causticPhotonMapping) |
113 |
> |
return(-1); |
114 |
> |
if (photonMapping && rt != TRANS) |
115 |
> |
return(-1); |
116 |
> |
} |
117 |
> |
if (maxdepth <= 0 && rc != NULL) { /* Russian roulette */ |
118 |
> |
if (minweight <= 0.0) |
119 |
> |
error(USER, "zero ray weight in Russian roulette"); |
120 |
> |
if (maxdepth < 0 && r->rlvl > -maxdepth) |
121 |
> |
return(-1); /* upper reflection limit */ |
122 |
> |
if (r->rweight >= minweight) |
123 |
> |
return(0); |
124 |
> |
if (frandom() > r->rweight/minweight) |
125 |
> |
return(-1); |
126 |
> |
rw = minweight/r->rweight; /* promote survivor */ |
127 |
> |
scalecolor(r->rcoef, rw); |
128 |
> |
r->rweight = minweight; |
129 |
> |
return(0); |
130 |
> |
} |
131 |
> |
return(r->rweight >= minweight && r->rlvl <= abs(maxdepth) ? 0 : -1); |
132 |
|
} |
133 |
|
|
134 |
|
|
135 |
|
void |
136 |
< |
rayclear(r) /* clear a ray for (re)evaluation */ |
137 |
< |
register RAY *r; |
136 |
> |
rayclear( /* clear a ray for (re)evaluation */ |
137 |
> |
RAY *r |
138 |
> |
) |
139 |
|
{ |
140 |
|
r->rno = raynum++; |
141 |
|
r->newcset = r->clipset; |
152 |
|
|
153 |
|
|
154 |
|
void |
155 |
< |
raytrace(r) /* trace a ray and compute its value */ |
156 |
< |
RAY *r; |
155 |
> |
raytrace( /* trace a ray and compute its value */ |
156 |
> |
RAY *r |
157 |
> |
) |
158 |
|
{ |
159 |
|
if (localhit(r, &thescene)) |
160 |
|
raycont(r); /* hit local surface, evaluate */ |
164 |
|
} else if (sourcehit(r)) |
165 |
|
rayshade(r, r->ro->omod); /* distant source */ |
166 |
|
|
122 |
– |
rayparticipate(r); /* for participating medium */ |
123 |
– |
|
167 |
|
if (trace != NULL) |
168 |
|
(*trace)(r); /* trace execution */ |
169 |
+ |
|
170 |
+ |
rayparticipate(r); /* for participating medium */ |
171 |
|
} |
172 |
|
|
173 |
|
|
174 |
|
void |
175 |
< |
raycont(r) /* check for clipped object and continue */ |
176 |
< |
register RAY *r; |
175 |
> |
raycont( /* check for clipped object and continue */ |
176 |
> |
RAY *r |
177 |
> |
) |
178 |
|
{ |
179 |
|
if ((r->clipset != NULL && inset(r->clipset, r->ro->omod)) || |
180 |
|
!rayshade(r, r->ro->omod)) |
183 |
|
|
184 |
|
|
185 |
|
void |
186 |
< |
raytrans(r) /* transmit ray as is */ |
187 |
< |
register RAY *r; |
186 |
> |
raytrans( /* transmit ray as is */ |
187 |
> |
RAY *r |
188 |
> |
) |
189 |
|
{ |
190 |
|
RAY tr; |
191 |
|
|
192 |
< |
if (rayorigin(&tr, r, TRANS, 1.0) == 0) { |
193 |
< |
VCOPY(tr.rdir, r->rdir); |
194 |
< |
rayvalue(&tr); |
195 |
< |
copycolor(r->rcol, tr.rcol); |
196 |
< |
r->rt = r->rot + tr.rt; |
150 |
< |
} |
192 |
> |
rayorigin(&tr, TRANS, r, NULL); /* always continue */ |
193 |
> |
VCOPY(tr.rdir, r->rdir); |
194 |
> |
rayvalue(&tr); |
195 |
> |
copycolor(r->rcol, tr.rcol); |
196 |
> |
r->rt = r->rot + tr.rt; |
197 |
|
} |
198 |
|
|
199 |
|
|
200 |
|
int |
201 |
< |
rayshade(r, mod) /* shade ray r with material mod */ |
202 |
< |
register RAY *r; |
203 |
< |
int mod; |
201 |
> |
rayshade( /* shade ray r with material mod */ |
202 |
> |
RAY *r, |
203 |
> |
int mod |
204 |
> |
) |
205 |
|
{ |
206 |
< |
int gotmat; |
207 |
< |
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 |
206 |
> |
OBJREC *m; |
207 |
> |
|
208 |
|
r->rt = r->rot; /* set effective ray length */ |
209 |
< |
for (gotmat = 0; !gotmat && mod != OVOID; mod = m->omod) { |
209 |
> |
for ( ; mod != OVOID; mod = m->omod) { |
210 |
|
m = objptr(mod); |
211 |
|
/****** unnecessary test since modifier() is always called |
212 |
|
if (!ismodifier(m->otype)) { |
215 |
|
} |
216 |
|
******/ |
217 |
|
/* hack for irradiance calculation */ |
218 |
< |
if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS))) { |
218 |
> |
if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS)) && |
219 |
> |
m->otype != MAT_CLIP && |
220 |
> |
(ofun[m->otype].flags & (T_M|T_X))) { |
221 |
|
if (irr_ignore(m->otype)) { |
179 |
– |
#if MAXLOOP |
180 |
– |
depth--; |
181 |
– |
#endif |
222 |
|
raytrans(r); |
223 |
|
return(1); |
224 |
|
} |
225 |
|
if (!islight(m->otype)) |
226 |
|
m = &Lamb; |
227 |
|
} |
228 |
< |
/* materials call raytexture */ |
229 |
< |
gotmat = (*ofun[m->otype].funp)(m, r); |
228 |
> |
if ((*ofun[m->otype].funp)(m, r)) |
229 |
> |
return(1); /* materials call raytexture() */ |
230 |
|
} |
231 |
< |
#if MAXLOOP |
192 |
< |
depth--; |
193 |
< |
#endif |
194 |
< |
return(gotmat); |
231 |
> |
return(0); /* no material! */ |
232 |
|
} |
233 |
|
|
234 |
|
|
235 |
|
void |
236 |
< |
rayparticipate(r) /* compute ray medium participation */ |
237 |
< |
register RAY *r; |
236 |
> |
rayparticipate( /* compute ray medium participation */ |
237 |
> |
RAY *r |
238 |
> |
) |
239 |
|
{ |
240 |
|
COLOR ce, ca; |
241 |
|
double re, ge, be; |
250 |
|
ge *= 1. - colval(r->albedo,GRN); |
251 |
|
be *= 1. - colval(r->albedo,BLU); |
252 |
|
} |
253 |
< |
setcolor(ce, re<=0. ? 1. : re>92. ? 0. : exp(-re), |
254 |
< |
ge<=0. ? 1. : ge>92. ? 0. : exp(-ge), |
255 |
< |
be<=0. ? 1. : be>92. ? 0. : exp(-be)); |
256 |
< |
multcolor(r->rcol, ce); /* path absorption */ |
253 |
> |
setcolor(ce, re<=FTINY ? 1. : re>92. ? 0. : exp(-re), |
254 |
> |
ge<=FTINY ? 1. : ge>92. ? 0. : exp(-ge), |
255 |
> |
be<=FTINY ? 1. : be>92. ? 0. : exp(-be)); |
256 |
> |
multcolor(r->rcol, ce); /* path extinction */ |
257 |
|
if (r->crtype & SHADOW || intens(r->albedo) <= FTINY) |
258 |
|
return; /* no scattering */ |
259 |
< |
setcolor(ca, |
260 |
< |
colval(r->albedo,RED)*colval(ambval,RED)*(1.-colval(ce,RED)), |
261 |
< |
colval(r->albedo,GRN)*colval(ambval,GRN)*(1.-colval(ce,GRN)), |
262 |
< |
colval(r->albedo,BLU)*colval(ambval,BLU)*(1.-colval(ce,BLU))); |
263 |
< |
addcolor(r->rcol, ca); /* ambient in scattering */ |
259 |
> |
|
260 |
> |
/* PMAP: indirect inscattering accounted for by volume photons? */ |
261 |
> |
if (!volumePhotonMapping) { |
262 |
> |
setcolor(ca, |
263 |
> |
colval(r->albedo,RED)*colval(ambval,RED)*(1.-colval(ce,RED)), |
264 |
> |
colval(r->albedo,GRN)*colval(ambval,GRN)*(1.-colval(ce,GRN)), |
265 |
> |
colval(r->albedo,BLU)*colval(ambval,BLU)*(1.-colval(ce,BLU))); |
266 |
> |
addcolor(r->rcol, ca); /* ambient in scattering */ |
267 |
> |
} |
268 |
> |
|
269 |
|
srcscatter(r); /* source in scattering */ |
270 |
|
} |
271 |
|
|
272 |
|
|
273 |
< |
raytexture(r, mod) /* get material modifiers */ |
274 |
< |
RAY *r; |
275 |
< |
int mod; |
273 |
> |
void |
274 |
> |
raytexture( /* get material modifiers */ |
275 |
> |
RAY *r, |
276 |
> |
OBJECT mod |
277 |
> |
) |
278 |
|
{ |
279 |
< |
register OBJREC *m; |
235 |
< |
#if MAXLOOP |
236 |
< |
static int depth = 0; |
237 |
< |
/* check for infinite loop */ |
238 |
< |
if (depth++ >= MAXLOOP) |
239 |
< |
objerror(r->ro, USER, "modifier loop"); |
240 |
< |
#endif |
279 |
> |
OBJREC *m; |
280 |
|
/* execute textures and patterns */ |
281 |
|
for ( ; mod != OVOID; mod = m->omod) { |
282 |
|
m = objptr(mod); |
292 |
|
objerror(r->ro, USER, errmsg); |
293 |
|
} |
294 |
|
} |
256 |
– |
#if MAXLOOP |
257 |
– |
depth--; /* end here */ |
258 |
– |
#endif |
295 |
|
} |
296 |
|
|
297 |
|
|
298 |
|
int |
299 |
< |
raymixture(r, fore, back, coef) /* mix modifiers */ |
300 |
< |
register RAY *r; |
301 |
< |
OBJECT fore, back; |
302 |
< |
double coef; |
299 |
> |
raymixture( /* mix modifiers */ |
300 |
> |
RAY *r, |
301 |
> |
OBJECT fore, |
302 |
> |
OBJECT back, |
303 |
> |
double coef |
304 |
> |
) |
305 |
|
{ |
306 |
|
RAY fr, br; |
307 |
|
int foremat, backmat; |
308 |
< |
register int i; |
308 |
> |
int i; |
309 |
|
/* bound coefficient */ |
310 |
|
if (coef > 1.0) |
311 |
|
coef = 1.0; |
314 |
|
/* compute foreground and background */ |
315 |
|
foremat = backmat = 0; |
316 |
|
/* foreground */ |
317 |
< |
copystruct(&fr, r); |
318 |
< |
if (coef > FTINY) |
317 |
> |
fr = *r; |
318 |
> |
if (coef > FTINY) { |
319 |
> |
fr.rweight *= coef; |
320 |
> |
scalecolor(fr.rcoef, coef); |
321 |
|
foremat = rayshade(&fr, fore); |
322 |
+ |
} |
323 |
|
/* background */ |
324 |
< |
copystruct(&br, r); |
325 |
< |
if (coef < 1.0-FTINY) |
324 |
> |
br = *r; |
325 |
> |
if (coef < 1.0-FTINY) { |
326 |
> |
br.rweight *= 1.0-coef; |
327 |
> |
scalecolor(br.rcoef, 1.0-coef); |
328 |
|
backmat = rayshade(&br, back); |
329 |
+ |
} |
330 |
|
/* check for transparency */ |
331 |
< |
if (backmat ^ foremat) |
331 |
> |
if (backmat ^ foremat) { |
332 |
|
if (backmat && coef > FTINY) |
333 |
|
raytrans(&fr); |
334 |
|
else if (foremat && coef < 1.0-FTINY) |
335 |
|
raytrans(&br); |
336 |
+ |
} |
337 |
|
/* mix perturbations */ |
338 |
|
for (i = 0; i < 3; i++) |
339 |
|
r->pert[i] = coef*fr.pert[i] + (1.0-coef)*br.pert[i]; |
356 |
|
|
357 |
|
|
358 |
|
double |
359 |
< |
raydist(r, flags) /* compute (cumulative) ray distance */ |
360 |
< |
register RAY *r; |
361 |
< |
register int flags; |
359 |
> |
raydist( /* compute (cumulative) ray distance */ |
360 |
> |
const RAY *r, |
361 |
> |
int flags |
362 |
> |
) |
363 |
|
{ |
364 |
|
double sum = 0.0; |
365 |
|
|
371 |
|
} |
372 |
|
|
373 |
|
|
374 |
+ |
void |
375 |
+ |
raycontrib( /* compute (cumulative) ray contribution */ |
376 |
+ |
RREAL rc[3], |
377 |
+ |
const RAY *r, |
378 |
+ |
int flags |
379 |
+ |
) |
380 |
+ |
{ |
381 |
+ |
double eext[3]; |
382 |
+ |
int i; |
383 |
+ |
|
384 |
+ |
eext[0] = eext[1] = eext[2] = 0.; |
385 |
+ |
rc[0] = rc[1] = rc[2] = 1.; |
386 |
+ |
|
387 |
+ |
while (r != NULL && r->crtype&flags) { |
388 |
+ |
for (i = 3; i--; ) { |
389 |
+ |
rc[i] *= colval(r->rcoef,i); |
390 |
+ |
eext[i] += r->rot * colval(r->cext,i); |
391 |
+ |
} |
392 |
+ |
r = r->parent; |
393 |
+ |
} |
394 |
+ |
for (i = 3; i--; ) |
395 |
+ |
rc[i] *= (eext[i] <= FTINY) ? 1. : |
396 |
+ |
(eext[i] > 92.) ? 0. : exp(-eext[i]); |
397 |
+ |
} |
398 |
+ |
|
399 |
+ |
|
400 |
|
double |
401 |
< |
raynormal(norm, r) /* compute perturbed normal for ray */ |
402 |
< |
FVECT norm; |
403 |
< |
register RAY *r; |
401 |
> |
raynormal( /* compute perturbed normal for ray */ |
402 |
> |
FVECT norm, |
403 |
> |
RAY *r |
404 |
> |
) |
405 |
|
{ |
406 |
|
double newdot; |
407 |
< |
register int i; |
407 |
> |
int i; |
408 |
|
|
409 |
|
/* The perturbation is added to the surface normal to obtain |
410 |
|
* the new normal. If the new normal would affect the surface |
434 |
|
|
435 |
|
|
436 |
|
void |
437 |
< |
newrayxf(r) /* get new tranformation matrix for ray */ |
438 |
< |
RAY *r; |
437 |
> |
newrayxf( /* get new tranformation matrix for ray */ |
438 |
> |
RAY *r |
439 |
> |
) |
440 |
|
{ |
441 |
|
static struct xfn { |
442 |
|
struct xfn *next; |
443 |
|
FULLXF xf; |
444 |
|
} xfseed = { &xfseed }, *xflast = &xfseed; |
445 |
< |
register struct xfn *xp; |
446 |
< |
register RAY *rp; |
445 |
> |
struct xfn *xp; |
446 |
> |
const RAY *rp; |
447 |
|
|
448 |
|
/* |
449 |
|
* Search for transform in circular list that |
454 |
|
if (rp->rox == &xp->xf) { /* xp in use */ |
455 |
|
xp = xp->next; /* move to next */ |
456 |
|
if (xp == xflast) { /* need new one */ |
457 |
< |
xp = (struct xfn *)malloc(sizeof(struct xfn)); |
457 |
> |
xp = (struct xfn *)bmalloc(sizeof(struct xfn)); |
458 |
|
if (xp == NULL) |
459 |
|
error(SYSTEM, |
460 |
|
"out of memory in newrayxf"); |
472 |
|
|
473 |
|
|
474 |
|
void |
475 |
< |
flipsurface(r) /* reverse surface orientation */ |
476 |
< |
register RAY *r; |
475 |
> |
flipsurface( /* reverse surface orientation */ |
476 |
> |
RAY *r |
477 |
> |
) |
478 |
|
{ |
479 |
|
r->rod = -r->rod; |
480 |
|
r->ron[0] = -r->ron[0]; |
487 |
|
|
488 |
|
|
489 |
|
void |
490 |
< |
rayhit(oset, r) /* standard ray hit test */ |
491 |
< |
OBJECT *oset; |
492 |
< |
RAY *r; |
490 |
> |
rayhit( /* standard ray hit test */ |
491 |
> |
OBJECT *oset, |
492 |
> |
RAY *r |
493 |
> |
) |
494 |
|
{ |
495 |
|
OBJREC *o; |
496 |
|
int i; |
504 |
|
|
505 |
|
|
506 |
|
int |
507 |
< |
localhit(r, scene) /* check for hit in the octree */ |
508 |
< |
register RAY *r; |
509 |
< |
register CUBE *scene; |
507 |
> |
localhit( /* check for hit in the octree */ |
508 |
> |
RAY *r, |
509 |
> |
CUBE *scene |
510 |
> |
) |
511 |
|
{ |
512 |
|
OBJECT cxset[MAXCSET+1]; /* set of checked objects */ |
513 |
|
FVECT curpos; /* current cube position */ |
514 |
|
int sflags; /* sign flags */ |
515 |
|
double t, dt; |
516 |
< |
register int i; |
516 |
> |
int i; |
517 |
|
|
518 |
|
nrays++; /* increment trace counter */ |
519 |
|
sflags = 0; |
524 |
|
else if (r->rdir[i] < -1e-7) |
525 |
|
sflags |= 0x10 << i; |
526 |
|
} |
527 |
< |
if (sflags == 0) |
528 |
< |
error(CONSISTENCY, "zero ray direction in localhit"); |
527 |
> |
if (!sflags) { |
528 |
> |
error(WARNING, "zero ray direction in localhit"); |
529 |
> |
return(0); |
530 |
> |
} |
531 |
|
/* start off assuming nothing hit */ |
532 |
|
if (r->rmax > FTINY) { /* except aft plane if one */ |
533 |
|
r->ro = &Aftplane; |
534 |
|
r->rot = r->rmax; |
535 |
< |
for (i = 0; i < 3; i++) |
457 |
< |
r->rop[i] = r->rorg[i] + r->rot*r->rdir[i]; |
535 |
> |
VSUM(r->rop, r->rorg, r->rdir, r->rot); |
536 |
|
} |
537 |
|
/* find global cube entrance point */ |
538 |
|
t = 0.0; |
555 |
|
if (t >= r->rot) /* clipped already */ |
556 |
|
return(0); |
557 |
|
/* advance position */ |
558 |
< |
for (i = 0; i < 3; i++) |
481 |
< |
curpos[i] += r->rdir[i]*t; |
558 |
> |
VSUM(curpos, curpos, r->rdir, t); |
559 |
|
|
560 |
|
if (!incube(scene, curpos)) /* non-intersecting ray */ |
561 |
|
return(0); |
562 |
|
} |
563 |
|
cxset[0] = 0; |
564 |
|
raymove(curpos, cxset, sflags, r, scene); |
565 |
< |
return(r->ro != NULL & r->ro != &Aftplane); |
565 |
> |
return((r->ro != NULL) & (r->ro != &Aftplane)); |
566 |
|
} |
567 |
|
|
568 |
|
|
569 |
|
static int |
570 |
< |
raymove(pos, cxs, dirf, r, cu) /* check for hit as we move */ |
571 |
< |
FVECT pos; /* current position, modified herein */ |
572 |
< |
OBJECT *cxs; /* checked objects, modified by checkhit */ |
573 |
< |
int dirf; /* direction indicators to speed tests */ |
574 |
< |
register RAY *r; |
575 |
< |
register CUBE *cu; |
570 |
> |
raymove( /* check for hit as we move */ |
571 |
> |
FVECT pos, /* current position, modified herein */ |
572 |
> |
OBJECT *cxs, /* checked objects, modified by checkhit */ |
573 |
> |
int dirf, /* direction indicators to speed tests */ |
574 |
> |
RAY *r, |
575 |
> |
CUBE *cu |
576 |
> |
) |
577 |
|
{ |
578 |
|
int ax; |
579 |
|
double dt, t; |
580 |
|
|
581 |
|
if (istree(cu->cutree)) { /* recurse on subcubes */ |
582 |
|
CUBE cukid; |
583 |
< |
register int br, sgn; |
583 |
> |
int br, sgn; |
584 |
|
|
585 |
|
cukid.cusize = cu->cusize * 0.5; /* find subcube */ |
586 |
|
VCOPY(cukid.cuorg, cu->cuorg); |
646 |
|
ax = 2; |
647 |
|
} |
648 |
|
} |
649 |
< |
pos[0] += r->rdir[0]*t; |
572 |
< |
pos[1] += r->rdir[1]*t; |
573 |
< |
pos[2] += r->rdir[2]*t; |
649 |
> |
VSUM(pos, pos, r->rdir, t); |
650 |
|
return(ax); |
651 |
|
} |
652 |
|
|
653 |
|
|
654 |
|
static int |
655 |
< |
checkhit(r, cu, cxs) /* check for hit in full cube */ |
656 |
< |
register RAY *r; |
657 |
< |
CUBE *cu; |
658 |
< |
OBJECT *cxs; |
655 |
> |
checkhit( /* check for hit in full cube */ |
656 |
> |
RAY *r, |
657 |
> |
CUBE *cu, |
658 |
> |
OBJECT *cxs |
659 |
> |
) |
660 |
|
{ |
661 |
|
OBJECT oset[MAXSET+1]; |
662 |
|
|
673 |
|
|
674 |
|
|
675 |
|
static void |
676 |
< |
checkset(os, cs) /* modify checked set and set to check */ |
677 |
< |
register OBJECT *os; /* os' = os - cs */ |
678 |
< |
register OBJECT *cs; /* cs' = cs + os */ |
676 |
> |
checkset( /* modify checked set and set to check */ |
677 |
> |
OBJECT *os, /* os' = os - cs */ |
678 |
> |
OBJECT *cs /* cs' = cs + os */ |
679 |
> |
) |
680 |
|
{ |
681 |
|
OBJECT cset[MAXCSET+MAXSET+1]; |
682 |
< |
register int i, j; |
682 |
> |
int i, j; |
683 |
|
int k; |
684 |
|
/* copy os in place, cset <- cs */ |
685 |
|
cset[0] = 0; |