| 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 |
|
|
| 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->rmt = r->rot + tr.rmt; |
| 201 |
|
r->rxt = r->rot + tr.rxt; |
| 208 |
|
RAY *r |
| 209 |
|
) |
| 210 |
|
{ |
| 211 |
< |
if ((ofun[m->otype].flags & (T_M|T_X)) && m->otype != MAT_CLIP) { |
| 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); |
| 368 |
|
scalecolor(br.rcol, 1.0-coef); |
| 369 |
|
copycolor(r->rcol, fr.rcol); |
| 370 |
|
addcolor(r->rcol, br.rcol); |
| 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 ? |
| 403 |
|
int flags |
| 404 |
|
) |
| 405 |
|
{ |
| 406 |
< |
double eext[3]; |
| 402 |
< |
int i; |
| 406 |
> |
static int warnedPM = 0; |
| 407 |
|
|
| 404 |
– |
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 |
|
} |
| 414 |
– |
for (i = 3; i--; ) |
| 415 |
– |
rc[i] *= (eext[i] <= FTINY) ? 1. : |
| 416 |
– |
(eext[i] > 92.) ? 0. : exp(-eext[i]); |
| 423 |
|
} |
| 424 |
|
|
| 425 |
|
|
