| 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 |
|
} |
| 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 |
|
r->pert[0] = r->pert[1] = r->pert[2] = 0.0; |
| 150 |
|
r->uv[0] = r->uv[1] = 0.0; |
| 151 |
|
setcolor(r->pcol, 1.0, 1.0, 1.0); |
| 152 |
+ |
setcolor(r->mcol, 0.0, 0.0, 0.0); |
| 153 |
|
setcolor(r->rcol, 0.0, 0.0, 0.0); |
| 154 |
|
} |
| 155 |
|
|
| 195 |
|
rayorigin(&tr, TRANS, r, NULL); /* always continue */ |
| 196 |
|
VCOPY(tr.rdir, r->rdir); |
| 197 |
|
rayvalue(&tr); |
| 198 |
+ |
copycolor(r->mcol, tr.mcol); |
| 199 |
|
copycolor(r->rcol, tr.rcol); |
| 200 |
< |
r->rt = r->rot + tr.rt; |
| 200 |
> |
r->rmt = r->rot + tr.rmt; |
| 201 |
> |
r->rxt = r->rot + tr.rxt; |
| 202 |
|
} |
| 203 |
|
|
| 204 |
|
|
| 205 |
|
int |
| 206 |
+ |
raytirrad( /* irradiance hack */ |
| 207 |
+ |
OBJREC *m, |
| 208 |
+ |
RAY *r |
| 209 |
+ |
) |
| 210 |
+ |
{ |
| 211 |
+ |
if (ofun[m->otype].flags & (T_M|T_X) && m->otype != MAT_CLIP) { |
| 212 |
+ |
if (istransp(m->otype) || isBSDFproxy(m)) { |
| 213 |
+ |
raytrans(r); |
| 214 |
+ |
return(1); |
| 215 |
+ |
} |
| 216 |
+ |
if (!islight(m->otype)) |
| 217 |
+ |
return((*ofun[Lamb.otype].funp)(&Lamb, r)); |
| 218 |
+ |
} |
| 219 |
+ |
return(0); /* not a qualifying surface */ |
| 220 |
+ |
} |
| 221 |
+ |
|
| 222 |
+ |
|
| 223 |
+ |
int |
| 224 |
|
rayshade( /* shade ray r with material mod */ |
| 225 |
|
RAY *r, |
| 226 |
|
int mod |
| 227 |
|
) |
| 228 |
|
{ |
| 229 |
+ |
int tst_irrad = do_irrad && !(r->crtype & ~(PRIMARY|TRANS)); |
| 230 |
|
OBJREC *m; |
| 231 |
|
|
| 232 |
< |
r->rt = r->rot; /* set effective ray length */ |
| 232 |
> |
r->rxt = r->rot; /* preset effective ray length */ |
| 233 |
|
for ( ; mod != OVOID; mod = m->omod) { |
| 234 |
|
m = objptr(mod); |
| 235 |
|
/****** unnecessary test since modifier() is always called |
| 239 |
|
} |
| 240 |
|
******/ |
| 241 |
|
/* hack for irradiance calculation */ |
| 242 |
< |
if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS)) && |
| 243 |
< |
m->otype != MAT_CLIP && |
| 244 |
< |
(ofun[m->otype].flags & (T_M|T_X))) { |
| 221 |
< |
if (irr_ignore(m->otype)) { |
| 222 |
< |
raytrans(r); |
| 223 |
< |
return(1); |
| 224 |
< |
} |
| 225 |
< |
if (!islight(m->otype)) |
| 226 |
< |
m = &Lamb; |
| 227 |
< |
} |
| 242 |
> |
if (tst_irrad && raytirrad(m, r)) |
| 243 |
> |
return(1); |
| 244 |
> |
|
| 245 |
|
if ((*ofun[m->otype].funp)(m, r)) |
| 246 |
|
return(1); /* materials call raytexture() */ |
| 247 |
|
} |
| 321 |
|
) |
| 322 |
|
{ |
| 323 |
|
RAY fr, br; |
| 324 |
+ |
double mfore, mback; |
| 325 |
|
int foremat, backmat; |
| 326 |
|
int i; |
| 327 |
|
/* bound coefficient */ |
| 368 |
|
scalecolor(br.rcol, 1.0-coef); |
| 369 |
|
copycolor(r->rcol, fr.rcol); |
| 370 |
|
addcolor(r->rcol, br.rcol); |
| 371 |
< |
r->rt = bright(fr.rcol) > bright(br.rcol) ? fr.rt : br.rt; |
| 371 |
> |
scalecolor(fr.mcol, coef); |
| 372 |
> |
scalecolor(br.mcol, 1.0-coef); |
| 373 |
> |
copycolor(r->mcol, fr.mcol); |
| 374 |
> |
addcolor(r->mcol, br.mcol); |
| 375 |
> |
mfore = bright(fr.mcol); mback = bright(br.mcol); |
| 376 |
> |
r->rmt = mfore > mback ? fr.rmt : br.rmt; |
| 377 |
> |
r->rxt = bright(fr.rcol)-mfore > bright(br.rcol)-mback ? |
| 378 |
> |
fr.rxt : br.rxt; |
| 379 |
|
return(1); |
| 380 |
|
} |
| 381 |
|
|
| 403 |
|
int flags |
| 404 |
|
) |
| 405 |
|
{ |
| 406 |
< |
double eext[3]; |
| 382 |
< |
int i; |
| 406 |
> |
static int warnedPM = 0; |
| 407 |
|
|
| 384 |
– |
eext[0] = eext[1] = eext[2] = 0.; |
| 408 |
|
rc[0] = rc[1] = rc[2] = 1.; |
| 409 |
|
|
| 410 |
|
while (r != NULL && r->crtype&flags) { |
| 411 |
< |
for (i = 3; i--; ) { |
| 411 |
> |
int i = 3; |
| 412 |
> |
while (i--) |
| 413 |
|
rc[i] *= colval(r->rcoef,i); |
| 414 |
< |
eext[i] += r->rot * colval(r->cext,i); |
| 414 |
> |
/* check for participating medium */ |
| 415 |
> |
if (!warnedPM && (bright(r->cext) > FTINY) | |
| 416 |
> |
(bright(r->albedo) > FTINY)) { |
| 417 |
> |
error(WARNING, |
| 418 |
> |
"ray contribution calculation does not support participating media"); |
| 419 |
> |
warnedPM++; |
| 420 |
|
} |
| 421 |
|
r = r->parent; |
| 422 |
|
} |
| 394 |
– |
for (i = 3; i--; ) |
| 395 |
– |
rc[i] *= (eext[i] <= FTINY) ? 1. : |
| 396 |
– |
(eext[i] > 92.) ? 0. : exp(-eext[i]); |
| 423 |
|
} |
| 424 |
|
|
| 425 |
|
|
