--- ray/src/rt/normal.c	1995/09/15 15:47:30	2.29
+++ ray/src/rt/normal.c	1996/01/03 11:33:56	2.33
@@ -1,4 +1,4 @@
-/* Copyright (c) 1992 Regents of the University of California */
+/* Copyright (c) 1995 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -201,40 +201,7 @@ register RAY  *r;
 	multcolor(nd.mcolor, r->pcol);		/* modify material color */
 	mirtest = transtest = 0;
 	mirdist = transdist = r->rot;
-						/* get specular component */
-	if ((nd.rspec = m->oargs.farg[3]) > FTINY) {
-		nd.specfl |= SP_REFL;
-						/* compute specular color */
-		if (m->otype == MAT_METAL)
-			copycolor(nd.scolor, nd.mcolor);
-		else
-			setcolor(nd.scolor, 1.0, 1.0, 1.0);
-		scalecolor(nd.scolor, nd.rspec);
-						/* check threshold */
-		if (!(nd.specfl & SP_PURE) && specthresh >= nd.rspec-FTINY)
-			nd.specfl |= SP_RBLT;
-						/* compute reflected ray */
-		for (i = 0; i < 3; i++)
-			nd.vrefl[i] = r->rdir[i] + 2.*nd.pdot*nd.pnorm[i];
-						/* penetration? */
-		if (hastexture && DOT(nd.vrefl, r->ron) <= FTINY)
-			for (i = 0; i < 3; i++)		/* safety measure */
-				nd.vrefl[i] = r->rdir[i] + 2.*r->rod*r->ron[i];
-
-		if (!(r->crtype & SHADOW) && nd.specfl & SP_PURE) {
-			RAY  lr;
-			if (rayorigin(&lr, r, REFLECTED, nd.rspec) == 0) {
-				VCOPY(lr.rdir, nd.vrefl);
-				rayvalue(&lr);
-				multcolor(lr.rcol, nd.scolor);
-				addcolor(r->rcol, lr.rcol);
-				if (!hastexture && nd.specfl & SP_FLAT) {
-					mirtest = 2.*bright(lr.rcol);
-					mirdist = r->rot + lr.rt;
-				}
-			}
-		}
-	}
+	nd.rspec = m->oargs.farg[3];
 						/* compute transmission */
 	if (m->otype == MAT_TRANS) {
 		nd.trans = m->oargs.farg[5]*(1.0 - nd.rspec);
@@ -261,7 +228,7 @@ register RAY  *r;
 	} else
 		nd.tdiff = nd.tspec = nd.trans = 0.0;
 						/* transmitted ray */
-	if ((nd.specfl&(SP_TRAN|SP_PURE)) == (SP_TRAN|SP_PURE)) {
+	if (nd.specfl&SP_TRAN && (nd.specfl&SP_PURE || r->crtype&SHADOW)) {
 		RAY  lr;
 		if (rayorigin(&lr, r, TRANS, nd.tspec) == 0) {
 			VCOPY(lr.rdir, nd.prdir);
@@ -279,6 +246,40 @@ register RAY  *r;
 		r->rt = transdist;
 		return(1);
 	}
+						/* get specular reflection */
+	if (nd.rspec > FTINY) {
+		nd.specfl |= SP_REFL;
+						/* compute specular color */
+		if (m->otype == MAT_METAL)
+			copycolor(nd.scolor, nd.mcolor);
+		else
+			setcolor(nd.scolor, 1.0, 1.0, 1.0);
+		scalecolor(nd.scolor, nd.rspec);
+						/* check threshold */
+		if (!(nd.specfl & SP_PURE) && specthresh >= nd.rspec-FTINY)
+			nd.specfl |= SP_RBLT;
+						/* compute reflected ray */
+		for (i = 0; i < 3; i++)
+			nd.vrefl[i] = r->rdir[i] + 2.*nd.pdot*nd.pnorm[i];
+						/* penetration? */
+		if (hastexture && DOT(nd.vrefl, r->ron) <= FTINY)
+			for (i = 0; i < 3; i++)		/* safety measure */
+				nd.vrefl[i] = r->rdir[i] + 2.*r->rod*r->ron[i];
+
+		if (!(r->crtype & SHADOW) && nd.specfl & SP_PURE) {
+			RAY  lr;
+			if (rayorigin(&lr, r, REFLECTED, nd.rspec) == 0) {
+				VCOPY(lr.rdir, nd.vrefl);
+				rayvalue(&lr);
+				multcolor(lr.rcol, nd.scolor);
+				addcolor(r->rcol, lr.rcol);
+				if (!hastexture && nd.specfl & SP_FLAT) {
+					mirtest = 2.*bright(lr.rcol);
+					mirdist = r->rot + lr.rt;
+				}
+			}
+		}
+	}
 						/* diffuse reflection */
 	nd.rdiff = 1.0 - nd.trans - nd.rspec;
 
@@ -289,7 +290,7 @@ register RAY  *r;
 		gaussamp(r, &nd);
 
 	if (nd.rdiff > FTINY) {		/* ambient from this side */
-		ambient(ctmp, r);
+		ambient(ctmp, r, hastexture?nd.pnorm:r->ron);
 		if (nd.specfl & SP_RBLT)
 			scalecolor(ctmp, 1.0-nd.trans);
 		else
@@ -299,7 +300,14 @@ register RAY  *r;
 	}
 	if (nd.tdiff > FTINY) {		/* ambient from other side */
 		flipsurface(r);
-		ambient(ctmp, r);
+		if (hastexture) {
+			FVECT  bnorm;
+			bnorm[0] = -nd.pnorm[0];
+			bnorm[1] = -nd.pnorm[1];
+			bnorm[2] = -nd.pnorm[2];
+			ambient(ctmp, r, bnorm);
+		} else
+			ambient(ctmp, r, r->ron);
 		if (nd.specfl & SP_TBLT)
 			scalecolor(ctmp, nd.trans);
 		else