| 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 |
|
} |
| 116 |
|
if (photonMapping && rt != TRANS) |
| 117 |
|
return(-1); |
| 118 |
|
} |
| 119 |
< |
if (maxdepth <= 0 && rc != NULL) { /* Russian roulette */ |
| 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); |
| 130 |
|
r->rweight = minweight; |
| 131 |
|
return(0); |
| 132 |
|
} |
| 133 |
< |
return(r->rweight >= minweight && r->rlvl <= abs(maxdepth) ? 0 : -1); |
| 133 |
> |
return((r->rweight >= minweight) & (r->rlvl <= abs(maxdepth)) ? 0 : -1); |
| 134 |
|
} |
| 135 |
|
|
| 136 |
|
|
| 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 |
|
|
| 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->rt = r->rot + tr.rt; |
| 204 |
> |
r->rmt = r->rot + tr.rmt; |
| 205 |
> |
r->rxt = r->rot + tr.rxt; |
| 206 |
|
} |
| 207 |
|
|
| 208 |
|
|
| 209 |
< |
/* Macro for test to see if BSDF material uses proxy */ |
| 210 |
< |
#define isBSDFproxy(m) ((m)->otype == MAT_BSDF && (m)->oargs.nsargs && \ |
| 211 |
< |
strcmp((m)->oargs.sarg[0], "0")) |
| 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 |
|
int |
| 232 |
|
int mod |
| 233 |
|
) |
| 234 |
|
{ |
| 235 |
+ |
int tst_irrad = do_irrad && !(r->crtype & ~(PRIMARY|TRANS)); |
| 236 |
|
OBJREC *m; |
| 237 |
|
|
| 238 |
< |
r->rt = r->rot; /* preset 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 |
< |
(ofun[m->otype].flags & (T_M|T_X)) && |
| 250 |
< |
m->otype != MAT_CLIP && |
| 228 |
< |
!isBSDFproxy(m)) { |
| 229 |
< |
if (irr_ignore(m->otype)) { |
| 230 |
< |
raytrans(r); |
| 231 |
< |
return(1); |
| 232 |
< |
} |
| 233 |
< |
if (!islight(m->otype)) |
| 234 |
< |
m = &Lamb; |
| 235 |
< |
} |
| 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 |
|
} |
| 327 |
|
) |
| 328 |
|
{ |
| 329 |
|
RAY fr, br; |
| 330 |
+ |
double mfore, mback; |
| 331 |
|
int foremat, backmat; |
| 332 |
|
int i; |
| 333 |
|
/* bound coefficient */ |
| 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 |
|
|
| 409 |
|
int flags |
| 410 |
|
) |
| 411 |
|
{ |
| 412 |
< |
double eext[3]; |
| 390 |
< |
int i; |
| 412 |
> |
static int warnedPM = 0; |
| 413 |
|
|
| 392 |
– |
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 |
|
} |
| 402 |
– |
for (i = 3; i--; ) |
| 403 |
– |
rc[i] *= (eext[i] <= FTINY) ? 1. : |
| 404 |
– |
(eext[i] > 92.) ? 0. : exp(-eext[i]); |
| 429 |
|
} |
| 430 |
|
|
| 431 |
|
|
| 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 |
+ |
int |
| 523 |
+ |
rayreject( /* check if candidate hit is worse than current */ |
| 524 |
+ |
OBJREC *o, |
| 525 |
+ |
RAY *r, |
| 526 |
+ |
double t, |
| 527 |
+ |
double rod |
| 528 |
+ |
) |
| 529 |
+ |
{ |
| 530 |
+ |
OBJREC *mnew, *mray; |
| 531 |
+ |
|
| 532 |
+ |
if ((t <= FTINY) | (t > r->rot + FTINY)) |
| 533 |
+ |
return(1); |
| 534 |
+ |
if (t < r->rot - FTINY) /* is new hit significantly closer? */ |
| 535 |
+ |
return(0); |
| 536 |
+ |
/* coincident point, so decide... */ |
| 537 |
+ |
if (o == r->ro) |
| 538 |
+ |
return(1); /* shouldn't happen */ |
| 539 |
+ |
if (r->ro == NULL) |
| 540 |
+ |
return(0); /* ditto */ |
| 541 |
+ |
mnew = findmaterial(o); |
| 542 |
+ |
mray = findmaterial(r->ro); /* check material transparencies */ |
| 543 |
+ |
if (mnew == NULL) { |
| 544 |
+ |
if (mray != NULL) |
| 545 |
+ |
return(1); /* old has material, new does not */ |
| 546 |
+ |
} else if (mray == NULL) { |
| 547 |
+ |
return(0); /* new has material, old does not */ |
| 548 |
+ |
} else if (istransp(mnew->otype)) { |
| 549 |
+ |
if (!istransp(mray->otype)) |
| 550 |
+ |
return(1); /* new is transparent, old is not */ |
| 551 |
+ |
} else if (istransp(mray->otype)) { |
| 552 |
+ |
return(0); /* old is transparent, new is not */ |
| 553 |
+ |
} |
| 554 |
+ |
if (rod <= 0) { /* check which side we hit */ |
| 555 |
+ |
if (r->rod > 0) |
| 556 |
+ |
return(1); /* old hit front, new did not */ |
| 557 |
+ |
} else if (r->rod <= 0) { |
| 558 |
+ |
return(0); /* new hit front, old did not */ |
| 559 |
+ |
} |
| 560 |
+ |
/* earlier modifier definition wins tie */ |
| 561 |
+ |
return (r->ro->omod >= o->omod); |
| 562 |
+ |
} |
| 563 |
|
|
| 564 |
|
void |
| 565 |
|
rayhit( /* standard ray hit test */ |
