| 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 |
|
|
| 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, |
| 43 |
|
const RAY *ro, |
| 44 |
< |
const COLOR rc |
| 44 |
> |
const SCOLOR rc |
| 45 |
|
) |
| 46 |
|
{ |
| 47 |
|
double rw, re; |
| 48 |
|
/* assign coefficient/weight */ |
| 49 |
|
if (rc == NULL) { |
| 50 |
|
rw = 1.0; |
| 51 |
< |
setcolor(r->rcoef, 1., 1., 1.); |
| 51 |
> |
setscolor(r->rcoef, 1., 1., 1.); |
| 52 |
|
} else { |
| 53 |
< |
rw = intens(rc); |
| 53 |
> |
rw = sintens(rc); |
| 54 |
> |
if (rw > 1.0) |
| 55 |
> |
rw = 1.0; /* avoid calculation growth */ |
| 56 |
|
if (rc != r->rcoef) |
| 57 |
< |
copycolor(r->rcoef, rc); |
| 57 |
> |
copyscolor(r->rcoef, rc); |
| 58 |
|
} |
| 59 |
|
if ((r->parent = ro) == NULL) { /* primary ray */ |
| 60 |
|
r->rlvl = 0; |
| 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 |
|
} |
| 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) |
| 127 |
|
return(-1); |
| 128 |
|
rw = minweight/r->rweight; /* promote survivor */ |
| 129 |
< |
scalecolor(r->rcoef, rw); |
| 129 |
> |
scalescolor(r->rcoef, rw); |
| 130 |
|
r->rweight = minweight; |
| 131 |
|
return(0); |
| 132 |
|
} |
| 133 |
< |
return(r->rlvl <= abs(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->rcol, 0.0, 0.0, 0.0); |
| 155 |
> |
setscolor(r->pcol, 1.0, 1.0, 1.0); |
| 156 |
> |
scolorblack(r->mcol); |
| 157 |
> |
scolorblack(r->rcol); |
| 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 |
> |
copyscolor(r->mcol, tr.mcol); |
| 203 |
> |
copyscolor(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 |
> |
setscolor(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))) { |
| 214 |
< |
if (irr_ignore(m->otype)) { |
| 215 |
< |
raytrans(r); |
| 216 |
< |
return(1); |
| 217 |
< |
} |
| 218 |
< |
if (!islight(m->otype)) |
| 219 |
< |
m = &Lamb; |
| 220 |
< |
} |
| 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; |
| 263 |
> |
SCOLOR ce, ca; |
| 264 |
|
double re, ge, be; |
| 265 |
|
|
| 266 |
|
if (intens(r->cext) <= 1./FHUGE) |
| 273 |
|
ge *= 1. - colval(r->albedo,GRN); |
| 274 |
|
be *= 1. - colval(r->albedo,BLU); |
| 275 |
|
} |
| 276 |
< |
setcolor(ce, re<=FTINY ? 1. : re>92. ? 0. : exp(-re), |
| 276 |
> |
setscolor(ce, re<=FTINY ? 1. : re>92. ? 0. : exp(-re), |
| 277 |
|
ge<=FTINY ? 1. : ge>92. ? 0. : exp(-ge), |
| 278 |
|
be<=FTINY ? 1. : be>92. ? 0. : exp(-be)); |
| 279 |
< |
multcolor(r->rcol, ce); /* path extinction */ |
| 279 |
> |
smultscolor(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 |
> |
setscolor(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 |
> |
saddscolor(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; |
| 341 |
|
fr = *r; |
| 342 |
|
if (coef > FTINY) { |
| 343 |
|
fr.rweight *= coef; |
| 344 |
< |
scalecolor(fr.rcoef, coef); |
| 344 |
> |
scalescolor(fr.rcoef, coef); |
| 345 |
|
foremat = rayshade(&fr, fore); |
| 346 |
|
} |
| 347 |
|
/* background */ |
| 348 |
|
br = *r; |
| 349 |
|
if (coef < 1.0-FTINY) { |
| 350 |
|
br.rweight *= 1.0-coef; |
| 351 |
< |
scalecolor(br.rcoef, 1.0-coef); |
| 351 |
> |
scalescolor(br.rcoef, 1.0-coef); |
| 352 |
|
backmat = rayshade(&br, back); |
| 353 |
|
} |
| 354 |
|
/* check for transparency */ |
| 362 |
|
for (i = 0; i < 3; i++) |
| 363 |
|
r->pert[i] = coef*fr.pert[i] + (1.0-coef)*br.pert[i]; |
| 364 |
|
/* mix pattern colors */ |
| 365 |
< |
scalecolor(fr.pcol, coef); |
| 366 |
< |
scalecolor(br.pcol, 1.0-coef); |
| 367 |
< |
copycolor(r->pcol, fr.pcol); |
| 368 |
< |
addcolor(r->pcol, br.pcol); |
| 365 |
> |
scalescolor(fr.pcol, coef); |
| 366 |
> |
scalescolor(br.pcol, 1.0-coef); |
| 367 |
> |
copyscolor(r->pcol, fr.pcol); |
| 368 |
> |
saddscolor(r->pcol, br.pcol); |
| 369 |
|
/* return value tells if material */ |
| 370 |
|
if (!foremat & !backmat) |
| 371 |
|
return(0); |
| 372 |
|
/* mix returned ray values */ |
| 373 |
< |
scalecolor(fr.rcol, coef); |
| 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; |
| 373 |
> |
scalescolor(fr.rcol, coef); |
| 374 |
> |
scalescolor(br.rcol, 1.0-coef); |
| 375 |
> |
copyscolor(r->rcol, fr.rcol); |
| 376 |
> |
saddscolor(r->rcol, br.rcol); |
| 377 |
> |
scalescolor(fr.mcol, coef); |
| 378 |
> |
scalescolor(br.mcol, 1.0-coef); |
| 379 |
> |
copyscolor(r->mcol, fr.mcol); |
| 380 |
> |
saddscolor(r->mcol, br.mcol); |
| 381 |
> |
mfore = pbright(fr.mcol); mback = pbright(br.mcol); |
| 382 |
> |
r->rmt = mfore > mback ? fr.rmt : br.rmt; |
| 383 |
> |
r->rxt = pbright(fr.rcol)-mfore > pbright(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 |
< |
RREAL rc[3], |
| 407 |
> |
SCOLOR rc, |
| 408 |
|
const RAY *r, |
| 409 |
|
int flags |
| 410 |
|
) |
| 411 |
|
{ |
| 412 |
< |
double eext[3]; |
| 370 |
< |
int i; |
| 412 |
> |
static int warnedPM = 0; |
| 413 |
|
|
| 414 |
< |
eext[0] = eext[1] = eext[2] = 0.; |
| 373 |
< |
rc[0] = rc[1] = rc[2] = 1.; |
| 414 |
> |
setscolor(rc, 1., 1., 1.); |
| 415 |
|
|
| 416 |
|
while (r != NULL && r->crtype&flags) { |
| 417 |
< |
for (i = 3; i--; ) { |
| 418 |
< |
rc[i] *= colval(r->rcoef,i); |
| 419 |
< |
eext[i] += r->rot * colval(r->cext,i); |
| 417 |
> |
smultscolor(rc, r->rcoef); |
| 418 |
> |
/* check for participating medium */ |
| 419 |
> |
if (!warnedPM && (bright(r->cext) > FTINY) | |
| 420 |
> |
(bright(r->albedo) > FTINY)) { |
| 421 |
> |
error(WARNING, |
| 422 |
> |
"ray contribution calculation does not support participating media"); |
| 423 |
> |
warnedPM++; |
| 424 |
|
} |
| 425 |
|
r = r->parent; |
| 426 |
|
} |
| 382 |
– |
for (i = 3; i--; ) |
| 383 |
– |
rc[i] *= (eext[i] <= FTINY) ? 1. : |
| 384 |
– |
(eext[i] > 92.) ? 0. : exp(-eext[i]); |
| 427 |
|
} |
| 428 |
|
|
| 429 |
|
|
| 430 |
< |
extern double |
| 430 |
> |
double |
| 431 |
|
raynormal( /* compute perturbed normal for ray */ |
| 432 |
|
FVECT norm, |
| 433 |
< |
register RAY *r |
| 433 |
> |
RAY *r |
| 434 |
|
) |
| 435 |
|
{ |
| 436 |
|
double newdot; |
| 437 |
< |
register int i; |
| 437 |
> |
int i; |
| 438 |
|
|
| 439 |
|
/* The perturbation is added to the surface normal to obtain |
| 440 |
|
* the new normal. If the new normal would affect the surface |
| 463 |
|
} |
| 464 |
|
|
| 465 |
|
|
| 466 |
< |
extern void |
| 466 |
> |
void |
| 467 |
|
newrayxf( /* get new tranformation matrix for ray */ |
| 468 |
|
RAY *r |
| 469 |
|
) |
| 472 |
|
struct xfn *next; |
| 473 |
|
FULLXF xf; |
| 474 |
|
} xfseed = { &xfseed }, *xflast = &xfseed; |
| 475 |
< |
register struct xfn *xp; |
| 476 |
< |
register const RAY *rp; |
| 475 |
> |
struct xfn *xp; |
| 476 |
> |
const RAY *rp; |
| 477 |
|
|
| 478 |
|
/* |
| 479 |
|
* Search for transform in circular list that |
| 484 |
|
if (rp->rox == &xp->xf) { /* xp in use */ |
| 485 |
|
xp = xp->next; /* move to next */ |
| 486 |
|
if (xp == xflast) { /* need new one */ |
| 487 |
< |
xp = (struct xfn *)malloc(sizeof(struct xfn)); |
| 487 |
> |
xp = (struct xfn *)bmalloc(sizeof(struct xfn)); |
| 488 |
|
if (xp == NULL) |
| 489 |
|
error(SYSTEM, |
| 490 |
|
"out of memory in newrayxf"); |
| 501 |
|
} |
| 502 |
|
|
| 503 |
|
|
| 504 |
< |
extern void |
| 504 |
> |
void |
| 505 |
|
flipsurface( /* reverse surface orientation */ |
| 506 |
< |
register RAY *r |
| 506 |
> |
RAY *r |
| 507 |
|
) |
| 508 |
|
{ |
| 509 |
|
r->rod = -r->rod; |
| 513 |
|
r->pert[0] = -r->pert[0]; |
| 514 |
|
r->pert[1] = -r->pert[1]; |
| 515 |
|
r->pert[2] = -r->pert[2]; |
| 516 |
+ |
r->rflips++; |
| 517 |
|
} |
| 518 |
|
|
| 519 |
|
|
| 520 |
< |
extern void |
| 520 |
> |
int |
| 521 |
> |
rayreject( /* check if candidate hit is worse than current */ |
| 522 |
> |
OBJREC *o, |
| 523 |
> |
RAY *r, |
| 524 |
> |
double t, |
| 525 |
> |
double rod |
| 526 |
> |
) |
| 527 |
> |
{ |
| 528 |
> |
OBJREC *mnew, *mray; |
| 529 |
> |
|
| 530 |
> |
if ((t <= FTINY) | (t > r->rot + FTINY)) |
| 531 |
> |
return(1); |
| 532 |
> |
if (t < r->rot - FTINY) /* is new hit significantly closer? */ |
| 533 |
> |
return(0); |
| 534 |
> |
/* coincident point, so decide... */ |
| 535 |
> |
if (o == r->ro) |
| 536 |
> |
return(1); /* shouldn't happen */ |
| 537 |
> |
if (r->ro == NULL) |
| 538 |
> |
return(0); /* ditto */ |
| 539 |
> |
mnew = findmaterial(o); |
| 540 |
> |
mray = findmaterial(r->ro); /* check material transparencies */ |
| 541 |
> |
if (mnew == NULL) { |
| 542 |
> |
if (mray != NULL) |
| 543 |
> |
return(1); /* old has material, new does not */ |
| 544 |
> |
} else if (mray == NULL) { |
| 545 |
> |
return(0); /* new has material, old does not */ |
| 546 |
> |
} else if (istransp(mnew->otype)) { |
| 547 |
> |
if (!istransp(mray->otype)) |
| 548 |
> |
return(1); /* new is transparent, old is not */ |
| 549 |
> |
} else if (istransp(mray->otype)) { |
| 550 |
> |
return(0); /* old is transparent, new is not */ |
| 551 |
> |
} |
| 552 |
> |
if (rod <= 0) { /* check which side we hit */ |
| 553 |
> |
if (r->rod > 0) |
| 554 |
> |
return(1); /* old hit front, new did not */ |
| 555 |
> |
} else if (r->rod <= 0) { |
| 556 |
> |
return(0); /* new hit front, old did not */ |
| 557 |
> |
} |
| 558 |
> |
/* earlier modifier definition wins tie */ |
| 559 |
> |
return (r->ro->omod >= o->omod); |
| 560 |
> |
} |
| 561 |
> |
|
| 562 |
> |
void |
| 563 |
|
rayhit( /* standard ray hit test */ |
| 564 |
|
OBJECT *oset, |
| 565 |
|
RAY *r |
| 576 |
|
} |
| 577 |
|
|
| 578 |
|
|
| 579 |
< |
extern int |
| 579 |
> |
int |
| 580 |
|
localhit( /* check for hit in the octree */ |
| 581 |
< |
register RAY *r, |
| 582 |
< |
register CUBE *scene |
| 581 |
> |
RAY *r, |
| 582 |
> |
CUBE *scene |
| 583 |
|
) |
| 584 |
|
{ |
| 585 |
|
OBJECT cxset[MAXCSET+1]; /* set of checked objects */ |
| 586 |
|
FVECT curpos; /* current cube position */ |
| 587 |
|
int sflags; /* sign flags */ |
| 588 |
|
double t, dt; |
| 589 |
< |
register int i; |
| 589 |
> |
int i; |
| 590 |
|
|
| 591 |
|
nrays++; /* increment trace counter */ |
| 592 |
|
sflags = 0; |
| 644 |
|
FVECT pos, /* current position, modified herein */ |
| 645 |
|
OBJECT *cxs, /* checked objects, modified by checkhit */ |
| 646 |
|
int dirf, /* direction indicators to speed tests */ |
| 647 |
< |
register RAY *r, |
| 648 |
< |
register CUBE *cu |
| 647 |
> |
RAY *r, |
| 648 |
> |
CUBE *cu |
| 649 |
|
) |
| 650 |
|
{ |
| 651 |
|
int ax; |
| 653 |
|
|
| 654 |
|
if (istree(cu->cutree)) { /* recurse on subcubes */ |
| 655 |
|
CUBE cukid; |
| 656 |
< |
register int br, sgn; |
| 656 |
> |
int br, sgn; |
| 657 |
|
|
| 658 |
|
cukid.cusize = cu->cusize * 0.5; /* find subcube */ |
| 659 |
|
VCOPY(cukid.cuorg, cu->cuorg); |
| 726 |
|
|
| 727 |
|
static int |
| 728 |
|
checkhit( /* check for hit in full cube */ |
| 729 |
< |
register RAY *r, |
| 729 |
> |
RAY *r, |
| 730 |
|
CUBE *cu, |
| 731 |
|
OBJECT *cxs |
| 732 |
|
) |
| 747 |
|
|
| 748 |
|
static void |
| 749 |
|
checkset( /* modify checked set and set to check */ |
| 750 |
< |
register OBJECT *os, /* os' = os - cs */ |
| 751 |
< |
register OBJECT *cs /* cs' = cs + os */ |
| 750 |
> |
OBJECT *os, /* os' = os - cs */ |
| 751 |
> |
OBJECT *cs /* cs' = cs + os */ |
| 752 |
|
) |
| 753 |
|
{ |
| 754 |
|
OBJECT cset[MAXCSET+MAXSET+1]; |
| 755 |
< |
register int i, j; |
| 755 |
> |
int i, j; |
| 756 |
|
int k; |
| 757 |
|
/* copy os in place, cset <- cs */ |
| 758 |
|
cset[0] = 0; |
