| 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 |
|
|
| 196 |
|
VCOPY(tr.rdir, r->rdir); |
| 197 |
|
rayvalue(&tr); |
| 198 |
|
copycolor(r->rcol, tr.rcol); |
| 199 |
< |
r->rt = r->rot + tr.rt; |
| 199 |
> |
r->rmt = r->rot + tr.rmt; |
| 200 |
> |
r->rxt = r->rot + tr.rxt; |
| 201 |
|
} |
| 202 |
|
|
| 203 |
|
|
| 204 |
< |
/* Macro for test to see if BSDF material uses proxy */ |
| 205 |
< |
#define isBSDFproxy(m) ((m)->otype == MAT_BSDF && (m)->oargs.nsargs && \ |
| 206 |
< |
strcmp((m)->oargs.sarg[0], "0")) |
| 204 |
> |
int |
| 205 |
> |
raytirrad( /* irradiance hack */ |
| 206 |
> |
OBJREC *m, |
| 207 |
> |
RAY *r |
| 208 |
> |
) |
| 209 |
> |
{ |
| 210 |
> |
if ((ofun[m->otype].flags & (T_M|T_X)) && m->otype != MAT_CLIP) { |
| 211 |
> |
if (istransp(m->otype) || isBSDFproxy(m)) { |
| 212 |
> |
raytrans(r); |
| 213 |
> |
return(1); |
| 214 |
> |
} |
| 215 |
> |
if (!islight(m->otype)) |
| 216 |
> |
return((*ofun[Lamb.otype].funp)(&Lamb, r)); |
| 217 |
> |
} |
| 218 |
> |
return(0); /* not a qualifying surface */ |
| 219 |
> |
} |
| 220 |
|
|
| 221 |
|
|
| 222 |
|
int |
| 225 |
|
int mod |
| 226 |
|
) |
| 227 |
|
{ |
| 228 |
+ |
int tst_irrad = do_irrad && !(r->crtype & ~(PRIMARY|TRANS)); |
| 229 |
|
OBJREC *m; |
| 230 |
|
|
| 231 |
< |
r->rt = r->rot; /* preset effective ray length */ |
| 231 |
> |
r->rxt = r->rmt = r->rot; /* preset effective ray length */ |
| 232 |
|
for ( ; mod != OVOID; mod = m->omod) { |
| 233 |
|
m = objptr(mod); |
| 234 |
|
/****** unnecessary test since modifier() is always called |
| 238 |
|
} |
| 239 |
|
******/ |
| 240 |
|
/* hack for irradiance calculation */ |
| 241 |
< |
if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS)) && |
| 242 |
< |
(ofun[m->otype].flags & (T_M|T_X)) && |
| 243 |
< |
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 |
< |
} |
| 241 |
> |
if (tst_irrad && raytirrad(m, r)) |
| 242 |
> |
return(1); |
| 243 |
> |
|
| 244 |
|
if ((*ofun[m->otype].funp)(m, r)) |
| 245 |
|
return(1); /* materials call raytexture() */ |
| 246 |
|
} |
| 320 |
|
) |
| 321 |
|
{ |
| 322 |
|
RAY fr, br; |
| 323 |
+ |
double mfore, mback; |
| 324 |
|
int foremat, backmat; |
| 325 |
|
int i; |
| 326 |
|
/* bound coefficient */ |
| 367 |
|
scalecolor(br.rcol, 1.0-coef); |
| 368 |
|
copycolor(r->rcol, fr.rcol); |
| 369 |
|
addcolor(r->rcol, br.rcol); |
| 370 |
< |
r->rt = bright(fr.rcol) > bright(br.rcol) ? fr.rt : br.rt; |
| 370 |
> |
mfore = bright(fr.mcol); mback = bright(br.mcol); |
| 371 |
> |
r->rmt = mfore > mback ? fr.rmt : br.rmt; |
| 372 |
> |
r->rxt = bright(fr.rcol)-mfore > bright(br.rcol)-mback ? |
| 373 |
> |
fr.rxt : br.rxt; |
| 374 |
|
return(1); |
| 375 |
|
} |
| 376 |
|
|
