--- ray/src/rt/glass.c	1991/05/08 08:27:46	1.7
+++ ray/src/rt/glass.c	1993/08/24 12:59:24	2.6
@@ -27,11 +27,14 @@ static char SCCSid[] = "$SunId$ LBL";
  *	3 red grn blu
  *
  *  The color is used for the transmission at normal incidence.
- *  To compute transmission (tn) from transmissivity (Tn) use:
+ *  To compute transmissivity (tn) from transmittance (Tn) use:
  *
  *	tn = (sqrt(.8402528435+.0072522239*Tn*Tn)-.9166530661)/.0036261119/Tn
  *
- *  The transmission of standard 88% transmissivity glass is 0.96.
+ *  The transmissivity of standard 88% transmittance glass is 0.96.
+ *  A refractive index other than the default can be used by giving
+ *  it as the fourth real argument.  The above formula no longer applies.
+ *
  *  If we appear to hit the back side of the surface, then we
  *  turn the normal around.
  */
@@ -43,53 +46,65 @@ m_glass(m, r)		/* color a ray which hit a thin glass s
 OBJREC  *m;
 register RAY  *r;
 {
-	double  sqrt(), pow();
 	COLOR  mcolor;
 	double  pdot;
 	FVECT  pnorm;
-	double  cos2;
+	double  rindex, cos2;
 	COLOR  trans, refl;
-	double  d, r1;
+	double  d, r1e, r1m;
 	double  transtest, transdist;
 	RAY  p;
 	register int  i;
-
-	if (m->oargs.nfargs != 3)
+						/* check arguments */
+	if (m->oargs.nfargs == 3)
+		rindex = RINDEX;		/* default value of n */
+	else if (m->oargs.nfargs == 4)
+		rindex = m->oargs.farg[3];	/* use their value */
+	else
 		objerror(m, USER, "bad arguments");
 
 	setcolor(mcolor, m->oargs.farg[0], m->oargs.farg[1], m->oargs.farg[2]);
 
 	if (r->rod < 0.0)			/* reorient if necessary */
 		flipsurface(r);
-	r->rt = r->rot;				/* default ray length */
 	transtest = 0;
+	transdist = r->rot;
 						/* get modifiers */
 	raytexture(r, m->omod);
 	pdot = raynormal(pnorm, r);
 						/* angular transmission */
-	cos2 = sqrt( (1.0-1.0/RINDEX/RINDEX) +
-		     pdot*pdot/(RINDEX*RINDEX) );
+	cos2 = sqrt( (1.0-1.0/(rindex*rindex)) +
+		     pdot*pdot/(rindex*rindex) );
 	setcolor(mcolor, pow(colval(mcolor,RED), 1.0/cos2),
 			 pow(colval(mcolor,GRN), 1.0/cos2),
 			 pow(colval(mcolor,BLU), 1.0/cos2));
 
 						/* compute reflection */
-	r1 = (pdot - RINDEX*cos2) / (pdot + RINDEX*cos2);
-	d = (1.0/pdot - RINDEX/cos2) / (1.0/pdot + RINDEX/cos2);
-	r1 = (r1*r1 + d*d) / 2.0;
+	r1e = (pdot - rindex*cos2) / (pdot + rindex*cos2);
+	r1e *= r1e;
+	r1m = (1.0/pdot - rindex/cos2) / (1.0/pdot + rindex/cos2);
+	r1m *= r1m;
 						/* compute transmittance */
 	for (i = 0; i < 3; i++) {
 		d = colval(mcolor, i);
-		colval(trans,i) = (1.0-r1)*(1.0-r1)*d / (1.0 - r1*r1*d*d);
+		colval(trans,i) = .5*(1.0-r1e)*(1.0-r1e)*d/(1.0-r1e*r1e*d*d);
+		colval(trans,i) += .5*(1.0-r1m)*(1.0-r1m)*d/(1.0-r1m*r1m*d*d);
 	}
 						/* transmitted ray */
 	if (rayorigin(&p, r, TRANS, bright(trans)) == 0) {
-		if (DOT(r->pert,r->pert) > FTINY*FTINY) {
+		if (!(r->crtype & SHADOW) &&
+				DOT(r->pert,r->pert) > FTINY*FTINY) {
 			for (i = 0; i < 3; i++)		/* perturb direction */
-				p.rdir[i] = r->rdir[i] - r->pert[i]/RINDEX;
-			normalize(p.rdir);
-		} else
+				p.rdir[i] = r->rdir[i] +
+						2.*(1.-rindex)*r->pert[i];
+			if (normalize(p.rdir) == 0.0) {
+				objerror(m, WARNING, "bad perturbation");
+				VCOPY(p.rdir, r->rdir);
+			}
+		} else {
+			VCOPY(p.rdir, r->rdir);
 			transtest = 2;
+		}
 		rayvalue(&p);
 		multcolor(p.rcol, r->pcol);	/* modify */
 		multcolor(p.rcol, trans);
@@ -104,7 +119,8 @@ register RAY  *r;
 	for (i = 0; i < 3; i++) {
 		d = colval(mcolor, i);
 		d *= d;
-		colval(refl,i) = r1 * (1.0 + (1.0-2.0*r1)*d) / (1.0 - r1*r1*d);
+		colval(refl,i) = .5*r1e*(1.0+(1.0-2.0*r1e)*d)/(1.0-r1e*r1e*d);
+		colval(refl,i) += .5*r1m*(1.0+(1.0-2.0*r1m)*d)/(1.0-r1m*r1m*d);
 	}
 						/* reflected ray */
 	if (rayorigin(&p, r, REFLECTED, bright(refl)) == 0) {