--- ray/src/rt/dielectric.c	2003/07/27 22:12:03	2.17
+++ ray/src/rt/dielectric.c	2005/04/19 01:15:06	2.20
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: dielectric.c,v 2.17 2003/07/27 22:12:03 schorsch Exp $";
+static const char	RCSid[] = "$Id: dielectric.c,v 2.20 2005/04/19 01:15:06 greg Exp $";
 #endif
 /*
  *  dielectric.c - shading function for transparent materials.
@@ -8,15 +8,18 @@ static const char	RCSid[] = "$Id: dielectric.c,v 2.17 
 #include "copyright.h"
 
 #include  "ray.h"
-
 #include  "otypes.h"
+#include  "rtotypes.h"
 
 #ifdef  DISPERSE
 #include  "source.h"
-static  disperse();
-static int  lambda();
+static int disperse(OBJREC *m,RAY *r,FVECT vt,double tr,COLOR cet,COLOR abt);
+static int lambda(OBJREC  *m, FVECT  v2, FVECT  dv, FVECT  lr);
 #endif
 
+static double mylog(double  x);
+
+
 /*
  *     Explicit calculations for Fresnel's equation are performed,
  *  but only one square root computation is necessary.
@@ -49,8 +52,9 @@ static int  lambda();
 
 
 static double
-mylog(x)		/* special log for extinction coefficients */
-double  x;
+mylog(		/* special log for extinction coefficients */
+	double  x
+)
 {
 	if (x < 1e-40)
 		return(-100.);
@@ -60,14 +64,19 @@ double  x;
 }
 
 
-m_dielectric(m, r)	/* color a ray which hit a dielectric interface */
-OBJREC  *m;
-register RAY  *r;
+extern int
+m_dielectric(	/* color a ray which hit a dielectric interface */
+	OBJREC  *m,
+	register RAY  *r
+)
 {
 	double  cos1, cos2, nratio;
 	COLOR  ctrans;
 	COLOR  talb;
 	int  hastexture;
+	double  transdist, transtest=0;
+	double  mirdist, mirtest=0;
+	int	flatsurface;
 	double  refl, trans;
 	FVECT  dnorm;
 	double  d1, d2;
@@ -85,6 +94,8 @@ register RAY  *r;
 		VCOPY(dnorm, r->ron);
 		cos1 = r->rod;
 	}
+	flatsurface = !hastexture && r->ro != NULL && isflat(r->ro->otype);
+
 						/* index of refraction */
 	if (m->otype == MAT_DIELECTRIC)
 		nratio = m->oargs.farg[3] + m->oargs.farg[4]/MLAMBDA;
@@ -153,8 +164,10 @@ register RAY  *r;
 
 		trans *= nratio*nratio;		/* solid angle ratio */
 
-		if (rayorigin(&p, r, REFRACTED, trans) == 0) {
+		setcolor(p.rcoef, trans, trans, trans);
 
+		if (rayorigin(&p, REFRACTED, r, p.rcoef) == 0) {
+
 						/* compute refracted ray */
 			d1 = nratio*cos1 - cos2;
 			for (i = 0; i < 3; i++)
@@ -181,16 +194,22 @@ register RAY  *r;
 				copycolor(p.cext, ctrans);
 				copycolor(p.albedo, talb);
 				rayvalue(&p);
-				scalecolor(p.rcol, trans);
+				multcolor(p.rcol, p.rcoef);
 				addcolor(r->rcol, p.rcol);
-				if (nratio >= 1.0-FTINY && nratio <= 1.0+FTINY)
-					r->rt = r->rot + p.rt;
+						/* virtual distance */
+				if (flatsurface ||
+					(1.-FTINY <= nratio &&
+						nratio <= 1.+FTINY)) {
+					transtest = 2*bright(p.rcol);
+					transdist = r->rot + p.rt;
+				}
 			}
 		}
 	}
-		
+	setcolor(p.rcoef, refl, refl, refl);
+
 	if (!(r->crtype & SHADOW) &&
-			rayorigin(&p, r, REFLECTED, refl) == 0) {
+			rayorigin(&p, REFLECTED, r, p.rcoef) == 0) {
 
 					/* compute reflected ray */
 		for (i = 0; i < 3; i++)
@@ -202,9 +221,20 @@ register RAY  *r;
 
 		rayvalue(&p);			/* reflected ray value */
 
-		scalecolor(p.rcol, refl);	/* color contribution */
+		multcolor(p.rcol, p.rcoef);	/* color contribution */
 		addcolor(r->rcol, p.rcol);
+						/* virtual distance */
+		if (flatsurface) {
+			mirtest = 2*bright(p.rcol);
+			mirdist = r->rot + p.rt;
+		}
 	}
+				/* check distance to return */
+	d1 = bright(r->rcol);
+	if (transtest > d1)
+		r->rt = transdist;
+	else if (mirtest > d1)
+		r->rt = mirdist;
 				/* rayvalue() computes absorption */
 	return(1);
 }
@@ -212,15 +242,18 @@ register RAY  *r;
 
 #ifdef  DISPERSE
 
-static
-disperse(m, r, vt, tr, cet, abt)  /* check light sources for dispersion */
-OBJREC  *m;
-RAY  *r;
-FVECT  vt;
-double  tr;
-COLOR  cet, abt;
+static int
+disperse(  /* check light sources for dispersion */
+	OBJREC  *m,
+	RAY  *r,
+	FVECT  vt,
+	double  tr,
+	COLOR  cet,
+	COLOR  abt
+)
 {
-	RAY  sray, *entray;
+	RAY  sray;
+	const RAY  *entray;
 	FVECT  v1, v2, n1, n2;
 	FVECT  dv, v2Xdv;
 	double  v2Xdvv2Xdv;
@@ -349,9 +382,12 @@ COLOR  cet, abt;
 
 
 static int
-lambda(m, v2, dv, lr)			/* compute lambda for material */
-register OBJREC  *m;
-FVECT  v2, dv, lr;
+lambda(			/* compute lambda for material */
+	register OBJREC  *m,
+	FVECT  v2,
+	FVECT  dv,
+	FVECT  lr
+)
 {
 	FVECT  lrXdv, v2Xlr;
 	double  dtmp, denom;