--- ray/src/rt/normal.c	1997/01/07 16:44:04	2.35
+++ ray/src/rt/normal.c	1998/12/16 18:14:58	2.37
@@ -1,7 +1,7 @@
-/* Copyright (c) 1996 Regents of the University of California */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static char SCCSid[] = "$SunId$ SGI";
 #endif
 
 /*
@@ -232,7 +232,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|SP_PURE|SP_TBLT)) == (SP_TRAN|SP_PURE)) {
 		RAY  lr;
 		if (rayorigin(&lr, r, TRANS, nd.tspec) == 0) {
 			VCOPY(lr.rdir, nd.prdir);
@@ -269,18 +269,18 @@ register RAY  *r;
 		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;
-				}
+	}
+						/* reflected ray */
+	if ((nd.specfl&(SP_REFL|SP_PURE|SP_RBLT)) == (SP_REFL|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;
 			}
 		}
 	}
@@ -290,8 +290,8 @@ register RAY  *r;
 	if (nd.specfl & SP_PURE && nd.rdiff <= FTINY && nd.tdiff <= FTINY)
 		return(1);			/* 100% pure specular */
 
-	if (nd.specfl & (SP_REFL|SP_TRAN) && !(nd.specfl & SP_PURE))
-		gaussamp(r, &nd);
+	if (!(nd.specfl & SP_PURE))
+		gaussamp(r, &nd);		/* checks *BLT flags */
 
 	if (nd.rdiff > FTINY) {		/* ambient from this side */
 		ambient(ctmp, r, hastexture?nd.pnorm:r->ron);
@@ -368,8 +368,8 @@ register NORMDAT  *np;
 				d = urand(ilhash(dimlist,ndims)+samplendx);
 			multisamp(rv, 2, d);
 			d = 2.0*PI * rv[0];
-			cosp = cos(d);
-			sinp = sin(d);
+			cosp = tcos(d);
+			sinp = tsin(d);
 			rv[1] = 1.0 - specjitter*rv[1];
 			if (rv[1] <= FTINY)
 				d = 1.0;
@@ -400,13 +400,13 @@ register NORMDAT  *np;
 				d = urand(ilhash(dimlist,ndims)+1823+samplendx);
 			multisamp(rv, 2, d);
 			d = 2.0*PI * rv[0];
-			cosp = cos(d);
-			sinp = sin(d);
+			cosp = tcos(d);
+			sinp = tsin(d);
 			rv[1] = 1.0 - specjitter*rv[1];
 			if (rv[1] <= FTINY)
 				d = 1.0;
 			else
-				d = sqrt( -log(rv[1]) * np->alpha2 );
+				d = sqrt( np->alpha2 * -log(rv[1]) );
 			for (i = 0; i < 3; i++)
 				sr.rdir[i] = np->prdir[i] + d*(cosp*u[i] + sinp*v[i]);
 			if (DOT(sr.rdir, r->ron) < -FTINY) {