164 |
|
|
165 |
|
trans *= nratio*nratio; /* solid angle ratio */ |
166 |
|
|
167 |
< |
if (rayorigin(&p, r, REFRACTED, trans) == 0) { |
167 |
> |
setcolor(p.rcoef, trans, trans, trans); |
168 |
|
|
169 |
+ |
if (rayorigin(&p, REFRACTED, r, p.rcoef) == 0) { |
170 |
+ |
|
171 |
|
/* compute refracted ray */ |
172 |
|
d1 = nratio*cos1 - cos2; |
173 |
|
for (i = 0; i < 3; i++) |
180 |
|
p.rdir[i] = nratio*r->rdir[i] + |
181 |
|
d1*r->ron[i]; |
182 |
|
normalize(p.rdir); /* not exact */ |
183 |
< |
} |
183 |
> |
} else |
184 |
> |
checknorm(p.rdir); |
185 |
|
#ifdef DISPERSE |
186 |
|
if (m->otype != MAT_DIELECTRIC |
187 |
|
|| r->rod > 0.0 |
195 |
|
copycolor(p.cext, ctrans); |
196 |
|
copycolor(p.albedo, talb); |
197 |
|
rayvalue(&p); |
198 |
< |
scalecolor(p.rcol, trans); |
198 |
> |
multcolor(p.rcol, p.rcoef); |
199 |
|
addcolor(r->rcol, p.rcol); |
200 |
|
/* virtual distance */ |
201 |
|
if (flatsurface || |
207 |
|
} |
208 |
|
} |
209 |
|
} |
210 |
< |
|
210 |
> |
setcolor(p.rcoef, refl, refl, refl); |
211 |
> |
|
212 |
|
if (!(r->crtype & SHADOW) && |
213 |
< |
rayorigin(&p, r, REFLECTED, refl) == 0) { |
213 |
> |
rayorigin(&p, REFLECTED, r, p.rcoef) == 0) { |
214 |
|
|
215 |
|
/* compute reflected ray */ |
216 |
|
for (i = 0; i < 3; i++) |
219 |
|
if (hastexture && DOT(p.rdir,r->ron)*hastexture <= FTINY) |
220 |
|
for (i = 0; i < 3; i++) /* ignore texture */ |
221 |
|
p.rdir[i] = r->rdir[i] + 2.0*r->rod*r->ron[i]; |
222 |
< |
|
222 |
> |
checknorm(p.rdir); |
223 |
|
rayvalue(&p); /* reflected ray value */ |
224 |
|
|
225 |
< |
scalecolor(p.rcol, refl); /* color contribution */ |
225 |
> |
multcolor(p.rcol, p.rcoef); /* color contribution */ |
226 |
|
addcolor(r->rcol, p.rcol); |
227 |
|
/* virtual distance */ |
228 |
|
if (flatsurface) { |
253 |
|
COLOR abt |
254 |
|
) |
255 |
|
{ |
256 |
< |
RAY sray, *entray; |
256 |
> |
RAY sray; |
257 |
> |
const RAY *entray; |
258 |
|
FVECT v1, v2, n1, n2; |
259 |
|
FVECT dv, v2Xdv; |
260 |
|
double v2Xdvv2Xdv; |