74 |
|
COLOR ctrans; |
75 |
|
COLOR talb; |
76 |
|
int hastexture; |
77 |
+ |
double transdist=0, transtest=0; |
78 |
+ |
double mirdist=0, mirtest=0; |
79 |
+ |
int flatsurface; |
80 |
|
double refl, trans; |
81 |
|
FVECT dnorm; |
82 |
|
double d1, d2; |
94 |
|
VCOPY(dnorm, r->ron); |
95 |
|
cos1 = r->rod; |
96 |
|
} |
97 |
+ |
flatsurface = !hastexture && r->ro != NULL && isflat(r->ro->otype); |
98 |
+ |
|
99 |
|
/* index of refraction */ |
100 |
|
if (m->otype == MAT_DIELECTRIC) |
101 |
|
nratio = m->oargs.farg[3] + m->oargs.farg[4]/MLAMBDA; |
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 |
< |
if (nratio >= 1.0-FTINY && nratio <= 1.0+FTINY) |
201 |
< |
r->rt = r->rot + p.rt; |
200 |
> |
/* virtual distance */ |
201 |
> |
if (flatsurface || |
202 |
> |
(1.-FTINY <= nratio && |
203 |
> |
nratio <= 1.+FTINY)) { |
204 |
> |
transtest = 2*bright(p.rcol); |
205 |
> |
transdist = r->rot + p.rt; |
206 |
> |
} |
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++) |
203 |
< |
p.rdir[i] = r->rdir[i] + 2.0*cos1*dnorm[i]; |
216 |
> |
VSUM(p.rdir, r->rdir, dnorm, 2.*cos1); |
217 |
|
/* accidental penetration? */ |
218 |
|
if (hastexture && DOT(p.rdir,r->ron)*hastexture <= FTINY) |
219 |
< |
for (i = 0; i < 3; i++) /* ignore texture */ |
220 |
< |
p.rdir[i] = r->rdir[i] + 2.0*r->rod*r->ron[i]; |
208 |
< |
|
219 |
> |
VSUM(p.rdir, r->rdir, r->ron, 2.*r->rod); |
220 |
> |
checknorm(p.rdir); |
221 |
|
rayvalue(&p); /* reflected ray value */ |
222 |
|
|
223 |
< |
scalecolor(p.rcol, refl); /* color contribution */ |
223 |
> |
multcolor(p.rcol, p.rcoef); /* color contribution */ |
224 |
|
addcolor(r->rcol, p.rcol); |
225 |
+ |
/* virtual distance */ |
226 |
+ |
if (flatsurface) { |
227 |
+ |
mirtest = 2*bright(p.rcol); |
228 |
+ |
mirdist = r->rot + p.rt; |
229 |
+ |
} |
230 |
|
} |
231 |
+ |
/* check distance to return */ |
232 |
+ |
d1 = bright(r->rcol); |
233 |
+ |
if (transtest > d1) |
234 |
+ |
r->rt = transdist; |
235 |
+ |
else if (mirtest > d1) |
236 |
+ |
r->rt = mirdist; |
237 |
|
/* rayvalue() computes absorption */ |
238 |
|
return(1); |
239 |
|
} |
251 |
|
COLOR abt |
252 |
|
) |
253 |
|
{ |
254 |
< |
RAY sray, *entray; |
254 |
> |
RAY sray; |
255 |
> |
const RAY *entray; |
256 |
|
FVECT v1, v2, n1, n2; |
257 |
|
FVECT dv, v2Xdv; |
258 |
|
double v2Xdvv2Xdv; |
307 |
|
VCOPY(n2, r->ron); |
308 |
|
|
309 |
|
/* first order dispersion approx. */ |
310 |
< |
dtmp1 = DOT(n1, v1); |
311 |
< |
dtmp2 = DOT(n2, v2); |
310 |
> |
dtmp1 = 1./DOT(n1, v1); |
311 |
> |
dtmp2 = 1./DOT(n2, v2); |
312 |
|
for (i = 0; i < 3; i++) |
313 |
< |
dv[i] = v1[i] + v2[i] - n1[i]/dtmp1 - n2[i]/dtmp2; |
313 |
> |
dv[i] = v1[i] + v2[i] - n1[i]*dtmp1 - n2[i]*dtmp2; |
314 |
|
|
315 |
|
if (DOT(dv, dv) <= FTINY) /* null effect */ |
316 |
|
return(0); |
353 |
|
dtmp1 = sqrt(si.dom / v2Xdvv2Xdv / PI); |
354 |
|
|
355 |
|
/* compute first ray */ |
356 |
< |
for (i = 0; i < 3; i++) |
333 |
< |
vtmp2[i] = sray.rdir[i] + dtmp1*vtmp1[i]; |
356 |
> |
VSUM(vtmp2, sray.rdir, vtmp1, dtmp1); |
357 |
|
|
358 |
|
l1 = lambda(m, v2, dv, vtmp2); /* first lambda */ |
359 |
|
if (l1 < 0) |
360 |
|
continue; |
361 |
|
/* compute second ray */ |
362 |
< |
for (i = 0; i < 3; i++) |
340 |
< |
vtmp2[i] = sray.rdir[i] - dtmp1*vtmp1[i]; |
362 |
> |
VSUM(vtmp2, sray.rdir, vtmp1, -dtmp1); |
363 |
|
|
364 |
|
l2 = lambda(m, v2, dv, vtmp2); /* second lambda */ |
365 |
|
if (l2 < 0) |
392 |
|
|
393 |
|
fcross(lrXdv, lr, dv); |
394 |
|
for (i = 0; i < 3; i++) |
395 |
< |
if (lrXdv[i] > FTINY || lrXdv[i] < -FTINY) |
395 |
> |
if ((lrXdv[i] > FTINY) | (lrXdv[i] < -FTINY)) |
396 |
|
break; |
397 |
|
if (i >= 3) |
398 |
|
return(-1); |