--- ray/src/rt/normal.c	1993/02/12 10:41:02	2.23
+++ ray/src/rt/normal.c	1994/01/12 16:46:45	2.27
@@ -23,6 +23,8 @@ static char SCCSid[] = "$SunId$ LBL";
 extern double  specthresh;		/* specular sampling threshold */
 extern double  specjitter;		/* specular sampling jitter */
 
+static  gaussamp();
+
 /*
  *	This routine implements the isotropic Gaussian
  *  model described by Ward in Siggraph `92 article.
@@ -36,8 +38,6 @@ extern double  specjitter;		/* specular sampling jitte
  *	red 	grn	blu	rspec	rough	trans	tspec
  */
 
-#define  BSPEC(m)	(6.0)		/* specularity parameter b */
-
 				/* specularity flags */
 #define  SP_REFL	01		/* has reflected specular component */
 #define  SP_TRAN	02		/* has transmitted specular */
@@ -154,12 +154,11 @@ register RAY  *r;
 {
 	NORMDAT  nd;
 	double  transtest, transdist;
-	double  dtmp;
 	COLOR  ctmp;
 	register int  i;
 						/* easy shadow test */
 	if (r->crtype & SHADOW && m->otype != MAT_TRANS)
-		return;
+		return(1);
 
 	if (m->oargs.nfargs != (m->otype == MAT_TRANS ? 7 : 5))
 		objerror(m, USER, "bad number of arguments");
@@ -184,6 +183,7 @@ register RAY  *r;
 		nd.pdot = .001;			/* non-zero for dirnorm() */
 	multcolor(nd.mcolor, r->pcol);		/* modify material color */
 	transtest = 0;
+	transdist = r->rot;
 						/* get specular component */
 	if ((nd.rspec = m->oargs.farg[3]) > FTINY) {
 		nd.specfl |= SP_REFL;
@@ -193,16 +193,8 @@ register RAY  *r;
 		else
 			setcolor(nd.scolor, 1.0, 1.0, 1.0);
 		scalecolor(nd.scolor, nd.rspec);
-						/* improved model */
-		dtmp = exp(-BSPEC(m)*nd.pdot);
-		for (i = 0; i < 3; i++)
-			colval(nd.scolor,i) += (1.0-colval(nd.scolor,i))*dtmp;
-		nd.rspec += (1.0-nd.rspec)*dtmp;
 						/* check threshold */
-		if (!(nd.specfl & SP_PURE) &&
-				specthresh > FTINY &&
-				(specthresh >= 1.-FTINY ||
-				specthresh + .05 - .1*frandom() > nd.rspec))
+		if (!(nd.specfl & SP_PURE) && specthresh >= nd.rspec-FTINY)
 			nd.specfl |= SP_RBLT;
 						/* compute reflected ray */
 		for (i = 0; i < 3; i++)
@@ -229,9 +221,8 @@ register RAY  *r;
 		if (nd.tspec > FTINY) {
 			nd.specfl |= SP_TRAN;
 							/* check threshold */
-			if (!(nd.specfl & SP_PURE) && specthresh > FTINY &&
-					(specthresh >= 1.-FTINY ||
-				specthresh + .05 - .1*frandom() > nd.tspec))
+			if (!(nd.specfl & SP_PURE) &&
+					specthresh >= nd.tspec-FTINY)
 				nd.specfl |= SP_TBLT;
 			if (r->crtype & SHADOW ||
 					DOT(r->pert,r->pert) <= FTINY*FTINY) {
@@ -264,12 +255,12 @@ register RAY  *r;
 		transtest = 0;
 
 	if (r->crtype & SHADOW)			/* the rest is shadow */
-		return;
+		return(1);
 						/* diffuse reflection */
 	nd.rdiff = 1.0 - nd.trans - nd.rspec;
 
 	if (nd.specfl & SP_PURE && nd.rdiff <= FTINY && nd.tdiff <= FTINY)
-		return;				/* 100% pure specular */
+		return(1);			/* 100% pure specular */
 
 	if (r->ro != NULL && (r->ro->otype == OBJ_FACE ||
 			r->ro->otype == OBJ_RING))
@@ -303,6 +294,8 @@ register RAY  *r;
 					/* check distance */
 	if (transtest > bright(r->rcol))
 		r->rt = transdist;
+
+	return(1);
 }