65 |
|
double pdot; /* perturbed dot product */ |
66 |
|
} NORMDAT; /* normal material data */ |
67 |
|
|
68 |
– |
static srcdirf_t dirnorm; |
68 |
|
static void gaussamp(RAY *r, NORMDAT *np); |
69 |
|
|
70 |
|
|
71 |
|
static void |
72 |
|
dirnorm( /* compute source contribution */ |
73 |
|
COLOR cval, /* returned coefficient */ |
74 |
< |
void *nnp, /* material data */ |
74 |
> |
void *nnp, /* material data */ |
75 |
|
FVECT ldir, /* light source direction */ |
76 |
|
double omega /* light source size */ |
77 |
|
) |
78 |
|
{ |
79 |
< |
register NORMDAT *np = nnp; |
79 |
> |
NORMDAT *np = nnp; |
80 |
|
double ldot; |
81 |
|
double lrdiff, ltdiff; |
82 |
|
double dtmp, d2, d3, d4; |
122 |
|
if (np->specfl & SP_FLAT) |
123 |
|
dtmp += omega * (0.25/PI); |
124 |
|
/* half vector */ |
125 |
< |
vtmp[0] = ldir[0] - np->rp->rdir[0]; |
127 |
< |
vtmp[1] = ldir[1] - np->rp->rdir[1]; |
128 |
< |
vtmp[2] = ldir[2] - np->rp->rdir[2]; |
125 |
> |
VSUB(vtmp, ldir, np->rp->rdir); |
126 |
|
d2 = DOT(vtmp, np->pnorm); |
127 |
|
d2 *= d2; |
128 |
|
d3 = DOT(vtmp,vtmp); |
166 |
|
} |
167 |
|
|
168 |
|
|
169 |
< |
extern int |
169 |
> |
int |
170 |
|
m_normal( /* color a ray that hit something normal */ |
171 |
< |
register OBJREC *m, |
172 |
< |
register RAY *r |
171 |
> |
OBJREC *m, |
172 |
> |
RAY *r |
173 |
|
) |
174 |
|
{ |
175 |
|
NORMDAT nd; |
179 |
|
int hastexture; |
180 |
|
double d; |
181 |
|
COLOR ctmp; |
182 |
< |
register int i; |
182 |
> |
int i; |
183 |
|
/* easy shadow test */ |
184 |
|
if (r->crtype & SHADOW && m->otype != MAT_TRANS) |
185 |
|
return(1); |
224 |
|
nd.rspec = m->oargs.farg[3]; |
225 |
|
/* compute Fresnel approx. */ |
226 |
|
if (nd.specfl & SP_PURE && nd.rspec >= FRESTHRESH) { |
227 |
< |
fest = FRESNE(r->rod); |
227 |
> |
fest = FRESNE(nd.pdot); |
228 |
|
nd.rspec += fest*(1. - nd.rspec); |
229 |
|
} else |
230 |
|
fest = 0.; |
322 |
|
|
323 |
|
if (nd.rdiff > FTINY) { /* ambient from this side */ |
324 |
|
copycolor(ctmp, nd.mcolor); /* modified by material color */ |
325 |
< |
if (nd.specfl & SP_RBLT) |
326 |
< |
scalecolor(ctmp, 1.0-nd.trans); |
327 |
< |
else |
331 |
< |
scalecolor(ctmp, nd.rdiff); |
325 |
> |
scalecolor(ctmp, nd.rdiff); |
326 |
> |
if (nd.specfl & SP_RBLT) /* add in specular as well? */ |
327 |
> |
addcolor(ctmp, nd.scolor); |
328 |
|
multambient(ctmp, r, hastexture ? nd.pnorm : r->ron); |
329 |
|
addcolor(r->rcol, ctmp); /* add to returned color */ |
330 |
|
} |
362 |
|
static void |
363 |
|
gaussamp( /* sample Gaussian specular */ |
364 |
|
RAY *r, |
365 |
< |
register NORMDAT *np |
365 |
> |
NORMDAT *np |
366 |
|
) |
367 |
|
{ |
368 |
|
RAY sr; |
369 |
|
FVECT u, v, h; |
370 |
|
double rv[2]; |
371 |
|
double d, sinp, cosp; |
372 |
< |
COLOR scol; |
372 |
> |
COLOR scol; |
373 |
|
int maxiter, ntrials, nstarget, nstaken; |
374 |
< |
register int i; |
374 |
> |
int i; |
375 |
|
/* quick test */ |
376 |
|
if ((np->specfl & (SP_REFL|SP_RBLT)) != SP_REFL && |
377 |
|
(np->specfl & (SP_TRAN|SP_TBLT)) != SP_TRAN) |
401 |
|
nstarget = 1; |
402 |
|
} |
403 |
|
setcolor(scol, 0., 0., 0.); |
404 |
< |
dimlist[ndims++] = (int)np->mp; |
404 |
> |
dimlist[ndims++] = (int)(size_t)np->mp; |
405 |
|
maxiter = MAXITER*nstarget; |
406 |
|
for (nstaken = ntrials = 0; nstaken < nstarget && |
407 |
|
ntrials < maxiter; ntrials++) { |
428 |
|
continue; |
429 |
|
checknorm(sr.rdir); |
430 |
|
if (nstarget > 1) { /* W-G-M-D adjustment */ |
431 |
< |
rayclear(&sr); |
431 |
> |
if (nstaken) rayclear(&sr); |
432 |
|
rayvalue(&sr); |
433 |
|
d = 2./(1. + r->rod/d); |
434 |
|
scalecolor(sr.rcol, d); |
465 |
|
} else |
466 |
|
nstarget = 1; |
467 |
|
} |
468 |
< |
dimlist[ndims++] = (int)np->mp; |
468 |
> |
dimlist[ndims++] = (int)(size_t)np->mp; |
469 |
|
maxiter = MAXITER*nstarget; |
470 |
|
for (nstaken = ntrials = 0; nstaken < nstarget && |
471 |
|
ntrials < maxiter; ntrials++) { |
489 |
|
if (DOT(sr.rdir, r->ron) >= -FTINY) |
490 |
|
continue; |
491 |
|
normalize(sr.rdir); /* OK, normalize */ |
492 |
< |
if (nstarget > 1) /* multi-sampling */ |
492 |
> |
if (nstaken) /* multi-sampling */ |
493 |
|
rayclear(&sr); |
494 |
|
rayvalue(&sr); |
495 |
|
multcolor(sr.rcol, sr.rcoef); |