| 19 |
|
#include "otypes.h" |
| 20 |
|
#include "rtotypes.h" |
| 21 |
|
#include "random.h" |
| 22 |
+ |
#include "pmapmat.h" |
| 23 |
|
|
| 24 |
|
#ifndef MAXITER |
| 25 |
|
#define MAXITER 10 /* maximum # specular ray attempts */ |
| 26 |
|
#endif |
| 27 |
|
/* estimate of Fresnel function */ |
| 28 |
< |
#define FRESNE(ci) (exp(-5.85*(ci)) - 0.00287989916) |
| 28 |
> |
#define FRESNE(ci) (exp(-6.2*(ci)) - 0.00202943064) |
| 29 |
> |
#define FRESTHRESH 0.017999 /* minimum specularity for approx. */ |
| 30 |
|
|
| 31 |
|
|
| 32 |
|
/* |
| 66 |
|
double pdot; /* perturbed dot product */ |
| 67 |
|
} NORMDAT; /* normal material data */ |
| 68 |
|
|
| 69 |
< |
static srcdirf_t dirnorm; |
| 68 |
< |
static void gaussamp(RAY *r, NORMDAT *np); |
| 69 |
> |
static void gaussamp(NORMDAT *np); |
| 70 |
|
|
| 71 |
|
|
| 72 |
|
static void |
| 73 |
|
dirnorm( /* compute source contribution */ |
| 74 |
|
COLOR cval, /* returned coefficient */ |
| 75 |
< |
void *nnp, /* material data */ |
| 75 |
> |
void *nnp, /* material data */ |
| 76 |
|
FVECT ldir, /* light source direction */ |
| 77 |
|
double omega /* light source size */ |
| 78 |
|
) |
| 79 |
|
{ |
| 80 |
< |
register NORMDAT *np = nnp; |
| 80 |
> |
NORMDAT *np = nnp; |
| 81 |
|
double ldot; |
| 82 |
< |
double ldiff; |
| 83 |
< |
double dtmp, d2; |
| 82 |
> |
double lrdiff, ltdiff; |
| 83 |
> |
double dtmp, d2, d3, d4; |
| 84 |
|
FVECT vtmp; |
| 85 |
|
COLOR ctmp; |
| 86 |
|
|
| 92 |
|
return; /* wrong side */ |
| 93 |
|
|
| 94 |
|
/* Fresnel estimate */ |
| 95 |
< |
ldiff = np->rdiff; |
| 96 |
< |
if (np->specfl & SP_PURE && (np->rspec > FTINY) & (ldiff > FTINY)) |
| 97 |
< |
ldiff *= 1. - FRESNE(fabs(ldot)); |
| 95 |
> |
lrdiff = np->rdiff; |
| 96 |
> |
ltdiff = np->tdiff; |
| 97 |
> |
if (np->specfl & SP_PURE && np->rspec >= FRESTHRESH && |
| 98 |
> |
(lrdiff > FTINY) | (ltdiff > FTINY)) { |
| 99 |
> |
dtmp = 1. - FRESNE(fabs(ldot)); |
| 100 |
> |
lrdiff *= dtmp; |
| 101 |
> |
ltdiff *= dtmp; |
| 102 |
> |
} |
| 103 |
|
|
| 104 |
< |
if (ldot > FTINY && ldiff > FTINY) { |
| 104 |
> |
if (ldot > FTINY && lrdiff > FTINY) { |
| 105 |
|
/* |
| 106 |
|
* Compute and add diffuse reflected component to returned |
| 107 |
|
* color. The diffuse reflected component will always be |
| 108 |
|
* modified by the color of the material. |
| 109 |
|
*/ |
| 110 |
|
copycolor(ctmp, np->mcolor); |
| 111 |
< |
dtmp = ldot * omega * ldiff / PI; |
| 111 |
> |
dtmp = ldot * omega * lrdiff * (1.0/PI); |
| 112 |
|
scalecolor(ctmp, dtmp); |
| 113 |
|
addcolor(cval, ctmp); |
| 114 |
|
} |
| 115 |
+ |
|
| 116 |
+ |
if (ldot < -FTINY && ltdiff > FTINY) { |
| 117 |
+ |
/* |
| 118 |
+ |
* Compute diffuse transmission. |
| 119 |
+ |
*/ |
| 120 |
+ |
copycolor(ctmp, np->mcolor); |
| 121 |
+ |
dtmp = -ldot * omega * ltdiff * (1.0/PI); |
| 122 |
+ |
scalecolor(ctmp, dtmp); |
| 123 |
+ |
addcolor(cval, ctmp); |
| 124 |
+ |
} |
| 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 |
| 132 |
< |
* gaussian distribution model. |
| 132 |
> |
* Gaussian distribution model. |
| 133 |
|
*/ |
| 134 |
|
/* roughness */ |
| 135 |
|
dtmp = np->alpha2; |
| 136 |
|
/* + source if flat */ |
| 137 |
|
if (np->specfl & SP_FLAT) |
| 138 |
< |
dtmp += omega/(4.0*PI); |
| 138 |
> |
dtmp += omega * (0.25/PI); |
| 139 |
|
/* half vector */ |
| 140 |
< |
vtmp[0] = ldir[0] - np->rp->rdir[0]; |
| 121 |
< |
vtmp[1] = ldir[1] - np->rp->rdir[1]; |
| 122 |
< |
vtmp[2] = ldir[2] - np->rp->rdir[2]; |
| 140 |
> |
VSUB(vtmp, ldir, np->rp->rdir); |
| 141 |
|
d2 = DOT(vtmp, np->pnorm); |
| 142 |
|
d2 *= d2; |
| 143 |
< |
d2 = (DOT(vtmp,vtmp) - d2) / d2; |
| 144 |
< |
/* gaussian */ |
| 145 |
< |
dtmp = exp(-d2/dtmp)/(4.*PI*dtmp); |
| 143 |
> |
d3 = DOT(vtmp,vtmp); |
| 144 |
> |
d4 = (d3 - d2) / d2; |
| 145 |
> |
/* new W-G-M-D model */ |
| 146 |
> |
dtmp = exp(-d4/dtmp) * d3 / (PI * d2*d2 * dtmp); |
| 147 |
|
/* worth using? */ |
| 148 |
|
if (dtmp > FTINY) { |
| 149 |
|
copycolor(ctmp, np->scolor); |
| 150 |
< |
dtmp *= omega * sqrt(ldot/np->pdot); |
| 150 |
> |
dtmp *= ldot * omega; |
| 151 |
|
scalecolor(ctmp, dtmp); |
| 152 |
|
addcolor(cval, ctmp); |
| 153 |
|
} |
| 154 |
|
} |
| 155 |
< |
if (ldot < -FTINY && np->tdiff > FTINY) { |
| 156 |
< |
/* |
| 138 |
< |
* Compute diffuse transmission. |
| 139 |
< |
*/ |
| 140 |
< |
copycolor(ctmp, np->mcolor); |
| 141 |
< |
dtmp = -ldot * omega * np->tdiff / PI; |
| 142 |
< |
scalecolor(ctmp, dtmp); |
| 143 |
< |
addcolor(cval, ctmp); |
| 144 |
< |
} |
| 155 |
> |
|
| 156 |
> |
|
| 157 |
|
if (ldot < -FTINY && (np->specfl&(SP_TRAN|SP_PURE)) == SP_TRAN) { |
| 158 |
|
/* |
| 159 |
|
* Compute specular transmission. Specular transmission |
| 160 |
|
* is always modified by material color. |
| 161 |
|
*/ |
| 162 |
|
/* roughness + source */ |
| 163 |
< |
dtmp = np->alpha2 + omega/PI; |
| 164 |
< |
/* gaussian */ |
| 163 |
> |
dtmp = np->alpha2 + omega*(1.0/PI); |
| 164 |
> |
/* Gaussian */ |
| 165 |
|
dtmp = exp((2.*DOT(np->prdir,ldir)-2.)/dtmp)/(PI*dtmp); |
| 166 |
|
/* worth using? */ |
| 167 |
|
if (dtmp > FTINY) { |
| 174 |
|
} |
| 175 |
|
|
| 176 |
|
|
| 177 |
< |
extern int |
| 177 |
> |
int |
| 178 |
|
m_normal( /* color a ray that hit something normal */ |
| 179 |
< |
register OBJREC *m, |
| 180 |
< |
register RAY *r |
| 179 |
> |
OBJREC *m, |
| 180 |
> |
RAY *r |
| 181 |
|
) |
| 182 |
|
{ |
| 183 |
|
NORMDAT nd; |
| 184 |
|
double fest; |
| 173 |
– |
double transtest, transdist; |
| 174 |
– |
double mirtest, mirdist; |
| 185 |
|
int hastexture; |
| 186 |
|
double d; |
| 187 |
|
COLOR ctmp; |
| 188 |
< |
register int i; |
| 188 |
> |
int i; |
| 189 |
> |
|
| 190 |
> |
/* PMAP: skip transmitted shadow ray if accounted for in photon map */ |
| 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); |
| 200 |
|
objerror(m, USER, "bad number of arguments"); |
| 201 |
|
/* check for back side */ |
| 202 |
|
if (r->rod < 0.0) { |
| 203 |
< |
if (!backvis && m->otype != MAT_TRANS) { |
| 203 |
> |
if (!backvis) { |
| 204 |
|
raytrans(r); |
| 205 |
|
return(1); |
| 206 |
|
} |
| 231 |
|
if (nd.pdot < .001) |
| 232 |
|
nd.pdot = .001; /* non-zero for dirnorm() */ |
| 233 |
|
multcolor(nd.mcolor, r->pcol); /* modify material color */ |
| 218 |
– |
mirtest = transtest = 0; |
| 219 |
– |
mirdist = transdist = r->rot; |
| 234 |
|
nd.rspec = m->oargs.farg[3]; |
| 235 |
|
/* compute Fresnel approx. */ |
| 236 |
< |
if (nd.specfl & SP_PURE && nd.rspec > FTINY) { |
| 237 |
< |
fest = FRESNE(r->rod); |
| 236 |
> |
if (nd.specfl & SP_PURE && nd.rspec >= FRESTHRESH) { |
| 237 |
> |
fest = FRESNE(nd.pdot); |
| 238 |
|
nd.rspec += fest*(1. - nd.rspec); |
| 239 |
|
} else |
| 240 |
|
fest = 0.; |
| 249 |
|
if (!(nd.specfl & SP_PURE) && |
| 250 |
|
specthresh >= nd.tspec-FTINY) |
| 251 |
|
nd.specfl |= SP_TBLT; |
| 252 |
< |
if (!hastexture || r->crtype & SHADOW) { |
| 252 |
> |
if (!hastexture || r->crtype & (SHADOW|AMBIENT)) { |
| 253 |
|
VCOPY(nd.prdir, r->rdir); |
| 240 |
– |
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 |
| 262 |
|
} |
| 263 |
|
} else |
| 264 |
|
nd.tdiff = nd.tspec = nd.trans = 0.0; |
| 265 |
+ |
/* diffuse reflection */ |
| 266 |
+ |
nd.rdiff = 1.0 - nd.trans - nd.rspec; |
| 267 |
|
/* transmitted ray */ |
| 268 |
|
if ((nd.specfl&(SP_TRAN|SP_PURE|SP_TBLT)) == (SP_TRAN|SP_PURE)) { |
| 269 |
|
RAY lr; |
| 270 |
< |
if (rayorigin(&lr, r, TRANS, nd.tspec) == 0) { |
| 270 |
> |
copycolor(lr.rcoef, nd.mcolor); /* modified by color */ |
| 271 |
> |
scalecolor(lr.rcoef, nd.tspec); |
| 272 |
> |
if (rayorigin(&lr, TRANS, r, lr.rcoef) == 0) { |
| 273 |
|
VCOPY(lr.rdir, nd.prdir); |
| 274 |
|
rayvalue(&lr); |
| 275 |
< |
scalecolor(lr.rcol, nd.tspec); |
| 259 |
< |
multcolor(lr.rcol, nd.mcolor); /* modified by color */ |
| 275 |
> |
multcolor(lr.rcol, lr.rcoef); |
| 276 |
|
addcolor(r->rcol, lr.rcol); |
| 277 |
< |
transtest *= bright(lr.rcol); |
| 278 |
< |
transdist = r->rot + lr.rt; |
| 277 |
> |
if (nd.tspec >= 1.0-FTINY) { |
| 278 |
> |
/* completely transparent */ |
| 279 |
> |
multcolor(lr.mcol, lr.rcoef); |
| 280 |
> |
copycolor(r->mcol, lr.mcol); |
| 281 |
> |
r->rmt = r->rot + lr.rmt; |
| 282 |
> |
r->rxt = r->rot + lr.rxt; |
| 283 |
> |
} else if (nd.tspec > nd.tdiff + nd.rdiff) |
| 284 |
> |
r->rxt = r->rot + raydistance(&lr); |
| 285 |
|
} |
| 286 |
< |
} else |
| 265 |
< |
transtest = 0; |
| 286 |
> |
} |
| 287 |
|
|
| 288 |
< |
if (r->crtype & SHADOW) { /* the rest is shadow */ |
| 268 |
< |
r->rt = transdist; |
| 288 |
> |
if (r->crtype & SHADOW) /* the rest is shadow */ |
| 289 |
|
return(1); |
| 270 |
– |
} |
| 290 |
|
/* get specular reflection */ |
| 291 |
|
if (nd.rspec > FTINY) { |
| 292 |
|
nd.specfl |= SP_REFL; |
| 294 |
|
if (m->otype != MAT_METAL) { |
| 295 |
|
setcolor(nd.scolor, nd.rspec, nd.rspec, nd.rspec); |
| 296 |
|
} else if (fest > FTINY) { |
| 297 |
< |
d = nd.rspec*(1. - fest); |
| 297 |
> |
d = m->oargs.farg[3]*(1. - fest); |
| 298 |
|
for (i = 0; i < 3; i++) |
| 299 |
< |
nd.scolor[i] = fest + nd.mcolor[i]*d; |
| 299 |
> |
colval(nd.scolor,i) = fest + |
| 300 |
> |
colval(nd.mcolor,i)*d; |
| 301 |
|
} else { |
| 302 |
|
copycolor(nd.scolor, nd.mcolor); |
| 303 |
|
scalecolor(nd.scolor, nd.rspec); |
| 306 |
|
if (!(nd.specfl & SP_PURE) && specthresh >= nd.rspec-FTINY) |
| 307 |
|
nd.specfl |= SP_RBLT; |
| 308 |
|
/* compute reflected ray */ |
| 309 |
< |
for (i = 0; i < 3; i++) |
| 290 |
< |
nd.vrefl[i] = r->rdir[i] + 2.*nd.pdot*nd.pnorm[i]; |
| 309 |
> |
VSUM(nd.vrefl, r->rdir, nd.pnorm, 2.*nd.pdot); |
| 310 |
|
/* penetration? */ |
| 311 |
|
if (hastexture && DOT(nd.vrefl, r->ron) <= FTINY) |
| 312 |
< |
for (i = 0; i < 3; i++) /* safety measure */ |
| 313 |
< |
nd.vrefl[i] = r->rdir[i] + 2.*r->rod*r->ron[i]; |
| 312 |
> |
VSUM(nd.vrefl, r->rdir, r->ron, 2.*r->rod); |
| 313 |
> |
checknorm(nd.vrefl); |
| 314 |
|
} |
| 315 |
|
/* reflected ray */ |
| 316 |
|
if ((nd.specfl&(SP_REFL|SP_PURE|SP_RBLT)) == (SP_REFL|SP_PURE)) { |
| 317 |
|
RAY lr; |
| 318 |
< |
if (rayorigin(&lr, r, REFLECTED, nd.rspec) == 0) { |
| 318 |
> |
if (rayorigin(&lr, REFLECTED, r, nd.scolor) == 0) { |
| 319 |
|
VCOPY(lr.rdir, nd.vrefl); |
| 320 |
|
rayvalue(&lr); |
| 321 |
< |
multcolor(lr.rcol, nd.scolor); |
| 321 |
> |
multcolor(lr.rcol, lr.rcoef); |
| 322 |
> |
copycolor(r->mcol, lr.rcol); |
| 323 |
|
addcolor(r->rcol, lr.rcol); |
| 324 |
< |
if (!hastexture && nd.specfl & SP_FLAT) { |
| 325 |
< |
mirtest = 2.*bright(lr.rcol); |
| 326 |
< |
mirdist = r->rot + lr.rt; |
| 327 |
< |
} |
| 324 |
> |
r->rmt = r->rot; |
| 325 |
> |
if (nd.specfl & SP_FLAT && |
| 326 |
> |
!hastexture | (r->crtype & AMBIENT)) |
| 327 |
> |
r->rmt += raydistance(&lr); |
| 328 |
|
} |
| 329 |
|
} |
| 310 |
– |
/* diffuse reflection */ |
| 311 |
– |
nd.rdiff = 1.0 - nd.trans - nd.rspec; |
| 330 |
|
|
| 331 |
|
if (nd.specfl & SP_PURE && nd.rdiff <= FTINY && nd.tdiff <= FTINY) |
| 332 |
|
return(1); /* 100% pure specular */ |
| 333 |
|
|
| 334 |
|
if (!(nd.specfl & SP_PURE)) |
| 335 |
< |
gaussamp(r, &nd); /* checks *BLT flags */ |
| 335 |
> |
gaussamp(&nd); /* checks *BLT flags */ |
| 336 |
|
|
| 337 |
|
if (nd.rdiff > FTINY) { /* ambient from this side */ |
| 338 |
< |
ambient(ctmp, r, hastexture?nd.pnorm:r->ron); |
| 339 |
< |
if (nd.specfl & SP_RBLT) |
| 340 |
< |
scalecolor(ctmp, 1.0-nd.trans); |
| 341 |
< |
else |
| 342 |
< |
scalecolor(ctmp, nd.rdiff); |
| 325 |
< |
multcolor(ctmp, nd.mcolor); /* modified by material color */ |
| 338 |
> |
copycolor(ctmp, nd.mcolor); /* modified by material color */ |
| 339 |
> |
scalecolor(ctmp, nd.rdiff); |
| 340 |
> |
if (nd.specfl & SP_RBLT) /* add in specular as well? */ |
| 341 |
> |
addcolor(ctmp, nd.scolor); |
| 342 |
> |
multambient(ctmp, r, hastexture ? nd.pnorm : r->ron); |
| 343 |
|
addcolor(r->rcol, ctmp); /* add to returned color */ |
| 344 |
|
} |
| 345 |
|
if (nd.tdiff > FTINY) { /* ambient from other side */ |
| 346 |
+ |
copycolor(ctmp, nd.mcolor); /* modified by color */ |
| 347 |
+ |
if (nd.specfl & SP_TBLT) |
| 348 |
+ |
scalecolor(ctmp, nd.trans); |
| 349 |
+ |
else |
| 350 |
+ |
scalecolor(ctmp, nd.tdiff); |
| 351 |
|
flipsurface(r); |
| 352 |
|
if (hastexture) { |
| 353 |
|
FVECT bnorm; |
| 354 |
|
bnorm[0] = -nd.pnorm[0]; |
| 355 |
|
bnorm[1] = -nd.pnorm[1]; |
| 356 |
|
bnorm[2] = -nd.pnorm[2]; |
| 357 |
< |
ambient(ctmp, r, bnorm); |
| 357 |
> |
multambient(ctmp, r, bnorm); |
| 358 |
|
} else |
| 359 |
< |
ambient(ctmp, r, r->ron); |
| 338 |
< |
if (nd.specfl & SP_TBLT) |
| 339 |
< |
scalecolor(ctmp, nd.trans); |
| 340 |
< |
else |
| 341 |
< |
scalecolor(ctmp, nd.tdiff); |
| 342 |
< |
multcolor(ctmp, nd.mcolor); /* modified by color */ |
| 359 |
> |
multambient(ctmp, r, r->ron); |
| 360 |
|
addcolor(r->rcol, ctmp); |
| 361 |
|
flipsurface(r); |
| 362 |
|
} |
| 363 |
|
/* add direct component */ |
| 364 |
|
direct(r, dirnorm, &nd); |
| 348 |
– |
/* check distance */ |
| 349 |
– |
d = bright(r->rcol); |
| 350 |
– |
if (transtest > d) |
| 351 |
– |
r->rt = transdist; |
| 352 |
– |
else if (mirtest > d) |
| 353 |
– |
r->rt = mirdist; |
| 365 |
|
|
| 366 |
|
return(1); |
| 367 |
|
} |
| 368 |
|
|
| 369 |
|
|
| 370 |
|
static void |
| 371 |
< |
gaussamp( /* sample gaussian specular */ |
| 372 |
< |
RAY *r, |
| 362 |
< |
register NORMDAT *np |
| 371 |
> |
gaussamp( /* sample Gaussian specular */ |
| 372 |
> |
NORMDAT *np |
| 373 |
|
) |
| 374 |
|
{ |
| 375 |
|
RAY sr; |
| 376 |
|
FVECT u, v, h; |
| 377 |
|
double rv[2]; |
| 378 |
|
double d, sinp, cosp; |
| 379 |
< |
int niter; |
| 380 |
< |
register int i; |
| 379 |
> |
COLOR scol; |
| 380 |
> |
int maxiter, ntrials, nstarget, nstaken; |
| 381 |
> |
int i; |
| 382 |
|
/* quick test */ |
| 383 |
|
if ((np->specfl & (SP_REFL|SP_RBLT)) != SP_REFL && |
| 384 |
|
(np->specfl & (SP_TRAN|SP_TBLT)) != SP_TRAN) |
| 385 |
|
return; |
| 386 |
|
/* set up sample coordinates */ |
| 387 |
< |
v[0] = v[1] = v[2] = 0.0; |
| 377 |
< |
for (i = 0; i < 3; i++) |
| 378 |
< |
if (np->pnorm[i] < 0.6 && np->pnorm[i] > -0.6) |
| 379 |
< |
break; |
| 380 |
< |
v[i] = 1.0; |
| 381 |
< |
fcross(u, v, np->pnorm); |
| 382 |
< |
normalize(u); |
| 387 |
> |
getperpendicular(u, np->pnorm, rand_samp); |
| 388 |
|
fcross(v, np->pnorm, u); |
| 389 |
|
/* compute reflection */ |
| 390 |
|
if ((np->specfl & (SP_REFL|SP_RBLT)) == SP_REFL && |
| 391 |
< |
rayorigin(&sr, r, SPECULAR, np->rspec) == 0) { |
| 392 |
< |
dimlist[ndims++] = (int)np->mp; |
| 393 |
< |
for (niter = 0; niter < MAXITER; niter++) { |
| 394 |
< |
if (niter) |
| 391 |
> |
rayorigin(&sr, SPECULAR, np->rp, np->scolor) == 0) { |
| 392 |
> |
nstarget = 1; |
| 393 |
> |
if (specjitter > 1.5) { /* multiple samples? */ |
| 394 |
> |
nstarget = specjitter*np->rp->rweight + .5; |
| 395 |
> |
if (sr.rweight <= minweight*nstarget) |
| 396 |
> |
nstarget = sr.rweight/minweight; |
| 397 |
> |
if (nstarget > 1) { |
| 398 |
> |
d = 1./nstarget; |
| 399 |
> |
scalecolor(sr.rcoef, d); |
| 400 |
> |
sr.rweight *= d; |
| 401 |
> |
} else |
| 402 |
> |
nstarget = 1; |
| 403 |
> |
} |
| 404 |
> |
setcolor(scol, 0., 0., 0.); |
| 405 |
> |
dimlist[ndims++] = (int)(size_t)np->mp; |
| 406 |
> |
maxiter = MAXITER*nstarget; |
| 407 |
> |
for (nstaken = ntrials = 0; nstaken < nstarget && |
| 408 |
> |
ntrials < maxiter; ntrials++) { |
| 409 |
> |
if (ntrials) |
| 410 |
|
d = frandom(); |
| 411 |
|
else |
| 412 |
|
d = urand(ilhash(dimlist,ndims)+samplendx); |
| 414 |
|
d = 2.0*PI * rv[0]; |
| 415 |
|
cosp = tcos(d); |
| 416 |
|
sinp = tsin(d); |
| 417 |
< |
rv[1] = 1.0 - specjitter*rv[1]; |
| 417 |
> |
if ((0. <= specjitter) & (specjitter < 1.)) |
| 418 |
> |
rv[1] = 1.0 - specjitter*rv[1]; |
| 419 |
|
if (rv[1] <= FTINY) |
| 420 |
|
d = 1.0; |
| 421 |
|
else |
| 422 |
|
d = sqrt( np->alpha2 * -log(rv[1]) ); |
| 423 |
|
for (i = 0; i < 3; i++) |
| 424 |
|
h[i] = np->pnorm[i] + d*(cosp*u[i] + sinp*v[i]); |
| 425 |
< |
d = -2.0 * DOT(h, r->rdir) / (1.0 + d*d); |
| 426 |
< |
for (i = 0; i < 3; i++) |
| 427 |
< |
sr.rdir[i] = r->rdir[i] + d*h[i]; |
| 428 |
< |
if (DOT(sr.rdir, r->ron) > FTINY) { |
| 425 |
> |
d = -2.0 * DOT(h, np->rp->rdir) / (1.0 + d*d); |
| 426 |
> |
VSUM(sr.rdir, np->rp->rdir, h, d); |
| 427 |
> |
/* sample rejection test */ |
| 428 |
> |
if ((d = DOT(sr.rdir, np->rp->ron)) <= FTINY) |
| 429 |
> |
continue; |
| 430 |
> |
checknorm(sr.rdir); |
| 431 |
> |
if (nstarget > 1) { /* W-G-M-D adjustment */ |
| 432 |
> |
if (nstaken) rayclear(&sr); |
| 433 |
|
rayvalue(&sr); |
| 434 |
< |
multcolor(sr.rcol, np->scolor); |
| 435 |
< |
addcolor(r->rcol, sr.rcol); |
| 436 |
< |
break; |
| 434 |
> |
d = 2./(1. + np->rp->rod/d); |
| 435 |
> |
scalecolor(sr.rcol, d); |
| 436 |
> |
addcolor(scol, sr.rcol); |
| 437 |
> |
} else { |
| 438 |
> |
rayvalue(&sr); |
| 439 |
> |
multcolor(sr.rcol, sr.rcoef); |
| 440 |
> |
addcolor(np->rp->rcol, sr.rcol); |
| 441 |
|
} |
| 442 |
+ |
++nstaken; |
| 443 |
|
} |
| 444 |
+ |
if (nstarget > 1) { /* final W-G-M-D weighting */ |
| 445 |
+ |
multcolor(scol, sr.rcoef); |
| 446 |
+ |
d = (double)nstarget/ntrials; |
| 447 |
+ |
scalecolor(scol, d); |
| 448 |
+ |
addcolor(np->rp->rcol, scol); |
| 449 |
+ |
} |
| 450 |
|
ndims--; |
| 451 |
|
} |
| 452 |
|
/* compute transmission */ |
| 453 |
+ |
copycolor(sr.rcoef, np->mcolor); /* modified by color */ |
| 454 |
+ |
scalecolor(sr.rcoef, np->tspec); |
| 455 |
|
if ((np->specfl & (SP_TRAN|SP_TBLT)) == SP_TRAN && |
| 456 |
< |
rayorigin(&sr, r, SPECULAR, np->tspec) == 0) { |
| 457 |
< |
dimlist[ndims++] = (int)np->mp; |
| 458 |
< |
for (niter = 0; niter < MAXITER; niter++) { |
| 459 |
< |
if (niter) |
| 456 |
> |
rayorigin(&sr, SPECULAR, np->rp, sr.rcoef) == 0) { |
| 457 |
> |
nstarget = 1; |
| 458 |
> |
if (specjitter > 1.5) { /* multiple samples? */ |
| 459 |
> |
nstarget = specjitter*np->rp->rweight + .5; |
| 460 |
> |
if (sr.rweight <= minweight*nstarget) |
| 461 |
> |
nstarget = sr.rweight/minweight; |
| 462 |
> |
if (nstarget > 1) { |
| 463 |
> |
d = 1./nstarget; |
| 464 |
> |
scalecolor(sr.rcoef, d); |
| 465 |
> |
sr.rweight *= d; |
| 466 |
> |
} else |
| 467 |
> |
nstarget = 1; |
| 468 |
> |
} |
| 469 |
> |
dimlist[ndims++] = (int)(size_t)np->mp; |
| 470 |
> |
maxiter = MAXITER*nstarget; |
| 471 |
> |
for (nstaken = ntrials = 0; nstaken < nstarget && |
| 472 |
> |
ntrials < maxiter; ntrials++) { |
| 473 |
> |
if (ntrials) |
| 474 |
|
d = frandom(); |
| 475 |
|
else |
| 476 |
< |
d = urand(ilhash(dimlist,ndims)+1823+samplendx); |
| 476 |
> |
d = urand(ilhash(dimlist,ndims)+samplendx); |
| 477 |
|
multisamp(rv, 2, d); |
| 478 |
|
d = 2.0*PI * rv[0]; |
| 479 |
|
cosp = tcos(d); |
| 480 |
|
sinp = tsin(d); |
| 481 |
< |
rv[1] = 1.0 - specjitter*rv[1]; |
| 481 |
> |
if ((0. <= specjitter) & (specjitter < 1.)) |
| 482 |
> |
rv[1] = 1.0 - specjitter*rv[1]; |
| 483 |
|
if (rv[1] <= FTINY) |
| 484 |
|
d = 1.0; |
| 485 |
|
else |
| 486 |
|
d = sqrt( np->alpha2 * -log(rv[1]) ); |
| 487 |
|
for (i = 0; i < 3; i++) |
| 488 |
|
sr.rdir[i] = np->prdir[i] + d*(cosp*u[i] + sinp*v[i]); |
| 489 |
< |
if (DOT(sr.rdir, r->ron) < -FTINY) { |
| 490 |
< |
normalize(sr.rdir); /* OK, normalize */ |
| 491 |
< |
rayvalue(&sr); |
| 492 |
< |
scalecolor(sr.rcol, np->tspec); |
| 493 |
< |
multcolor(sr.rcol, np->mcolor); /* modified */ |
| 494 |
< |
addcolor(r->rcol, sr.rcol); |
| 495 |
< |
break; |
| 496 |
< |
} |
| 489 |
> |
/* sample rejection test */ |
| 490 |
> |
if (DOT(sr.rdir, np->rp->ron) >= -FTINY) |
| 491 |
> |
continue; |
| 492 |
> |
normalize(sr.rdir); /* OK, normalize */ |
| 493 |
> |
if (nstaken) /* multi-sampling */ |
| 494 |
> |
rayclear(&sr); |
| 495 |
> |
rayvalue(&sr); |
| 496 |
> |
multcolor(sr.rcol, sr.rcoef); |
| 497 |
> |
addcolor(np->rp->rcol, sr.rcol); |
| 498 |
> |
++nstaken; |
| 499 |
|
} |
| 500 |
|
ndims--; |
| 501 |
|
} |
