1 |
– |
/* Copyright (c) 1992 Regents of the University of California */ |
2 |
– |
|
1 |
|
#ifndef lint |
2 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
6 |
– |
|
4 |
|
/* |
5 |
|
* Shading functions for anisotropic materials. |
6 |
|
*/ |
7 |
|
|
8 |
< |
#include "ray.h" |
8 |
> |
#include "copyright.h" |
9 |
|
|
10 |
+ |
#include "ray.h" |
11 |
+ |
#include "ambient.h" |
12 |
|
#include "otypes.h" |
13 |
< |
|
13 |
> |
#include "rtotypes.h" |
14 |
> |
#include "source.h" |
15 |
|
#include "func.h" |
16 |
– |
|
16 |
|
#include "random.h" |
17 |
|
|
18 |
< |
extern double specthresh; /* specular sampling threshold */ |
19 |
< |
extern double specjitter; /* specular sampling jitter */ |
18 |
> |
#ifndef MAXITER |
19 |
> |
#define MAXITER 10 /* maximum # specular ray attempts */ |
20 |
> |
#endif |
21 |
|
|
22 |
|
/* |
23 |
< |
* This anisotropic reflection model uses a variant on the |
24 |
< |
* exponential Gaussian used in normal.c. |
23 |
> |
* This routine implements the anisotropic Gaussian |
24 |
> |
* model described by Ward in Siggraph `92 article. |
25 |
|
* We orient the surface towards the incoming ray, so a single |
26 |
|
* surface can be used to represent an infinitely thin object. |
27 |
|
* |
34 |
|
* 8 red grn blu rspec u-rough v-rough trans tspec |
35 |
|
*/ |
36 |
|
|
37 |
– |
#define BSPEC(m) (6.0) /* specularity parameter b */ |
38 |
– |
|
37 |
|
/* specularity flags */ |
38 |
|
#define SP_REFL 01 /* has reflected specular component */ |
39 |
|
#define SP_TRAN 02 /* has transmitted specular */ |
40 |
< |
#define SP_PURE 010 /* purely specular (zero roughness) */ |
41 |
< |
#define SP_FLAT 020 /* reflecting surface is flat */ |
42 |
< |
#define SP_RBLT 040 /* reflection below sample threshold */ |
43 |
< |
#define SP_TBLT 0100 /* transmission below threshold */ |
46 |
< |
#define SP_BADU 0200 /* bad u direction calculation */ |
40 |
> |
#define SP_FLAT 04 /* reflecting surface is flat */ |
41 |
> |
#define SP_RBLT 010 /* reflection below sample threshold */ |
42 |
> |
#define SP_TBLT 020 /* transmission below threshold */ |
43 |
> |
#define SP_BADU 040 /* bad u direction calculation */ |
44 |
|
|
45 |
|
typedef struct { |
46 |
|
OBJREC *mp; /* material pointer */ |
48 |
|
short specfl; /* specularity flags, defined above */ |
49 |
|
COLOR mcolor; /* color of this material */ |
50 |
|
COLOR scolor; /* color of specular component */ |
51 |
+ |
FVECT vrefl; /* vector in reflected direction */ |
52 |
|
FVECT prdir; /* vector in transmitted direction */ |
53 |
|
FVECT u, v; /* u and v vectors orienting anisotropy */ |
54 |
|
double u_alpha; /* u roughness */ |
60 |
|
double pdot; /* perturbed dot product */ |
61 |
|
} ANISODAT; /* anisotropic material data */ |
62 |
|
|
63 |
+ |
static srcdirf_t diraniso; |
64 |
+ |
static void getacoords(RAY *r, ANISODAT *np); |
65 |
+ |
static void agaussamp(RAY *r, ANISODAT *np); |
66 |
|
|
67 |
< |
diraniso(cval, np, ldir, omega) /* compute source contribution */ |
68 |
< |
COLOR cval; /* returned coefficient */ |
69 |
< |
register ANISODAT *np; /* material data */ |
70 |
< |
FVECT ldir; /* light source direction */ |
71 |
< |
double omega; /* light source size */ |
67 |
> |
|
68 |
> |
static void |
69 |
> |
diraniso( /* compute source contribution */ |
70 |
> |
COLOR cval, /* returned coefficient */ |
71 |
> |
void *nnp, /* material data */ |
72 |
> |
FVECT ldir, /* light source direction */ |
73 |
> |
double omega /* light source size */ |
74 |
> |
) |
75 |
|
{ |
76 |
+ |
register ANISODAT *np = nnp; |
77 |
|
double ldot; |
78 |
< |
double dtmp, dtmp2; |
78 |
> |
double dtmp, dtmp1, dtmp2; |
79 |
|
FVECT h; |
80 |
|
double au2, av2; |
81 |
|
COLOR ctmp; |
94 |
|
* modified by the color of the material. |
95 |
|
*/ |
96 |
|
copycolor(ctmp, np->mcolor); |
97 |
< |
dtmp = ldot * omega * np->rdiff / PI; |
97 |
> |
dtmp = ldot * omega * np->rdiff * (1.0/PI); |
98 |
|
scalecolor(ctmp, dtmp); |
99 |
|
addcolor(cval, ctmp); |
100 |
|
} |
101 |
< |
if (ldot > FTINY && (np->specfl&(SP_REFL|SP_PURE|SP_BADU)) == SP_REFL) { |
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) |
108 |
< |
au2 = av2 = omega/(4.0*PI); |
108 |
> |
au2 = av2 = omega * (0.25/PI); |
109 |
|
else |
110 |
|
au2 = av2 = 0.0; |
111 |
< |
au2 += np->u_alpha * np->u_alpha; |
112 |
< |
av2 += np->v_alpha * np->v_alpha; |
111 |
> |
au2 += np->u_alpha*np->u_alpha; |
112 |
> |
av2 += np->v_alpha*np->v_alpha; |
113 |
|
/* half vector */ |
114 |
|
h[0] = ldir[0] - np->rp->rdir[0]; |
115 |
|
h[1] = ldir[1] - np->rp->rdir[1]; |
116 |
|
h[2] = ldir[2] - np->rp->rdir[2]; |
112 |
– |
normalize(h); |
117 |
|
/* ellipse */ |
118 |
< |
dtmp = DOT(np->u, h); |
119 |
< |
dtmp *= dtmp / au2; |
118 |
> |
dtmp1 = DOT(np->u, h); |
119 |
> |
dtmp1 *= dtmp1 / au2; |
120 |
|
dtmp2 = DOT(np->v, h); |
121 |
|
dtmp2 *= dtmp2 / av2; |
122 |
< |
/* gaussian */ |
123 |
< |
dtmp = (dtmp + dtmp2) / (1.0 + DOT(np->pnorm, h)); |
124 |
< |
dtmp = exp(-2.0*dtmp) / (4.0*PI * sqrt(au2*av2)); |
122 |
> |
/* new W-G-M-D model */ |
123 |
> |
dtmp = DOT(np->pnorm, h); |
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 / np->pdot; |
131 |
> |
dtmp *= ldot * omega; |
132 |
|
scalecolor(ctmp, dtmp); |
133 |
|
addcolor(cval, ctmp); |
134 |
|
} |
138 |
|
* Compute diffuse transmission. |
139 |
|
*/ |
140 |
|
copycolor(ctmp, np->mcolor); |
141 |
< |
dtmp = -ldot * omega * np->tdiff / PI; |
141 |
> |
dtmp = -ldot * omega * np->tdiff * (1.0/PI); |
142 |
|
scalecolor(ctmp, dtmp); |
143 |
|
addcolor(cval, ctmp); |
144 |
|
} |
145 |
< |
if (ldot < -FTINY && (np->specfl&(SP_TRAN|SP_PURE|SP_BADU)) == SP_TRAN) { |
145 |
> |
if (ldot < -FTINY && (np->specfl&(SP_TRAN|SP_BADU)) == SP_TRAN) { |
146 |
|
/* |
147 |
|
* Compute specular transmission. Specular transmission |
148 |
|
* is always modified by material color. |
149 |
|
*/ |
150 |
|
/* roughness + source */ |
151 |
< |
/* gaussian */ |
152 |
< |
dtmp = 0.0; |
151 |
> |
au2 = av2 = omega * (1.0/PI); |
152 |
> |
au2 += np->u_alpha*np->u_alpha; |
153 |
> |
av2 += np->v_alpha*np->v_alpha; |
154 |
> |
/* "half vector" */ |
155 |
> |
h[0] = ldir[0] - np->prdir[0]; |
156 |
> |
h[1] = ldir[1] - np->prdir[1]; |
157 |
> |
h[2] = ldir[2] - np->prdir[2]; |
158 |
> |
dtmp = DOT(h,h); |
159 |
> |
if (dtmp > FTINY*FTINY) { |
160 |
> |
dtmp1 = DOT(h,np->pnorm); |
161 |
> |
dtmp = 1.0 - dtmp1*dtmp1/dtmp; |
162 |
> |
if (dtmp > FTINY*FTINY) { |
163 |
> |
dtmp1 = DOT(h,np->u); |
164 |
> |
dtmp1 *= dtmp1 / au2; |
165 |
> |
dtmp2 = DOT(h,np->v); |
166 |
> |
dtmp2 *= dtmp2 / av2; |
167 |
> |
dtmp = (dtmp1 + dtmp2) / dtmp; |
168 |
> |
} |
169 |
> |
} else |
170 |
> |
dtmp = 0.0; |
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); |
176 |
< |
dtmp *= np->tspec * omega / np->pdot; |
176 |
> |
dtmp *= np->tspec * omega; |
177 |
|
scalecolor(ctmp, dtmp); |
178 |
|
addcolor(cval, ctmp); |
179 |
|
} |
181 |
|
} |
182 |
|
|
183 |
|
|
184 |
< |
m_aniso(m, r) /* shade ray that hit something anisotropic */ |
185 |
< |
register OBJREC *m; |
186 |
< |
register RAY *r; |
184 |
> |
extern int |
185 |
> |
m_aniso( /* shade ray that hit something anisotropic */ |
186 |
> |
register OBJREC *m, |
187 |
> |
register RAY *r |
188 |
> |
) |
189 |
|
{ |
190 |
|
ANISODAT nd; |
162 |
– |
double transtest, transdist; |
163 |
– |
double dtmp; |
191 |
|
COLOR ctmp; |
192 |
|
register int i; |
193 |
|
/* easy shadow test */ |
194 |
< |
if (r->crtype & SHADOW && m->otype != MAT_TRANS2) |
195 |
< |
return; |
194 |
> |
if (r->crtype & SHADOW) |
195 |
> |
return(1); |
196 |
|
|
197 |
|
if (m->oargs.nfargs != (m->otype == MAT_TRANS2 ? 8 : 6)) |
198 |
|
objerror(m, USER, "bad number of real arguments"); |
199 |
+ |
/* check for back side */ |
200 |
+ |
if (r->rod < 0.0) { |
201 |
+ |
if (!backvis && m->otype != MAT_TRANS2) { |
202 |
+ |
raytrans(r); |
203 |
+ |
return(1); |
204 |
+ |
} |
205 |
+ |
raytexture(r, m->omod); |
206 |
+ |
flipsurface(r); /* reorient if backvis */ |
207 |
+ |
} else |
208 |
+ |
raytexture(r, m->omod); |
209 |
+ |
/* get material color */ |
210 |
|
nd.mp = m; |
211 |
|
nd.rp = r; |
174 |
– |
/* get material color */ |
212 |
|
setcolor(nd.mcolor, m->oargs.farg[0], |
213 |
|
m->oargs.farg[1], |
214 |
|
m->oargs.farg[2]); |
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) |
220 |
< |
nd.specfl |= SP_PURE; |
221 |
< |
/* reorient if necessary */ |
185 |
< |
if (r->rod < 0.0) |
186 |
< |
flipsurface(r); |
187 |
< |
/* get modifiers */ |
188 |
< |
raytexture(r, m->omod); |
220 |
> |
objerror(m, USER, "roughness too small"); |
221 |
> |
|
222 |
|
nd.pdot = raynormal(nd.pnorm, r); /* perturb normal */ |
223 |
|
if (nd.pdot < .001) |
224 |
|
nd.pdot = .001; /* non-zero for diraniso() */ |
225 |
|
multcolor(nd.mcolor, r->pcol); /* modify material color */ |
193 |
– |
transtest = 0; |
226 |
|
/* get specular component */ |
227 |
|
if ((nd.rspec = m->oargs.farg[3]) > FTINY) { |
228 |
|
nd.specfl |= SP_REFL; |
232 |
|
else |
233 |
|
setcolor(nd.scolor, 1.0, 1.0, 1.0); |
234 |
|
scalecolor(nd.scolor, nd.rspec); |
203 |
– |
/* improved model */ |
204 |
– |
dtmp = exp(-BSPEC(m)*nd.pdot); |
205 |
– |
for (i = 0; i < 3; i++) |
206 |
– |
colval(nd.scolor,i) += (1.0-colval(nd.scolor,i))*dtmp; |
207 |
– |
nd.rspec += (1.0-nd.rspec)*dtmp; |
235 |
|
/* check threshold */ |
236 |
< |
if (nd.rspec <= specthresh+FTINY) |
236 |
> |
if (specthresh >= nd.rspec-FTINY) |
237 |
|
nd.specfl |= SP_RBLT; |
238 |
< |
|
239 |
< |
if (!(r->crtype & SHADOW) && nd.specfl & SP_PURE) { |
240 |
< |
RAY lr; |
241 |
< |
if (rayorigin(&lr, r, REFLECTED, nd.rspec) == 0) { |
215 |
< |
for (i = 0; i < 3; i++) |
216 |
< |
lr.rdir[i] = r->rdir[i] + |
217 |
< |
2.0*nd.pdot*nd.pnorm[i]; |
218 |
< |
rayvalue(&lr); |
219 |
< |
multcolor(lr.rcol, nd.scolor); |
220 |
< |
addcolor(r->rcol, lr.rcol); |
221 |
< |
} |
222 |
< |
} |
238 |
> |
/* compute refl. direction */ |
239 |
> |
VSUM(nd.vrefl, r->rdir, nd.pnorm, 2.0*nd.pdot); |
240 |
> |
if (DOT(nd.vrefl, r->ron) <= FTINY) /* penetration? */ |
241 |
> |
VSUM(nd.vrefl, r->rdir, r->ron, 2.0*r->rod); |
242 |
|
} |
243 |
|
/* compute transmission */ |
244 |
< |
if (m->otype == MAT_TRANS) { |
244 |
> |
if (m->otype == MAT_TRANS2) { |
245 |
|
nd.trans = m->oargs.farg[6]*(1.0 - nd.rspec); |
246 |
|
nd.tspec = nd.trans * m->oargs.farg[7]; |
247 |
|
nd.tdiff = nd.trans - nd.tspec; |
248 |
|
if (nd.tspec > FTINY) { |
249 |
|
nd.specfl |= SP_TRAN; |
250 |
|
/* check threshold */ |
251 |
< |
if (nd.tspec <= specthresh+FTINY) |
251 |
> |
if (specthresh >= nd.tspec-FTINY) |
252 |
|
nd.specfl |= SP_TBLT; |
253 |
< |
if (r->crtype & SHADOW || |
235 |
< |
DOT(r->pert,r->pert) <= FTINY*FTINY) { |
253 |
> |
if (DOT(r->pert,r->pert) <= FTINY*FTINY) { |
254 |
|
VCOPY(nd.prdir, r->rdir); |
237 |
– |
transtest = 2; |
255 |
|
} else { |
256 |
|
for (i = 0; i < 3; i++) /* perturb */ |
257 |
< |
nd.prdir[i] = r->rdir[i] - |
258 |
< |
.75*r->pert[i]; |
259 |
< |
normalize(nd.prdir); |
257 |
> |
nd.prdir[i] = r->rdir[i] - r->pert[i]; |
258 |
> |
if (DOT(nd.prdir, r->ron) < -FTINY) |
259 |
> |
normalize(nd.prdir); /* OK */ |
260 |
> |
else |
261 |
> |
VCOPY(nd.prdir, r->rdir); |
262 |
|
} |
263 |
|
} |
264 |
|
} else |
265 |
|
nd.tdiff = nd.tspec = nd.trans = 0.0; |
247 |
– |
/* transmitted ray */ |
248 |
– |
if ((nd.specfl&(SP_TRAN|SP_PURE)) == (SP_TRAN|SP_PURE)) { |
249 |
– |
RAY lr; |
250 |
– |
if (rayorigin(&lr, r, TRANS, nd.tspec) == 0) { |
251 |
– |
VCOPY(lr.rdir, nd.prdir); |
252 |
– |
rayvalue(&lr); |
253 |
– |
scalecolor(lr.rcol, nd.tspec); |
254 |
– |
multcolor(lr.rcol, nd.mcolor); /* modified by color */ |
255 |
– |
addcolor(r->rcol, lr.rcol); |
256 |
– |
transtest *= bright(lr.rcol); |
257 |
– |
transdist = r->rot + lr.rt; |
258 |
– |
} |
259 |
– |
} |
266 |
|
|
261 |
– |
if (r->crtype & SHADOW) /* the rest is shadow */ |
262 |
– |
return; |
267 |
|
/* diffuse reflection */ |
268 |
|
nd.rdiff = 1.0 - nd.trans - nd.rspec; |
269 |
|
|
270 |
< |
if (nd.specfl & SP_PURE && nd.rdiff <= FTINY && nd.tdiff <= FTINY) |
267 |
< |
return; /* 100% pure specular */ |
268 |
< |
|
269 |
< |
if (r->ro->otype == OBJ_FACE || r->ro->otype == OBJ_RING) |
270 |
> |
if (r->ro != NULL && isflat(r->ro->otype)) |
271 |
|
nd.specfl |= SP_FLAT; |
272 |
|
|
273 |
|
getacoords(r, &nd); /* set up coordinates */ |
274 |
|
|
275 |
< |
if (nd.specfl & (SP_REFL|SP_TRAN) && !(nd.specfl & (SP_PURE|SP_BADU))) |
275 |
> |
if (nd.specfl & (SP_REFL|SP_TRAN) && !(nd.specfl & SP_BADU)) |
276 |
|
agaussamp(r, &nd); |
277 |
|
|
278 |
|
if (nd.rdiff > FTINY) { /* ambient from this side */ |
279 |
< |
ambient(ctmp, r); |
279 |
> |
copycolor(ctmp, nd.mcolor); /* modified by material color */ |
280 |
|
if (nd.specfl & SP_RBLT) |
281 |
|
scalecolor(ctmp, 1.0-nd.trans); |
282 |
|
else |
283 |
|
scalecolor(ctmp, nd.rdiff); |
284 |
< |
multcolor(ctmp, nd.mcolor); /* modified by material color */ |
284 |
> |
multambient(ctmp, r, nd.pnorm); |
285 |
|
addcolor(r->rcol, ctmp); /* add to returned color */ |
286 |
|
} |
287 |
|
if (nd.tdiff > FTINY) { /* ambient from other side */ |
288 |
+ |
FVECT bnorm; |
289 |
+ |
|
290 |
|
flipsurface(r); |
291 |
< |
ambient(ctmp, r); |
291 |
> |
bnorm[0] = -nd.pnorm[0]; |
292 |
> |
bnorm[1] = -nd.pnorm[1]; |
293 |
> |
bnorm[2] = -nd.pnorm[2]; |
294 |
> |
copycolor(ctmp, nd.mcolor); /* modified by color */ |
295 |
|
if (nd.specfl & SP_TBLT) |
296 |
|
scalecolor(ctmp, nd.trans); |
297 |
|
else |
298 |
|
scalecolor(ctmp, nd.tdiff); |
299 |
< |
multcolor(ctmp, nd.mcolor); /* modified by color */ |
299 |
> |
multambient(ctmp, r, bnorm); |
300 |
|
addcolor(r->rcol, ctmp); |
301 |
|
flipsurface(r); |
302 |
|
} |
303 |
|
/* add direct component */ |
304 |
|
direct(r, diraniso, &nd); |
305 |
< |
/* check distance */ |
306 |
< |
if (transtest > bright(r->rcol)) |
301 |
< |
r->rt = transdist; |
305 |
> |
|
306 |
> |
return(1); |
307 |
|
} |
308 |
|
|
309 |
|
|
310 |
< |
static |
311 |
< |
getacoords(r, np) /* set up coordinate system */ |
312 |
< |
RAY *r; |
313 |
< |
register ANISODAT *np; |
310 |
> |
static void |
311 |
> |
getacoords( /* set up coordinate system */ |
312 |
> |
RAY *r, |
313 |
> |
register ANISODAT *np |
314 |
> |
) |
315 |
|
{ |
316 |
|
register MFUNC *mf; |
317 |
|
register int i; |
321 |
|
errno = 0; |
322 |
|
for (i = 0; i < 3; i++) |
323 |
|
np->u[i] = evalue(mf->ep[i]); |
324 |
< |
if (errno) { |
324 |
> |
if (errno == EDOM || errno == ERANGE) { |
325 |
|
objerror(np->mp, WARNING, "compute error"); |
326 |
|
np->specfl |= SP_BADU; |
327 |
|
return; |
328 |
|
} |
329 |
< |
multv3(np->u, np->u, mf->f->xfm); |
329 |
> |
if (mf->f != &unitxf) |
330 |
> |
multv3(np->u, np->u, mf->f->xfm); |
331 |
|
fcross(np->v, np->pnorm, np->u); |
332 |
|
if (normalize(np->v) == 0.0) { |
333 |
|
objerror(np->mp, WARNING, "illegal orientation vector"); |
338 |
|
} |
339 |
|
|
340 |
|
|
341 |
< |
static |
342 |
< |
agaussamp(r, np) /* sample anisotropic gaussian specular */ |
343 |
< |
RAY *r; |
344 |
< |
register ANISODAT *np; |
341 |
> |
static void |
342 |
> |
agaussamp( /* sample anisotropic Gaussian specular */ |
343 |
> |
RAY *r, |
344 |
> |
register ANISODAT *np |
345 |
> |
) |
346 |
|
{ |
347 |
|
RAY sr; |
348 |
|
FVECT h; |
349 |
|
double rv[2]; |
350 |
|
double d, sinp, cosp; |
351 |
< |
int ntries; |
351 |
> |
COLOR scol; |
352 |
> |
int niter, ns2go; |
353 |
|
register int i; |
354 |
|
/* compute reflection */ |
355 |
|
if ((np->specfl & (SP_REFL|SP_RBLT)) == SP_REFL && |
356 |
< |
rayorigin(&sr, r, SPECULAR, np->rspec) == 0) { |
356 |
> |
rayorigin(&sr, SPECULAR, r, np->scolor) == 0) { |
357 |
> |
copycolor(scol, np->scolor); |
358 |
> |
ns2go = 1; |
359 |
> |
if (specjitter > 1.5) { /* multiple samples? */ |
360 |
> |
ns2go = specjitter*sr.rweight + .5; |
361 |
> |
if (sr.rweight <= minweight*ns2go) |
362 |
> |
ns2go = sr.rweight/minweight; |
363 |
> |
if (ns2go > 1) { |
364 |
> |
d = 1./ns2go; |
365 |
> |
scalecolor(scol, d); |
366 |
> |
sr.rweight *= d; |
367 |
> |
} else |
368 |
> |
ns2go = 1; |
369 |
> |
} |
370 |
|
dimlist[ndims++] = (int)np->mp; |
371 |
< |
for (ntries = 0; ntries < 10; ntries++) { |
372 |
< |
dimlist[ndims] = ntries * 3601; |
373 |
< |
d = urand(ilhash(dimlist,ndims+1)+samplendx); |
371 |
> |
for (niter = ns2go*MAXITER; (ns2go > 0) & (niter > 0); niter--) { |
372 |
> |
if (specjitter > 1.5) |
373 |
> |
d = frandom(); |
374 |
> |
else |
375 |
> |
d = urand(ilhash(dimlist,ndims)+samplendx); |
376 |
|
multisamp(rv, 2, d); |
377 |
|
d = 2.0*PI * rv[0]; |
378 |
< |
cosp = np->u_alpha * cos(d); |
379 |
< |
sinp = np->v_alpha * sin(d); |
380 |
< |
d = sqrt(cosp*cosp + sinp*sinp); |
381 |
< |
cosp /= d; |
382 |
< |
sinp /= d; |
383 |
< |
rv[1] = 1.0 - specjitter*rv[1]; |
378 |
> |
cosp = tcos(d) * np->u_alpha; |
379 |
> |
sinp = tsin(d) * np->v_alpha; |
380 |
> |
d = 1./sqrt(cosp*cosp + sinp*sinp); |
381 |
> |
cosp *= d; |
382 |
> |
sinp *= d; |
383 |
> |
if ((0. <= specjitter) & (specjitter < 1.)) |
384 |
> |
rv[1] = 1.0 - specjitter*rv[1]; |
385 |
|
if (rv[1] <= FTINY) |
386 |
|
d = 1.0; |
387 |
|
else |
392 |
|
h[i] = np->pnorm[i] + |
393 |
|
d*(cosp*np->u[i] + sinp*np->v[i]); |
394 |
|
d = -2.0 * DOT(h, r->rdir) / (1.0 + d*d); |
395 |
< |
for (i = 0; i < 3; i++) |
396 |
< |
sr.rdir[i] = r->rdir[i] + d*h[i]; |
397 |
< |
if (DOT(sr.rdir, r->ron) > FTINY) { |
398 |
< |
rayvalue(&sr); |
399 |
< |
multcolor(sr.rcol, np->scolor); |
400 |
< |
addcolor(r->rcol, sr.rcol); |
401 |
< |
break; |
395 |
> |
if (d <= np->pdot + FTINY) |
396 |
> |
continue; |
397 |
> |
VSUM(sr.rdir, r->rdir, h, d); |
398 |
> |
if (DOT(sr.rdir, r->ron) <= FTINY) |
399 |
> |
continue; |
400 |
> |
checknorm(sr.rdir); |
401 |
> |
if (specjitter > 1.5) { /* adjusted W-G-M-D weight */ |
402 |
> |
d = 2.*(1. - np->pdot/d); |
403 |
> |
copycolor(sr.rcoef, scol); |
404 |
> |
scalecolor(sr.rcoef, d); |
405 |
> |
rayclear(&sr); |
406 |
|
} |
407 |
+ |
rayvalue(&sr); |
408 |
+ |
multcolor(sr.rcol, sr.rcoef); |
409 |
+ |
addcolor(r->rcol, sr.rcol); |
410 |
+ |
--ns2go; |
411 |
|
} |
412 |
|
ndims--; |
413 |
|
} |
414 |
|
/* compute transmission */ |
415 |
+ |
copycolor(sr.rcoef, np->mcolor); /* modify by material color */ |
416 |
+ |
scalecolor(sr.rcoef, np->tspec); |
417 |
+ |
if ((np->specfl & (SP_TRAN|SP_TBLT)) == SP_TRAN && |
418 |
+ |
rayorigin(&sr, SPECULAR, r, sr.rcoef) == 0) { |
419 |
+ |
ns2go = 1; |
420 |
+ |
if (specjitter > 1.5) { /* multiple samples? */ |
421 |
+ |
ns2go = specjitter*sr.rweight + .5; |
422 |
+ |
if (sr.rweight <= minweight*ns2go) |
423 |
+ |
ns2go = sr.rweight/minweight; |
424 |
+ |
if (ns2go > 1) { |
425 |
+ |
d = 1./ns2go; |
426 |
+ |
scalecolor(sr.rcoef, d); |
427 |
+ |
sr.rweight *= d; |
428 |
+ |
} else |
429 |
+ |
ns2go = 1; |
430 |
+ |
} |
431 |
+ |
dimlist[ndims++] = (int)np->mp; |
432 |
+ |
for (niter = ns2go*MAXITER; (ns2go > 0) & (niter > 0); niter--) { |
433 |
+ |
if (specjitter > 1.5) |
434 |
+ |
d = frandom(); |
435 |
+ |
else |
436 |
+ |
d = urand(ilhash(dimlist,ndims)+1823+samplendx); |
437 |
+ |
multisamp(rv, 2, d); |
438 |
+ |
d = 2.0*PI * rv[0]; |
439 |
+ |
cosp = tcos(d) * np->u_alpha; |
440 |
+ |
sinp = tsin(d) * np->v_alpha; |
441 |
+ |
d = 1./sqrt(cosp*cosp + sinp*sinp); |
442 |
+ |
cosp *= d; |
443 |
+ |
sinp *= d; |
444 |
+ |
if ((0. <= specjitter) & (specjitter < 1.)) |
445 |
+ |
rv[1] = 1.0 - specjitter*rv[1]; |
446 |
+ |
if (rv[1] <= FTINY) |
447 |
+ |
d = 1.0; |
448 |
+ |
else |
449 |
+ |
d = sqrt(-log(rv[1]) / |
450 |
+ |
(cosp*cosp/(np->u_alpha*np->u_alpha) + |
451 |
+ |
sinp*sinp/(np->v_alpha*np->v_alpha))); |
452 |
+ |
for (i = 0; i < 3; i++) |
453 |
+ |
sr.rdir[i] = np->prdir[i] + |
454 |
+ |
d*(cosp*np->u[i] + sinp*np->v[i]); |
455 |
+ |
if (DOT(sr.rdir, r->ron) >= -FTINY) |
456 |
+ |
continue; |
457 |
+ |
normalize(sr.rdir); /* OK, normalize */ |
458 |
+ |
if (specjitter > 1.5) /* multi-sampling */ |
459 |
+ |
rayclear(&sr); |
460 |
+ |
rayvalue(&sr); |
461 |
+ |
multcolor(sr.rcol, sr.rcoef); |
462 |
+ |
addcolor(r->rcol, sr.rcol); |
463 |
+ |
--ns2go; |
464 |
+ |
} |
465 |
+ |
ndims--; |
466 |
+ |
} |
467 |
|
} |