101 |
|
if (ldot > FTINY && (np->specfl&(SP_REFL|SP_BADU)) == SP_REFL) { |
102 |
|
/* |
103 |
|
* Compute specular reflection coefficient using |
104 |
< |
* anisotropic gaussian distribution model. |
104 |
> |
* anisotropic Gaussian distribution model. |
105 |
|
*/ |
106 |
|
/* add source width if flat */ |
107 |
|
if (np->specfl & SP_FLAT) |
119 |
|
dtmp1 *= dtmp1 / au2; |
120 |
|
dtmp2 = DOT(np->v, h); |
121 |
|
dtmp2 *= dtmp2 / av2; |
122 |
< |
/* gaussian */ |
122 |
> |
/* new W-G-M-D model */ |
123 |
|
dtmp = DOT(np->pnorm, h); |
124 |
< |
dtmp = (dtmp1 + dtmp2) / (dtmp*dtmp); |
125 |
< |
dtmp = exp(-dtmp) / (4.0*PI * np->pdot * sqrt(au2*av2)); |
124 |
> |
dtmp *= dtmp; |
125 |
> |
dtmp1 = (dtmp1 + dtmp2) / dtmp; |
126 |
> |
dtmp = exp(-dtmp1) * DOT(h,h) / |
127 |
> |
(PI * dtmp*dtmp * sqrt(au2*av2)); |
128 |
|
/* worth using? */ |
129 |
|
if (dtmp > FTINY) { |
130 |
|
copycolor(ctmp, np->scolor); |
131 |
< |
dtmp *= omega; |
131 |
> |
dtmp *= ldot * omega; |
132 |
|
scalecolor(ctmp, dtmp); |
133 |
|
addcolor(cval, ctmp); |
134 |
|
} |
168 |
|
} |
169 |
|
} else |
170 |
|
dtmp = 0.0; |
171 |
< |
/* gaussian */ |
172 |
< |
dtmp = exp(-dtmp) / (PI * np->pdot * sqrt(au2*av2)); |
171 |
> |
/* Gaussian */ |
172 |
> |
dtmp = exp(-dtmp) * (1.0/PI) * sqrt(-ldot/(np->pdot*au2*av2)); |
173 |
|
/* worth using? */ |
174 |
|
if (dtmp > FTINY) { |
175 |
|
copycolor(ctmp, np->mcolor); |
216 |
|
nd.specfl = 0; |
217 |
|
nd.u_alpha = m->oargs.farg[4]; |
218 |
|
nd.v_alpha = m->oargs.farg[5]; |
219 |
< |
if (nd.u_alpha < FTINY || nd.v_alpha <= FTINY) |
219 |
> |
if (nd.u_alpha <= FTINY || nd.v_alpha <= FTINY) |
220 |
|
objerror(m, USER, "roughness too small"); |
221 |
|
|
222 |
|
nd.pdot = raynormal(nd.pnorm, r); /* perturb normal */ |
278 |
|
agaussamp(r, &nd); |
279 |
|
|
280 |
|
if (nd.rdiff > FTINY) { /* ambient from this side */ |
281 |
< |
ambient(ctmp, r, nd.pnorm); |
281 |
> |
copycolor(ctmp, nd.mcolor); /* modified by material color */ |
282 |
|
if (nd.specfl & SP_RBLT) |
283 |
|
scalecolor(ctmp, 1.0-nd.trans); |
284 |
|
else |
285 |
|
scalecolor(ctmp, nd.rdiff); |
286 |
< |
multcolor(ctmp, nd.mcolor); /* modified by material color */ |
286 |
> |
multambient(ctmp, r, nd.pnorm); |
287 |
|
addcolor(r->rcol, ctmp); /* add to returned color */ |
288 |
|
} |
289 |
|
if (nd.tdiff > FTINY) { /* ambient from other side */ |
293 |
|
bnorm[0] = -nd.pnorm[0]; |
294 |
|
bnorm[1] = -nd.pnorm[1]; |
295 |
|
bnorm[2] = -nd.pnorm[2]; |
296 |
< |
ambient(ctmp, r, bnorm); |
296 |
> |
copycolor(ctmp, nd.mcolor); /* modified by color */ |
297 |
|
if (nd.specfl & SP_TBLT) |
298 |
|
scalecolor(ctmp, nd.trans); |
299 |
|
else |
300 |
|
scalecolor(ctmp, nd.tdiff); |
301 |
< |
multcolor(ctmp, nd.mcolor); /* modified by color */ |
301 |
> |
multambient(ctmp, r, bnorm); |
302 |
|
addcolor(r->rcol, ctmp); |
303 |
|
flipsurface(r); |
304 |
|
} |
341 |
|
|
342 |
|
|
343 |
|
static void |
344 |
< |
agaussamp( /* sample anisotropic gaussian specular */ |
344 |
> |
agaussamp( /* sample anisotropic Gaussian specular */ |
345 |
|
RAY *r, |
346 |
|
register ANISODAT *np |
347 |
|
) |
354 |
|
register int i; |
355 |
|
/* compute reflection */ |
356 |
|
if ((np->specfl & (SP_REFL|SP_RBLT)) == SP_REFL && |
357 |
< |
rayorigin(&sr, r, SPECULAR, np->rspec) == 0) { |
357 |
> |
rayorigin(&sr, SPECULAR, r, np->scolor) == 0) { |
358 |
|
dimlist[ndims++] = (int)np->mp; |
359 |
|
for (niter = 0; niter < MAXITER; niter++) { |
360 |
|
if (niter) |
382 |
|
for (i = 0; i < 3; i++) |
383 |
|
sr.rdir[i] = r->rdir[i] + d*h[i]; |
384 |
|
if (DOT(sr.rdir, r->ron) > FTINY) { |
385 |
+ |
checknorm(sr.rdir); |
386 |
|
rayvalue(&sr); |
387 |
< |
multcolor(sr.rcol, np->scolor); |
387 |
> |
multcolor(sr.rcol, sr.rcoef); |
388 |
|
addcolor(r->rcol, sr.rcol); |
389 |
|
break; |
390 |
|
} |
392 |
|
ndims--; |
393 |
|
} |
394 |
|
/* compute transmission */ |
395 |
+ |
copycolor(sr.rcoef, np->mcolor); /* modify by material color */ |
396 |
+ |
scalecolor(sr.rcoef, np->tspec); |
397 |
|
if ((np->specfl & (SP_TRAN|SP_TBLT)) == SP_TRAN && |
398 |
< |
rayorigin(&sr, r, SPECULAR, np->tspec) == 0) { |
398 |
> |
rayorigin(&sr, SPECULAR, r, sr.rcoef) == 0) { |
399 |
|
dimlist[ndims++] = (int)np->mp; |
400 |
|
for (niter = 0; niter < MAXITER; niter++) { |
401 |
|
if (niter) |
422 |
|
if (DOT(sr.rdir, r->ron) < -FTINY) { |
423 |
|
normalize(sr.rdir); /* OK, normalize */ |
424 |
|
rayvalue(&sr); |
425 |
< |
scalecolor(sr.rcol, np->tspec); |
421 |
< |
multcolor(sr.rcol, np->mcolor); /* modify */ |
425 |
> |
multcolor(sr.rcol, sr.rcoef); |
426 |
|
addcolor(r->rcol, sr.rcol); |
427 |
|
break; |
428 |
|
} |