53 |
|
FVECT vrefl; /* vector in reflected direction */ |
54 |
|
FVECT prdir; /* vector in transmitted direction */ |
55 |
|
FVECT u, v; /* u and v vectors orienting anisotropy */ |
56 |
< |
double u_alpha2; /* u roughness squared */ |
57 |
< |
double v_alpha2; /* v roughness squared */ |
56 |
> |
double u_alpha; /* u roughness */ |
57 |
> |
double v_alpha; /* v roughness */ |
58 |
|
double rdiff, rspec; /* reflected specular, diffuse */ |
59 |
|
double trans; /* transmissivity */ |
60 |
|
double tdiff, tspec; /* transmitted specular, diffuse */ |
103 |
|
au2 = av2 = omega/(4.0*PI); |
104 |
|
else |
105 |
|
au2 = av2 = 0.0; |
106 |
< |
au2 += np->u_alpha2; |
107 |
< |
av2 += np->v_alpha2; |
106 |
> |
au2 += np->u_alpha*np->u_alpha; |
107 |
> |
av2 += np->v_alpha*np->v_alpha; |
108 |
|
/* half vector */ |
109 |
|
h[0] = ldir[0] - np->rp->rdir[0]; |
110 |
|
h[1] = ldir[1] - np->rp->rdir[1]; |
143 |
|
*/ |
144 |
|
/* roughness + source */ |
145 |
|
au2 = av2 = omega / PI; |
146 |
< |
au2 += np->u_alpha2; |
147 |
< |
av2 += np->v_alpha2; |
146 |
> |
au2 += np->u_alpha*np->u_alpha; |
147 |
> |
av2 += np->v_alpha*np->v_alpha; |
148 |
|
/* "half vector" */ |
149 |
|
h[0] = ldir[0] - np->prdir[0]; |
150 |
|
h[1] = ldir[1] - np->prdir[1]; |
196 |
|
m->oargs.farg[2]); |
197 |
|
/* get roughness */ |
198 |
|
nd.specfl = 0; |
199 |
< |
nd.u_alpha2 = m->oargs.farg[4]; |
200 |
< |
nd.u_alpha2 *= nd.u_alpha2; |
201 |
< |
nd.v_alpha2 = m->oargs.farg[5]; |
202 |
< |
nd.v_alpha2 *= nd.v_alpha2; |
203 |
< |
if (nd.u_alpha2 < FTINY*FTINY || nd.v_alpha2 <= FTINY*FTINY) |
199 |
> |
nd.u_alpha = m->oargs.farg[4]; |
200 |
> |
nd.v_alpha = m->oargs.farg[5]; |
201 |
> |
if (nd.u_alpha < FTINY || nd.v_alpha <= FTINY) |
202 |
|
objerror(m, USER, "roughness too small"); |
203 |
|
/* reorient if necessary */ |
204 |
|
if (r->rod < 0.0) |
345 |
|
d = urand(ilhash(dimlist,ndims)+samplendx); |
346 |
|
multisamp(rv, 2, d); |
347 |
|
d = 2.0*PI * rv[0]; |
348 |
< |
cosp = cos(d); |
349 |
< |
sinp = sin(d); |
350 |
< |
d = sqrt(np->u_alpha2*cosp*cosp + np->v_alpha2*sinp*sinp); |
348 |
> |
cosp = cos(d) * np->u_alpha; |
349 |
> |
sinp = sin(d) * np->v_alpha; |
350 |
> |
d = sqrt(cosp*cosp + sinp*sinp); |
351 |
|
cosp /= d; |
352 |
|
sinp /= d; |
353 |
|
rv[1] = 1.0 - specjitter*rv[1]; |
355 |
|
d = 1.0; |
356 |
|
else |
357 |
|
d = sqrt(-log(rv[1]) / |
358 |
< |
(cosp*cosp/np->u_alpha2 + |
359 |
< |
sinp*sinp/np->v_alpha2)); |
358 |
> |
(cosp*cosp/(np->u_alpha*np->u_alpha) + |
359 |
> |
sinp*sinp/(np->v_alpha*np->v_alpha))); |
360 |
|
for (i = 0; i < 3; i++) |
361 |
|
h[i] = np->pnorm[i] + |
362 |
|
d*(cosp*np->u[i] + sinp*np->v[i]); |
377 |
|
d = urand(ilhash(dimlist,ndims)+1823+samplendx); |
378 |
|
multisamp(rv, 2, d); |
379 |
|
d = 2.0*PI * rv[0]; |
380 |
< |
cosp = cos(d); |
381 |
< |
sinp = sin(d); |
380 |
> |
cosp = cos(d) * np->u_alpha; |
381 |
> |
sinp = sin(d) * np->v_alpha; |
382 |
> |
d = sqrt(cosp*cosp + sinp*sinp); |
383 |
> |
cosp /= d; |
384 |
> |
sinp /= d; |
385 |
|
rv[1] = 1.0 - specjitter*rv[1]; |
386 |
|
if (rv[1] <= FTINY) |
387 |
|
d = 1.0; |
388 |
|
else |
389 |
|
d = sqrt(-log(rv[1]) / |
390 |
< |
(cosp*cosp*4./np->u_alpha2 + |
391 |
< |
sinp*sinp*4./np->v_alpha2)); |
390 |
> |
(cosp*cosp/(np->u_alpha*np->u_alpha) + |
391 |
> |
sinp*sinp/(np->v_alpha*np->u_alpha))); |
392 |
|
for (i = 0; i < 3; i++) |
393 |
|
sr.rdir[i] = np->prdir[i] + |
394 |
|
d*(cosp*np->u[i] + sinp*np->v[i]); |