| 50 |
|
|
| 51 |
|
typedef struct { |
| 52 |
|
OBJREC *mp; /* material pointer */ |
| 53 |
+ |
RAY *rp; /* ray pointer */ |
| 54 |
|
short specfl; /* specularity flags, defined above */ |
| 55 |
|
COLOR mcolor; /* color of this material */ |
| 56 |
|
COLOR scolor; /* color of specular component */ |
| 72 |
|
double omega; /* light source size */ |
| 73 |
|
{ |
| 74 |
|
double ldot; |
| 75 |
< |
double dtmp; |
| 76 |
< |
int i; |
| 75 |
> |
double dtmp, d2; |
| 76 |
> |
FVECT vtmp; |
| 77 |
> |
register int i; |
| 78 |
|
COLOR ctmp; |
| 79 |
|
|
| 80 |
|
setcolor(cval, 0.0, 0.0, 0.0); |
| 101 |
|
* gaussian distribution model. |
| 102 |
|
*/ |
| 103 |
|
/* roughness */ |
| 104 |
< |
dtmp = 2.0*np->alpha2; |
| 104 |
> |
dtmp = np->alpha2; |
| 105 |
|
/* + source if flat */ |
| 106 |
|
if (np->specfl & SP_FLAT) |
| 107 |
< |
dtmp += omega/(2.0*PI); |
| 107 |
> |
dtmp += omega/(4.0*PI); |
| 108 |
> |
/* delta */ |
| 109 |
> |
for (i = 0; i < 3; i++) |
| 110 |
> |
vtmp[i] = ldir[i] - np->rp->rdir[i]; |
| 111 |
> |
d2 = DOT(vtmp, np->pnorm); |
| 112 |
> |
d2 = 2.0 - 2.0*d2/sqrt(DOT(vtmp,vtmp)); |
| 113 |
|
/* gaussian */ |
| 114 |
< |
dtmp = exp((DOT(np->vrefl,ldir)-1.)/dtmp)/(2.*PI)/dtmp; |
| 114 |
> |
dtmp = exp(-d2/dtmp)/(4.*PI*dtmp); |
| 115 |
|
/* worth using? */ |
| 116 |
|
if (dtmp > FTINY) { |
| 117 |
|
copycolor(ctmp, np->scolor); |
| 118 |
< |
dtmp *= omega / np->pdot; |
| 118 |
> |
dtmp *= omega * sqrt(ldot/np->pdot); |
| 119 |
|
scalecolor(ctmp, dtmp); |
| 120 |
|
addcolor(cval, ctmp); |
| 121 |
|
} |
| 141 |
|
/* worth using? */ |
| 142 |
|
if (dtmp > FTINY) { |
| 143 |
|
copycolor(ctmp, np->mcolor); |
| 144 |
< |
dtmp *= np->tspec * omega / np->pdot; |
| 144 |
> |
dtmp *= np->tspec * omega * sqrt(ldot/np->pdot); |
| 145 |
|
scalecolor(ctmp, dtmp); |
| 146 |
|
addcolor(cval, ctmp); |
| 147 |
|
} |
| 165 |
|
if (m->oargs.nfargs != (m->otype == MAT_TRANS ? 7 : 5)) |
| 166 |
|
objerror(m, USER, "bad number of arguments"); |
| 167 |
|
nd.mp = m; |
| 168 |
+ |
nd.rp = r; |
| 169 |
|
/* get material color */ |
| 170 |
|
setcolor(nd.mcolor, m->oargs.farg[0], |
| 171 |
|
m->oargs.farg[1], |
| 194 |
|
else |
| 195 |
|
setcolor(nd.scolor, 1.0, 1.0, 1.0); |
| 196 |
|
scalecolor(nd.scolor, nd.rspec); |
| 197 |
< |
if (nd.specfl & SP_PURE) { /* improved model */ |
| 198 |
< |
dtmp = exp(-BSPEC(m)*nd.pdot); |
| 199 |
< |
for (i = 0; i < 3; i++) |
| 200 |
< |
colval(nd.scolor,i) += |
| 201 |
< |
(1.0-colval(nd.scolor,i))*dtmp; |
| 202 |
< |
nd.rspec += (1.0-nd.rspec)*dtmp; |
| 203 |
< |
} else if (specthresh > FTINY && /* check threshold */ |
| 197 |
> |
/* improved model */ |
| 198 |
> |
dtmp = exp(-BSPEC(m)*nd.pdot); |
| 199 |
> |
for (i = 0; i < 3; i++) |
| 200 |
> |
colval(nd.scolor,i) += (1.0-colval(nd.scolor,i))*dtmp; |
| 201 |
> |
nd.rspec += (1.0-nd.rspec)*dtmp; |
| 202 |
> |
/* check threshold */ |
| 203 |
> |
if (!(nd.specfl & SP_PURE) && |
| 204 |
> |
specthresh > FTINY && |
| 205 |
|
(specthresh >= 1.-FTINY || |
| 206 |
|
specthresh > nd.rspec)) |
| 207 |
|
nd.specfl |= SP_RBLT; |
