--- ray/src/rt/m_brdf.c	2015/08/06 16:06:06	2.32
+++ ray/src/rt/m_brdf.c	2018/11/13 19:58:33	2.36
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: m_brdf.c,v 2.32 2015/08/06 16:06:06 greg Exp $";
+static const char	RCSid[] = "$Id: m_brdf.c,v 2.36 2018/11/13 19:58:33 greg Exp $";
 #endif
 /*
  *  Shading for materials with arbitrary BRDF's
@@ -14,6 +14,7 @@ static const char	RCSid[] = "$Id: m_brdf.c,v 2.32 2015
 #include  "otypes.h"
 #include  "rtotypes.h"
 #include  "func.h"
+#include  "pmapmat.h"
 
 /*
  *	Arguments to this material include the color and specularity.
@@ -127,7 +128,8 @@ dirbrdf(		/* compute source contribution */
 		scalecolor(ctmp, dtmp);
 		addcolor(cval, ctmp);
 	}
-	if (ldot > 0.0 ? np->rspec <= FTINY : np->tspec <= FTINY)
+	if ((ldot > 0.0 ? np->rspec <= FTINY : np->tspec <= FTINY) ||
+			ambRayInPmap(np->pr))
 		return;		/* diffuse only */
 					/* set up function */
 	setbrdfunc(np);
@@ -207,8 +209,6 @@ m_brdf(			/* color a ray that hit a BRDTfunc material 
 	int  hitfront = 1;
 	BRDFDAT  nd;
 	RAY  sr;
-	double  mirtest=0, mirdist=0;
-	double  transtest=0, transdist=0;
 	int  hasrefl, hastrans;
 	int  hastexture;
 	COLOR  ctmp;
@@ -239,7 +239,7 @@ m_brdf(			/* color a ray that hit a BRDTfunc material 
 			m->oargs.farg[8]);
 						/* get modifiers */
 	raytexture(r, m->omod);
-	hastexture = DOT(r->pert,r->pert) > FTINY*FTINY;
+	hastexture = (DOT(r->pert,r->pert) > FTINY*FTINY);
 	if (hastexture) {			/* perturb normal */
 		nd.pdot = raynormal(nd.pnorm, r);
 	} else {
@@ -257,8 +257,8 @@ m_brdf(			/* color a ray that hit a BRDTfunc material 
 	copycolor(nd.mcolor, r->pcol);		/* get pattern color */
 	multcolor(nd.rdiff, nd.mcolor);		/* modify diffuse values */
 	multcolor(nd.tdiff, nd.mcolor);
-	hasrefl = bright(nd.rdiff) > FTINY;
-	hastrans = bright(nd.tdiff) > FTINY;
+	hasrefl = (bright(nd.rdiff) > FTINY);
+	hastrans = (bright(nd.tdiff) > FTINY);
 						/* load cal file */
 	nd.dp = NULL;
 	mf = getfunc(m, 9, 0x3f, 0);
@@ -271,9 +271,9 @@ m_brdf(			/* color a ray that hit a BRDTfunc material 
 	if ((errno == EDOM) | (errno == ERANGE))
 		objerror(m, WARNING, "compute error");
 	else if (rayorigin(&sr, TRANS, r, ctmp) == 0) {
-		if (!(r->crtype & SHADOW) && hastexture) {
+		if (hastexture && !(r->crtype & (SHADOW|AMBIENT))) {
 						/* perturb direction */
-			VSUM(sr.rdir, r->rdir, r->pert, -.75);
+			VSUB(sr.rdir, r->rdir, r->pert);
 			if (normalize(sr.rdir) == 0.0) {
 				objerror(m, WARNING, "illegal perturbation");
 				VCOPY(sr.rdir, r->rdir);
@@ -284,13 +284,12 @@ m_brdf(			/* color a ray that hit a BRDTfunc material 
 		rayvalue(&sr);
 		multcolor(sr.rcol, sr.rcoef);
 		addcolor(r->rcol, sr.rcol);
-		if (!hastexture) {
-			transtest = 2.0*bright(sr.rcol);
-			transdist = r->rot + sr.rt;
-		}
+		if (!hastexture || r->crtype & (SHADOW|AMBIENT))
+			r->rxt = r->rot + raydistance(&sr);
 	}
 	if (r->crtype & SHADOW)			/* the rest is shadow */
 		return(1);
+
 						/* compute reflected ray */
 	setbrdfunc(&nd);
 	errno = 0;
@@ -304,11 +303,11 @@ m_brdf(			/* color a ray that hit a BRDTfunc material 
 		checknorm(sr.rdir);
 		rayvalue(&sr);
 		multcolor(sr.rcol, sr.rcoef);
+		copycolor(r->mcol, sr.rcol);
 		addcolor(r->rcol, sr.rcol);
-		if (!hastexture && r->ro != NULL && isflat(r->ro->otype)) {
-			mirtest = 2.0*bright(sr.rcol);
-			mirdist = r->rot + sr.rt;
-		}
+		if (r->ro != NULL && isflat(r->ro->otype) &&
+				!hastexture | (r->crtype & AMBIENT))
+			r->rmt = r->rot + raydistance(&sr);
 	}
 						/* compute ambient */
 	if (hasrefl) {
@@ -334,12 +333,6 @@ m_brdf(			/* color a ray that hit a BRDTfunc material 
 	}
 	if (hasrefl | hastrans || m->oargs.sarg[6][0] != '0')
 		direct(r, dirbrdf, &nd);	/* add direct component */
-
-	d = bright(r->rcol);			/* set effective distance */
-	if (transtest > d)
-		r->rt = transdist;
-	else if (mirtest > d)
-		r->rt = mirdist;
 
 	return(1);
 }