78 |
|
{ |
79 |
|
register NORMDAT *np = nnp; |
80 |
|
double ldot; |
81 |
< |
double ldiff; |
81 |
> |
double lrdiff, ltdiff; |
82 |
|
double dtmp, d2; |
83 |
|
FVECT vtmp; |
84 |
|
COLOR ctmp; |
91 |
|
return; /* wrong side */ |
92 |
|
|
93 |
|
/* Fresnel estimate */ |
94 |
< |
ldiff = np->rdiff; |
95 |
< |
if (np->specfl & SP_PURE && (np->rspec > FTINY) & (ldiff > FTINY)) |
96 |
< |
ldiff *= 1. - FRESNE(fabs(ldot)); |
94 |
> |
lrdiff = np->rdiff; |
95 |
> |
ltdiff = np->tdiff; |
96 |
> |
if (np->specfl & SP_PURE && np->rspec > FTINY && |
97 |
> |
(lrdiff > FTINY) | (ltdiff > FTINY)) { |
98 |
> |
dtmp = 1. - FRESNE(fabs(ldot)); |
99 |
> |
lrdiff *= dtmp; |
100 |
> |
ltdiff *= dtmp; |
101 |
> |
} |
102 |
|
|
103 |
< |
if (ldot > FTINY && ldiff > FTINY) { |
103 |
> |
if (ldot > FTINY && lrdiff > FTINY) { |
104 |
|
/* |
105 |
|
* Compute and add diffuse reflected component to returned |
106 |
|
* color. The diffuse reflected component will always be |
107 |
|
* modified by the color of the material. |
108 |
|
*/ |
109 |
|
copycolor(ctmp, np->mcolor); |
110 |
< |
dtmp = ldot * omega * ldiff / PI; |
110 |
> |
dtmp = ldot * omega * lrdiff * (1.0/PI); |
111 |
|
scalecolor(ctmp, dtmp); |
112 |
|
addcolor(cval, ctmp); |
113 |
|
} |
120 |
|
dtmp = np->alpha2; |
121 |
|
/* + source if flat */ |
122 |
|
if (np->specfl & SP_FLAT) |
123 |
< |
dtmp += omega/(4.0*PI); |
123 |
> |
dtmp += omega * (0.25/PI); |
124 |
|
/* half vector */ |
125 |
|
vtmp[0] = ldir[0] - np->rp->rdir[0]; |
126 |
|
vtmp[1] = ldir[1] - np->rp->rdir[1]; |
129 |
|
d2 *= d2; |
130 |
|
d2 = (DOT(vtmp,vtmp) - d2) / d2; |
131 |
|
/* gaussian */ |
132 |
< |
dtmp = exp(-d2/dtmp)/(4.*PI*dtmp); |
132 |
> |
dtmp = exp(-d2/dtmp)/(4.*PI * np->pdot * dtmp); |
133 |
|
/* worth using? */ |
134 |
|
if (dtmp > FTINY) { |
135 |
|
copycolor(ctmp, np->scolor); |
136 |
< |
dtmp *= omega * sqrt(ldot/np->pdot); |
136 |
> |
dtmp *= omega; |
137 |
|
scalecolor(ctmp, dtmp); |
138 |
|
addcolor(cval, ctmp); |
139 |
|
} |
140 |
|
} |
141 |
< |
if (ldot < -FTINY && np->tdiff > FTINY) { |
141 |
> |
if (ldot < -FTINY && ltdiff > FTINY) { |
142 |
|
/* |
143 |
|
* Compute diffuse transmission. |
144 |
|
*/ |
145 |
|
copycolor(ctmp, np->mcolor); |
146 |
< |
dtmp = -ldot * omega * np->tdiff / PI; |
146 |
> |
dtmp = -ldot * omega * ltdiff * (1.0/PI); |
147 |
|
scalecolor(ctmp, dtmp); |
148 |
|
addcolor(cval, ctmp); |
149 |
|
} |
153 |
|
* is always modified by material color. |
154 |
|
*/ |
155 |
|
/* roughness + source */ |
156 |
< |
dtmp = np->alpha2 + omega/PI; |
156 |
> |
dtmp = np->alpha2 + omega*(1.0/PI); |
157 |
|
/* gaussian */ |
158 |
< |
dtmp = exp((2.*DOT(np->prdir,ldir)-2.)/dtmp)/(PI*dtmp); |
158 |
> |
dtmp = exp((2.*DOT(np->prdir,ldir)-2.)/dtmp) / |
159 |
> |
(PI*np->pdot*dtmp); |
160 |
|
/* worth using? */ |
161 |
|
if (dtmp > FTINY) { |
162 |
|
copycolor(ctmp, np->mcolor); |
163 |
< |
dtmp *= np->tspec * omega * sqrt(-ldot/np->pdot); |
163 |
> |
dtmp *= np->tspec * omega; |
164 |
|
scalecolor(ctmp, dtmp); |
165 |
|
addcolor(cval, ctmp); |
166 |
|
} |