--- ray/src/rt/m_brdf.c	2004/09/09 15:40:02	2.22
+++ ray/src/rt/m_brdf.c	2007/09/07 15:25:01	2.25
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: m_brdf.c,v 2.22 2004/09/09 15:40:02 greg Exp $";
+static const char	RCSid[] = "$Id: m_brdf.c,v 2.25 2007/09/07 15:25:01 greg Exp $";
 #endif
 /*
  *  Shading for materials with arbitrary BRDF's
@@ -129,7 +129,7 @@ dirbrdf(		/* compute source contribution */
 		addcolor(cval, ctmp);
 	}
 	if (ldot > 0.0 ? np->rspec <= FTINY : np->tspec <= FTINY)
-		return;		/* no specular component */
+		return;		/* diffuse only */
 					/* set up function */
 	setbrdfunc(np);
 	sa = np->mp->oargs.sarg;
@@ -145,7 +145,9 @@ dirbrdf(		/* compute source contribution */
 			colval(ctmp,RED) = 0.0;
 		else
 			colval(ctmp,RED) = funvalue(sa[6], 4, lddx);
-		if (!strcmp(sa[7],sa[6]))
+		if (sa[7][0] == '0')
+			colval(ctmp,GRN) = 0.0;
+		else if (!strcmp(sa[7],sa[6]))
 			colval(ctmp,GRN) = colval(ctmp,RED);
 		else
 			colval(ctmp,GRN) = funvalue(sa[7], 4, lddx);
@@ -166,7 +168,7 @@ dirbrdf(		/* compute source contribution */
 		dtmp = funvalue(sa[0], 5, vldx);
 		setcolor(ctmp, dtmp, dtmp, dtmp);
 	}
-	if (errno == EDOM || errno == ERANGE) {
+	if ((errno == EDOM) | (errno == ERANGE)) {
 		objerror(np->mp, WARNING, "compute error");
 		return;
 	}
@@ -265,9 +267,9 @@ m_brdf(			/* color a ray that hit a BRDTfunc material 
 	setcolor(ctmp, evalue(mf->ep[3]),
 			evalue(mf->ep[4]),
 			evalue(mf->ep[5]));
-	if (errno == EDOM || errno == ERANGE)
+	if ((errno == EDOM) | (errno == ERANGE))
 		objerror(m, WARNING, "compute error");
-	else if (rayorigin(&sr, r, TRANS, bright(ctmp)) == 0) {
+	else if (rayorigin(&sr, TRANS, r, ctmp) == 0) {
 		if (!(r->crtype & SHADOW) && hastexture) {
 			for (i = 0; i < 3; i++)	/* perturb direction */
 				sr.rdir[i] = r->rdir[i] - .75*r->pert[i];
@@ -279,7 +281,7 @@ m_brdf(			/* color a ray that hit a BRDTfunc material 
 			VCOPY(sr.rdir, r->rdir);
 		}
 		rayvalue(&sr);
-		multcolor(sr.rcol, ctmp);
+		multcolor(sr.rcol, sr.rcoef);
 		addcolor(r->rcol, sr.rcol);
 		if (!hastexture) {
 			transtest = 2.0*bright(sr.rcol);
@@ -294,13 +296,13 @@ m_brdf(			/* color a ray that hit a BRDTfunc material 
 	setcolor(ctmp, evalue(mf->ep[0]),
 			evalue(mf->ep[1]),
 			evalue(mf->ep[2]));
-	if (errno == EDOM || errno == ERANGE)
+	if ((errno == EDOM) | (errno == ERANGE))
 		objerror(m, WARNING, "compute error");
-	else if (rayorigin(&sr, r, REFLECTED, bright(ctmp)) == 0) {
+	else if (rayorigin(&sr, REFLECTED, r, ctmp) == 0) {
 		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);
+		multcolor(sr.rcol, sr.rcoef);
 		addcolor(r->rcol, sr.rcol);
 		if (!hastexture && r->ro != NULL && isflat(r->ro->otype)) {
 			mirtest = 2.0*bright(sr.rcol);
@@ -311,8 +313,8 @@ m_brdf(			/* color a ray that hit a BRDTfunc material 
 	if (hasrefl) {
 		if (!hitfront)
 			flipsurface(r);
-		ambient(ctmp, r, nd.pnorm);
-		multcolor(ctmp, nd.rdiff);
+		copycolor(ctmp, nd.rdiff);
+		multambient(ctmp, r, nd.pnorm);
 		addcolor(r->rcol, ctmp);	/* add to returned color */
 		if (!hitfront)
 			flipsurface(r);
@@ -323,8 +325,8 @@ m_brdf(			/* color a ray that hit a BRDTfunc material 
 		vtmp[0] = -nd.pnorm[0];
 		vtmp[1] = -nd.pnorm[1];
 		vtmp[2] = -nd.pnorm[2];
-		ambient(ctmp, r, vtmp);
-		multcolor(ctmp, nd.tdiff);
+		copycolor(ctmp, nd.tdiff);
+		multambient(ctmp, r, vtmp);
 		addcolor(r->rcol, ctmp);
 		if (hitfront)
 			flipsurface(r);
@@ -407,9 +409,9 @@ m_brdf2(			/* color a ray that hit a BRDF material */
 	}
 						/* compute ambient */
 	if (nd.trans < 1.0-FTINY) {
-		ambient(ctmp, r, nd.pnorm);
+		copycolor(ctmp, nd.mcolor);	/* modified by material color */
 		scalecolor(ctmp, 1.0-nd.trans);
-		multcolor(ctmp, nd.mcolor);	/* modified by material color */
+		multambient(ctmp, r, nd.pnorm);
 		addcolor(r->rcol, ctmp);	/* add to returned color */
 	}
 	if (nd.trans > FTINY) {		/* from other side */
@@ -417,9 +419,9 @@ m_brdf2(			/* color a ray that hit a BRDF material */
 		vtmp[0] = -nd.pnorm[0];
 		vtmp[1] = -nd.pnorm[1];
 		vtmp[2] = -nd.pnorm[2];
-		ambient(ctmp, r, vtmp);
+		copycolor(ctmp, nd.mcolor);
 		scalecolor(ctmp, nd.trans);
-		multcolor(ctmp, nd.mcolor);
+		multambient(ctmp, r, vtmp);
 		addcolor(r->rcol, ctmp);
 		flipsurface(r);
 	}