112 |
|
scalecolor(ctmp, dtmp); |
113 |
|
addcolor(cval, ctmp); |
114 |
|
} |
115 |
< |
|
115 |
> |
|
116 |
|
if (ldot < -FTINY && ltdiff > FTINY) { |
117 |
|
/* |
118 |
|
* Compute diffuse transmission. |
122 |
|
scalecolor(ctmp, dtmp); |
123 |
|
addcolor(cval, ctmp); |
124 |
|
} |
125 |
< |
|
125 |
> |
|
126 |
> |
if (ambRayInPmap(np->rp)) |
127 |
> |
return; /* specular already in photon map */ |
128 |
> |
|
129 |
|
if (ldot > FTINY && (np->specfl&(SP_REFL|SP_PURE)) == SP_REFL) { |
130 |
|
/* |
131 |
|
* Compute specular reflection coefficient using |
182 |
|
{ |
183 |
|
NORMDAT nd; |
184 |
|
double fest; |
182 |
– |
double transtest, transdist; |
183 |
– |
double mirtest, mirdist; |
185 |
|
int hastexture; |
186 |
|
double d; |
187 |
|
COLOR ctmp; |
188 |
|
int i; |
189 |
|
|
190 |
|
/* PMAP: skip transmitted shadow ray if accounted for in photon map */ |
191 |
< |
if (shadowRayInPmap(r)) |
192 |
< |
return(1); |
191 |
> |
/* No longer needed? |
192 |
> |
if (shadowRayInPmap(r) || ambRayInPmap(r)) |
193 |
> |
return(1); */ |
194 |
> |
|
195 |
|
/* easy shadow test */ |
196 |
|
if (r->crtype & SHADOW && m->otype != MAT_TRANS) |
197 |
|
return(1); |
231 |
|
if (nd.pdot < .001) |
232 |
|
nd.pdot = .001; /* non-zero for dirnorm() */ |
233 |
|
multcolor(nd.mcolor, r->pcol); /* modify material color */ |
231 |
– |
mirtest = transtest = 0; |
232 |
– |
mirdist = transdist = r->rot; |
234 |
|
nd.rspec = m->oargs.farg[3]; |
235 |
|
/* compute Fresnel approx. */ |
236 |
|
if (nd.specfl & SP_PURE && nd.rspec >= FRESTHRESH) { |
251 |
|
nd.specfl |= SP_TBLT; |
252 |
|
if (!hastexture || r->crtype & (SHADOW|AMBIENT)) { |
253 |
|
VCOPY(nd.prdir, r->rdir); |
253 |
– |
transtest = 2; |
254 |
|
} else { |
255 |
< |
for (i = 0; i < 3; i++) /* perturb */ |
256 |
< |
nd.prdir[i] = r->rdir[i] - r->pert[i]; |
255 |
> |
/* perturb */ |
256 |
> |
VSUB(nd.prdir, r->rdir, r->pert); |
257 |
|
if (DOT(nd.prdir, r->ron) < -FTINY) |
258 |
|
normalize(nd.prdir); /* OK */ |
259 |
|
else |
273 |
|
rayvalue(&lr); |
274 |
|
multcolor(lr.rcol, lr.rcoef); |
275 |
|
addcolor(r->rcol, lr.rcol); |
276 |
< |
transtest *= bright(lr.rcol); |
277 |
< |
transdist = r->rot + lr.rt; |
276 |
> |
r->rxt = r->rot + raydistance(&lr); |
277 |
|
} |
278 |
< |
} else |
280 |
< |
transtest = 0; |
278 |
> |
} |
279 |
|
|
280 |
< |
if (r->crtype & SHADOW) { /* the rest is shadow */ |
283 |
< |
r->rt = transdist; |
280 |
> |
if (r->crtype & SHADOW) /* the rest is shadow */ |
281 |
|
return(1); |
285 |
– |
} |
282 |
|
/* get specular reflection */ |
283 |
|
if (nd.rspec > FTINY) { |
284 |
|
nd.specfl |= SP_REFL; |
311 |
|
VCOPY(lr.rdir, nd.vrefl); |
312 |
|
rayvalue(&lr); |
313 |
|
multcolor(lr.rcol, lr.rcoef); |
314 |
+ |
copycolor(r->mcol, lr.rcol); |
315 |
|
addcolor(r->rcol, lr.rcol); |
316 |
|
if (nd.specfl & SP_FLAT && |
317 |
< |
!hastexture | (r->crtype & AMBIENT)) { |
318 |
< |
mirtest = 2.*bright(lr.rcol); |
322 |
< |
mirdist = r->rot + lr.rt; |
323 |
< |
} |
317 |
> |
!hastexture | (r->crtype & AMBIENT)) |
318 |
> |
r->rmt = r->rot + raydistance(&lr); |
319 |
|
} |
320 |
|
} |
321 |
|
/* diffuse reflection */ |
355 |
|
} |
356 |
|
/* add direct component */ |
357 |
|
direct(r, dirnorm, &nd); |
363 |
– |
/* check distance */ |
364 |
– |
d = bright(r->rcol); |
365 |
– |
if (transtest > d) |
366 |
– |
r->rt = transdist; |
367 |
– |
else if (mirtest > d) |
368 |
– |
r->rt = mirdist; |
358 |
|
|
359 |
|
return(1); |
360 |
|
} |