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_alpha; /* u roughness */ |
57 |
< |
double v_alpha; /* v roughness */ |
56 |
> |
double u_alpha2; /* u roughness squared */ |
57 |
> |
double v_alpha2; /* v roughness squared */ |
58 |
|
double rdiff, rspec; /* reflected specular, diffuse */ |
59 |
|
double trans; /* transmissivity */ |
60 |
|
double tdiff, tspec; /* transmitted specular, diffuse */ |
70 |
|
double omega; /* light source size */ |
71 |
|
{ |
72 |
|
double ldot; |
73 |
< |
double dtmp, dtmp2; |
73 |
> |
double dtmp, dtmp1, dtmp2; |
74 |
|
FVECT h; |
75 |
|
double au2, av2; |
76 |
|
COLOR ctmp; |
103 |
|
au2 = av2 = omega/(4.0*PI); |
104 |
|
else |
105 |
|
au2 = av2 = 0.0; |
106 |
< |
au2 += np->u_alpha * np->u_alpha; |
107 |
< |
av2 += np->v_alpha * np->v_alpha; |
106 |
> |
au2 += np->u_alpha2; |
107 |
> |
av2 += np->v_alpha2; |
108 |
|
/* half vector */ |
109 |
|
h[0] = ldir[0] - np->rp->rdir[0]; |
110 |
|
h[1] = ldir[1] - np->rp->rdir[1]; |
111 |
|
h[2] = ldir[2] - np->rp->rdir[2]; |
112 |
|
normalize(h); |
113 |
|
/* ellipse */ |
114 |
< |
dtmp = DOT(np->u, h); |
115 |
< |
dtmp *= dtmp / au2; |
114 |
> |
dtmp1 = DOT(np->u, h); |
115 |
> |
dtmp1 *= dtmp1 / au2; |
116 |
|
dtmp2 = DOT(np->v, h); |
117 |
|
dtmp2 *= dtmp2 / av2; |
118 |
|
/* gaussian */ |
119 |
< |
dtmp = (dtmp + dtmp2) / (1.0 + DOT(np->pnorm, h)); |
120 |
< |
dtmp = exp(-2.0*dtmp) / (4.0*PI * sqrt(au2*av2)); |
119 |
> |
dtmp = (dtmp1 + dtmp2) / (1.0 + DOT(np->pnorm, h)); |
120 |
> |
dtmp = exp(-2.0*dtmp) * 1.0/(4.0*PI) |
121 |
> |
* sqrt(ldot/(np->pdot*au2*av2)); |
122 |
|
/* worth using? */ |
123 |
|
if (dtmp > FTINY) { |
124 |
|
copycolor(ctmp, np->scolor); |
125 |
< |
dtmp *= omega / np->pdot; |
125 |
> |
dtmp *= omega; |
126 |
|
scalecolor(ctmp, dtmp); |
127 |
|
addcolor(cval, ctmp); |
128 |
|
} |
142 |
|
* is always modified by material color. |
143 |
|
*/ |
144 |
|
/* roughness + source */ |
145 |
+ |
au2 = av2 = omega / PI; |
146 |
+ |
au2 += np->u_alpha2; |
147 |
+ |
av2 += np->v_alpha2; |
148 |
+ |
/* "half vector" */ |
149 |
+ |
h[0] = ldir[0] - np->prdir[0]; |
150 |
+ |
h[1] = ldir[1] - np->prdir[1]; |
151 |
+ |
h[2] = ldir[2] - np->prdir[2]; |
152 |
+ |
dtmp = DOT(h,np->pnorm); |
153 |
+ |
dtmp = DOT(h,h) - dtmp*dtmp; |
154 |
+ |
if (dtmp > FTINY*FTINY) { |
155 |
+ |
dtmp1 = DOT(h,np->u); |
156 |
+ |
dtmp1 = dtmp1*dtmp1 / (au2*dtmp); |
157 |
+ |
dtmp2 = DOT(h,np->v); |
158 |
+ |
dtmp2 = dtmp2*dtmp2 / (av2*dtmp); |
159 |
+ |
dtmp = 2. - 2.*DOT(ldir,np->prdir); |
160 |
+ |
dtmp *= dtmp1 + dtmp2; |
161 |
+ |
} else |
162 |
+ |
dtmp = 0.0; |
163 |
|
/* gaussian */ |
164 |
< |
dtmp = 0.0; |
164 |
> |
dtmp = exp(-dtmp) * 1.0/(4.0*PI) |
165 |
> |
* sqrt(-ldot/(np->pdot*au2*av2)); |
166 |
|
/* worth using? */ |
167 |
|
if (dtmp > FTINY) { |
168 |
|
copycolor(ctmp, np->mcolor); |
169 |
< |
dtmp *= np->tspec * omega / np->pdot; |
169 |
> |
dtmp *= np->tspec * omega; |
170 |
|
scalecolor(ctmp, dtmp); |
171 |
|
addcolor(cval, ctmp); |
172 |
|
} |
196 |
|
m->oargs.farg[2]); |
197 |
|
/* get roughness */ |
198 |
|
nd.specfl = 0; |
199 |
< |
nd.u_alpha = m->oargs.farg[4]; |
200 |
< |
nd.v_alpha = m->oargs.farg[5]; |
201 |
< |
if (nd.u_alpha < 1e-6 || nd.v_alpha <= 1e-6) |
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) |
204 |
|
objerror(m, USER, "roughness too small"); |
205 |
|
/* reorient if necessary */ |
206 |
|
if (r->rod < 0.0) |
227 |
|
nd.rspec += (1.0-nd.rspec)*dtmp; |
228 |
|
/* check threshold */ |
229 |
|
if (specthresh > FTINY && |
230 |
< |
((specthresh >= 1.-FTINY || |
231 |
< |
specthresh + (.05 - .1*frandom()) > nd.rspec))) |
230 |
> |
(specthresh >= 1.-FTINY || |
231 |
> |
specthresh + .05 - .1*frandom() > nd.rspec)) |
232 |
|
nd.specfl |= SP_RBLT; |
233 |
|
/* compute refl. direction */ |
234 |
|
for (i = 0; i < 3; i++) |
238 |
|
nd.vrefl[i] = r->rdir[i] + 2.*r->rod*r->ron[i]; |
239 |
|
} |
240 |
|
/* compute transmission */ |
241 |
< |
if (m->otype == MAT_TRANS) { |
241 |
> |
if (m->otype == MAT_TRANS2) { |
242 |
|
nd.trans = m->oargs.farg[6]*(1.0 - nd.rspec); |
243 |
|
nd.tspec = nd.trans * m->oargs.farg[7]; |
244 |
|
nd.tdiff = nd.trans - nd.tspec; |
246 |
|
nd.specfl |= SP_TRAN; |
247 |
|
/* check threshold */ |
248 |
|
if (specthresh > FTINY && |
249 |
< |
((specthresh >= 1.-FTINY || |
250 |
< |
specthresh + |
229 |
< |
(.05 - .1*frandom()) > nd.tspec))) |
249 |
> |
(specthresh >= 1.-FTINY || |
250 |
> |
specthresh + .05 - .1*frandom() > nd.tspec)) |
251 |
|
nd.specfl |= SP_TBLT; |
252 |
|
if (DOT(r->pert,r->pert) <= FTINY*FTINY) { |
253 |
|
VCOPY(nd.prdir, r->rdir); |
254 |
|
} else { |
255 |
|
for (i = 0; i < 3; i++) /* perturb */ |
256 |
< |
nd.prdir[i] = r->rdir[i] - |
236 |
< |
0.5*r->pert[i]; |
256 |
> |
nd.prdir[i] = r->rdir[i] - r->pert[i]; |
257 |
|
if (DOT(nd.prdir, r->ron) < -FTINY) |
258 |
|
normalize(nd.prdir); /* OK */ |
259 |
|
else |
266 |
|
/* diffuse reflection */ |
267 |
|
nd.rdiff = 1.0 - nd.trans - nd.rspec; |
268 |
|
|
269 |
< |
if (r->ro->otype == OBJ_FACE || r->ro->otype == OBJ_RING) |
269 |
> |
if (r->ro != NULL && (r->ro->otype == OBJ_FACE || |
270 |
> |
r->ro->otype == OBJ_RING)) |
271 |
|
nd.specfl |= SP_FLAT; |
272 |
|
|
273 |
|
getacoords(r, &nd); /* set up coordinates */ |
318 |
|
np->specfl |= SP_BADU; |
319 |
|
return; |
320 |
|
} |
321 |
< |
multv3(np->u, np->u, mf->f->xfm); |
321 |
> |
if (mf->f != &unitxf) |
322 |
> |
multv3(np->u, np->u, mf->f->xfm); |
323 |
|
fcross(np->v, np->pnorm, np->u); |
324 |
|
if (normalize(np->v) == 0.0) { |
325 |
|
objerror(np->mp, WARNING, "illegal orientation vector"); |
347 |
|
d = urand(ilhash(dimlist,ndims)+samplendx); |
348 |
|
multisamp(rv, 2, d); |
349 |
|
d = 2.0*PI * rv[0]; |
350 |
< |
cosp = np->u_alpha * cos(d); |
351 |
< |
sinp = np->v_alpha * sin(d); |
352 |
< |
d = sqrt(cosp*cosp + sinp*sinp); |
350 |
> |
cosp = cos(d); |
351 |
> |
sinp = sin(d); |
352 |
> |
d = sqrt(np->u_alpha2*cosp*cosp + np->v_alpha2*sinp*sinp); |
353 |
|
cosp /= d; |
354 |
|
sinp /= d; |
355 |
|
rv[1] = 1.0 - specjitter*rv[1]; |
357 |
|
d = 1.0; |
358 |
|
else |
359 |
|
d = sqrt(-log(rv[1]) / |
360 |
< |
(cosp*cosp/(np->u_alpha*np->u_alpha) + |
361 |
< |
sinp*sinp/(np->v_alpha*np->v_alpha))); |
360 |
> |
(cosp*cosp/np->u_alpha2 + |
361 |
> |
sinp*sinp/np->v_alpha2)); |
362 |
|
for (i = 0; i < 3; i++) |
363 |
|
h[i] = np->pnorm[i] + |
364 |
|
d*(cosp*np->u[i] + sinp*np->v[i]); |
386 |
|
d = 1.0; |
387 |
|
else |
388 |
|
d = sqrt(-log(rv[1]) / |
389 |
< |
(cosp*cosp*4./(np->u_alpha*np->u_alpha) + |
390 |
< |
sinp*sinp*4./(np->v_alpha*np->v_alpha))); |
389 |
> |
(cosp*cosp*4./np->u_alpha2 + |
390 |
> |
sinp*sinp*4./np->v_alpha2)); |
391 |
|
for (i = 0; i < 3; i++) |
392 |
|
sr.rdir[i] = np->prdir[i] + |
393 |
|
d*(cosp*np->u[i] + sinp*np->v[i]); |