65 |
|
double pdot; /* perturbed dot product */ |
66 |
|
} NORMDAT; /* normal material data */ |
67 |
|
|
68 |
< |
static void gaussamp(RAY *r, NORMDAT *np); |
68 |
> |
static void gaussamp(NORMDAT *np); |
69 |
|
|
70 |
|
|
71 |
|
static void |
280 |
|
if (m->otype != MAT_METAL) { |
281 |
|
setcolor(nd.scolor, nd.rspec, nd.rspec, nd.rspec); |
282 |
|
} else if (fest > FTINY) { |
283 |
< |
d = nd.rspec*(1. - fest); |
283 |
> |
d = m->oargs.farg[3]*(1. - fest); |
284 |
|
for (i = 0; i < 3; i++) |
285 |
< |
nd.scolor[i] = fest + nd.mcolor[i]*d; |
285 |
> |
colval(nd.scolor,i) = fest + |
286 |
> |
colval(nd.mcolor,i)*d; |
287 |
|
} else { |
288 |
|
copycolor(nd.scolor, nd.mcolor); |
289 |
|
scalecolor(nd.scolor, nd.rspec); |
319 |
|
return(1); /* 100% pure specular */ |
320 |
|
|
321 |
|
if (!(nd.specfl & SP_PURE)) |
322 |
< |
gaussamp(r, &nd); /* checks *BLT flags */ |
322 |
> |
gaussamp(&nd); /* checks *BLT flags */ |
323 |
|
|
324 |
|
if (nd.rdiff > FTINY) { /* ambient from this side */ |
325 |
|
copycolor(ctmp, nd.mcolor); /* modified by material color */ |
362 |
|
|
363 |
|
static void |
364 |
|
gaussamp( /* sample Gaussian specular */ |
364 |
– |
RAY *r, |
365 |
|
NORMDAT *np |
366 |
|
) |
367 |
|
{ |
387 |
|
fcross(v, np->pnorm, u); |
388 |
|
/* compute reflection */ |
389 |
|
if ((np->specfl & (SP_REFL|SP_RBLT)) == SP_REFL && |
390 |
< |
rayorigin(&sr, SPECULAR, r, np->scolor) == 0) { |
390 |
> |
rayorigin(&sr, SPECULAR, np->rp, np->scolor) == 0) { |
391 |
|
nstarget = 1; |
392 |
|
if (specjitter > 1.5) { /* multiple samples? */ |
393 |
< |
nstarget = specjitter*r->rweight + .5; |
393 |
> |
nstarget = specjitter*np->rp->rweight + .5; |
394 |
|
if (sr.rweight <= minweight*nstarget) |
395 |
|
nstarget = sr.rweight/minweight; |
396 |
|
if (nstarget > 1) { |
421 |
|
d = sqrt( np->alpha2 * -log(rv[1]) ); |
422 |
|
for (i = 0; i < 3; i++) |
423 |
|
h[i] = np->pnorm[i] + d*(cosp*u[i] + sinp*v[i]); |
424 |
< |
d = -2.0 * DOT(h, r->rdir) / (1.0 + d*d); |
425 |
< |
VSUM(sr.rdir, r->rdir, h, d); |
424 |
> |
d = -2.0 * DOT(h, np->rp->rdir) / (1.0 + d*d); |
425 |
> |
VSUM(sr.rdir, np->rp->rdir, h, d); |
426 |
|
/* sample rejection test */ |
427 |
< |
if ((d = DOT(sr.rdir, r->ron)) <= FTINY) |
427 |
> |
if ((d = DOT(sr.rdir, np->rp->ron)) <= FTINY) |
428 |
|
continue; |
429 |
|
checknorm(sr.rdir); |
430 |
|
if (nstarget > 1) { /* W-G-M-D adjustment */ |
431 |
|
if (nstaken) rayclear(&sr); |
432 |
|
rayvalue(&sr); |
433 |
< |
d = 2./(1. + r->rod/d); |
433 |
> |
d = 2./(1. + np->rp->rod/d); |
434 |
|
scalecolor(sr.rcol, d); |
435 |
|
addcolor(scol, sr.rcol); |
436 |
|
} else { |
437 |
|
rayvalue(&sr); |
438 |
|
multcolor(sr.rcol, sr.rcoef); |
439 |
< |
addcolor(r->rcol, sr.rcol); |
439 |
> |
addcolor(np->rp->rcol, sr.rcol); |
440 |
|
} |
441 |
|
++nstaken; |
442 |
|
} |
444 |
|
multcolor(scol, sr.rcoef); |
445 |
|
d = (double)nstarget/ntrials; |
446 |
|
scalecolor(scol, d); |
447 |
< |
addcolor(r->rcol, scol); |
447 |
> |
addcolor(np->rp->rcol, scol); |
448 |
|
} |
449 |
|
ndims--; |
450 |
|
} |
452 |
|
copycolor(sr.rcoef, np->mcolor); /* modified by color */ |
453 |
|
scalecolor(sr.rcoef, np->tspec); |
454 |
|
if ((np->specfl & (SP_TRAN|SP_TBLT)) == SP_TRAN && |
455 |
< |
rayorigin(&sr, SPECULAR, r, sr.rcoef) == 0) { |
455 |
> |
rayorigin(&sr, SPECULAR, np->rp, sr.rcoef) == 0) { |
456 |
|
nstarget = 1; |
457 |
|
if (specjitter > 1.5) { /* multiple samples? */ |
458 |
< |
nstarget = specjitter*r->rweight + .5; |
458 |
> |
nstarget = specjitter*np->rp->rweight + .5; |
459 |
|
if (sr.rweight <= minweight*nstarget) |
460 |
|
nstarget = sr.rweight/minweight; |
461 |
|
if (nstarget > 1) { |
486 |
|
for (i = 0; i < 3; i++) |
487 |
|
sr.rdir[i] = np->prdir[i] + d*(cosp*u[i] + sinp*v[i]); |
488 |
|
/* sample rejection test */ |
489 |
< |
if (DOT(sr.rdir, r->ron) >= -FTINY) |
489 |
> |
if (DOT(sr.rdir, np->rp->ron) >= -FTINY) |
490 |
|
continue; |
491 |
|
normalize(sr.rdir); /* OK, normalize */ |
492 |
|
if (nstaken) /* multi-sampling */ |
493 |
|
rayclear(&sr); |
494 |
|
rayvalue(&sr); |
495 |
|
multcolor(sr.rcol, sr.rcoef); |
496 |
< |
addcolor(r->rcol, sr.rcol); |
496 |
> |
addcolor(np->rp->rcol, sr.rcol); |
497 |
|
++nstaken; |
498 |
|
} |
499 |
|
ndims--; |