--- ray/src/rt/m_brdf.c	1991/05/07 17:19:52	1.5
+++ ray/src/rt/m_brdf.c	1991/05/10 08:51:02	1.8
@@ -1,4 +1,4 @@
-/* Copyright (c) 1990 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -66,7 +66,6 @@ typedef struct {
 	RAY  *pr;		/* intersected ray */
 	DATARRAY  *dp;		/* data array for PDATA, MDATA or TDATA */
 	COLOR  mcolor;		/* color of this material */
-	COLOR  scolor;		/* color of specular reflection */
 	double  rspec;		/* specular reflection */
 	double	rdiff;		/* diffuse reflection */
 	double  trans;		/* transmissivity */
@@ -133,13 +132,13 @@ double  omega;			/* light source size */
 					/* compute BRTDF */
 	if (np->mp->otype == MAT_BRTDF) {
 		colval(ctmp,RED) = funvalue(sa[6], 3, ldx);
-		if (sa[7] == sa[6])
+		if (!strcmp(sa[7],sa[6]))
 			colval(ctmp,GRN) = colval(ctmp,RED);
 		else
 			colval(ctmp,GRN) = funvalue(sa[7], 3, ldx);
-		if (sa[8] == sa[6])
+		if (!strcmp(sa[8],sa[6]))
 			colval(ctmp,BLU) = colval(ctmp,RED);
-		else if (sa[8] == sa[7])
+		else if (!strcmp(sa[8],sa[7]))
 			colval(ctmp,BLU) = colval(ctmp,GRN);
 		else
 			colval(ctmp,BLU) = funvalue(sa[8], 3, ldx);
@@ -162,14 +161,17 @@ double  omega;			/* light source size */
 		/*
 		 *  Compute reflected non-diffuse component.
 		 */
-		multcolor(ctmp, np->scolor);
-		dtmp = ldot * omega;
+		if (np->mp->otype == MAT_MFUNC || np->mp->otype == MAT_MDATA)
+			multcolor(ctmp, np->mcolor);
+		dtmp = ldot * omega * np->rspec;
 		scalecolor(ctmp, dtmp);
 		addcolor(cval, ctmp);
 	} else {
 		/*
 		 *  Compute transmitted non-diffuse component.
 		 */
+		if (np->mp->otype == MAT_TFUNC || np->mp->otype == MAT_TDATA)
+			multcolor(ctmp, np->mcolor);
 		dtmp = -ldot * omega * np->tspec;
 		scalecolor(ctmp, dtmp);
 		addcolor(cval, ctmp);
@@ -187,6 +189,7 @@ register RAY  *r;
 {
 	int  minsa, minfa;
 	BRDFDAT  nd;
+	double  transtest, transdist;
 	COLOR  ctmp;
 	double  dtmp;
 	FVECT  vec;
@@ -235,6 +238,7 @@ register RAY  *r;
 	nd.pdot = raynormal(nd.pnorm, r);	/* perturb normal */
 	multcolor(nd.mcolor, r->pcol);		/* modify material color */
 	r->rt = r->rot;				/* default ray length */
+	transtest = 0;
 						/* load auxiliary files */
 	if (m->otype == MAT_PDATA || m->otype == MAT_MDATA
 			|| m->otype == MAT_TDATA) {
@@ -277,42 +281,42 @@ register RAY  *r;
 			objerror(m, WARNING, "compute error");
 		else if ((dtmp = bright(ctmp)) > FTINY &&
 				rayorigin(&sr, r, TRANS, dtmp) == 0) {
-			VCOPY(sr.rdir, r->rdir);
+			if (DOT(r->pert,r->pert) > FTINY*FTINY) {
+				for (i = 0; i < 3; i++)	/* perturb direction */
+					sr.rdir[i] = r->rdir[i] -
+							.75*r->pert[i];
+				normalize(sr.rdir);
+			} else {
+				VCOPY(sr.rdir, r->rdir);
+				transtest = 2;
+			}
 			rayvalue(&sr);
 			multcolor(sr.rcol, ctmp);
 			addcolor(r->rcol, sr.rcol);
-			if (dtmp > .5)
-				r->rt = r->rot + sr.rt;
+			transtest *= bright(sr.rcol);
+			transdist = r->rot + sr.rt;
 		}
 	}
 	if (r->crtype & SHADOW)			/* the rest is shadow */
 		return;
-	if (nd.rspec > FTINY) {			/* has specular component */
-						/* compute specular color */
-		if (m->otype == MAT_MFUNC || m->otype == MAT_MDATA)
-			copycolor(nd.scolor, nd.mcolor);
-		else
-			setcolor(nd.scolor, 1.0, 1.0, 1.0);
-		scalecolor(nd.scolor, nd.rspec);
 						/* compute reflected ray */
-		if (m->otype == MAT_BRTDF) {
-			RAY  sr;
-			errno = 0;
-			setcolor(ctmp, varvalue(m->oargs.sarg[3]),
-					varvalue(m->oargs.sarg[4]),
-					varvalue(m->oargs.sarg[5]));
-			scalecolor(ctmp, nd.rspec);
-			if (errno)
-				objerror(m, WARNING, "compute error");
-			else if ((dtmp = bright(ctmp)) > FTINY &&
+	if (m->otype == MAT_BRTDF && nd.rspec > FTINY) {
+		RAY  sr;
+		errno = 0;
+		setcolor(ctmp, varvalue(m->oargs.sarg[3]),
+				varvalue(m->oargs.sarg[4]),
+				varvalue(m->oargs.sarg[5]));
+		scalecolor(ctmp, nd.rspec);
+		if (errno)
+			objerror(m, WARNING, "compute error");
+		else if ((dtmp = bright(ctmp)) > FTINY &&
 				rayorigin(&sr, r, REFLECTED, dtmp) == 0) {
-				for (i = 0; i < 3; i++)
-					sr.rdir[i] = r->rdir[i] +
+			for (i = 0; i < 3; i++)
+				sr.rdir[i] = r->rdir[i] +
 						2.0*nd.pdot*nd.pnorm[i];
-				rayvalue(&sr);
-				multcolor(sr.rcol, ctmp);
-				addcolor(r->rcol, sr.rcol);
-			}
+			rayvalue(&sr);
+			multcolor(sr.rcol, ctmp);
+			addcolor(r->rcol, sr.rcol);
 		}
 	}
 						/* compute ambient */
@@ -338,4 +342,7 @@ register RAY  *r;
 	}
 						/* add direct component */
 	direct(r, dirbrdf, &nd);
+						/* check distance */
+	if (transtest > bright(r->rcol))
+		r->rt = transdist;
 }