--- ray/src/rt/aniso.c	2010/10/10 22:31:45	2.49
+++ ray/src/rt/aniso.c	2012/06/09 07:16:47	2.53
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: aniso.c,v 2.49 2010/10/10 22:31:45 greg Exp $";
+static const char RCSid[] = "$Id: aniso.c,v 2.53 2012/06/09 07:16:47 greg Exp $";
 #endif
 /*
  *  Shading functions for anisotropic materials.
@@ -277,10 +277,9 @@ m_aniso(			/* shade ray that hit something anisotropic
 
 	if (nd.rdiff > FTINY) {		/* ambient from this side */
 		copycolor(ctmp, nd.mcolor);	/* modified by material color */
-		if (nd.specfl & SP_RBLT)
-			scalecolor(ctmp, 1.0-nd.trans);
-		else
-			scalecolor(ctmp, nd.rdiff);
+		scalecolor(ctmp, nd.rdiff);
+		if (nd.specfl & SP_RBLT)	/* add in specular as well? */
+			addcolor(ctmp, nd.scolor);
 		multambient(ctmp, r, nd.pnorm);
 		addcolor(r->rcol, ctmp);	/* add to returned color */
 	}
@@ -326,8 +325,8 @@ getacoords(		/* set up coordinate system */
 		np->specfl |= SP_BADU;
 		return;
 	}
-	if (mf->f != &unitxf)
-		multv3(np->u, np->u, mf->f->xfm);
+	if (mf->fxp != &unitxf)
+		multv3(np->u, np->u, mf->fxp->xfm);
 	fcross(np->v, np->pnorm, np->u);
 	if (normalize(np->v) == 0.0) {
 		objerror(np->mp, WARNING, "illegal orientation vector");
@@ -349,27 +348,29 @@ agaussamp(		/* sample anisotropic Gaussian specular */
 	double  rv[2];
 	double  d, sinp, cosp;
 	COLOR	scol;
-	int  niter, ns2go;
+	int  maxiter, ntrials, nstarget, nstaken;
 	register int  i;
 					/* compute reflection */
 	if ((np->specfl & (SP_REFL|SP_RBLT)) == SP_REFL &&
 			rayorigin(&sr, SPECULAR, r, np->scolor) == 0) {
-		copycolor(scol, np->scolor);
-		ns2go = 1;
+		nstarget = 1;
 		if (specjitter > 1.5) {	/* multiple samples? */
-			ns2go = specjitter*r->rweight + .5;
-			if (sr.rweight <= minweight*ns2go)
-				ns2go = sr.rweight/minweight;
-			if (ns2go > 1) {
-				d = 1./ns2go;
-				scalecolor(scol, d);
+			nstarget = specjitter*r->rweight + .5;
+			if (sr.rweight <= minweight*nstarget)
+				nstarget = sr.rweight/minweight;
+			if (nstarget > 1) {
+				d = 1./nstarget;
+				scalecolor(sr.rcoef, d);
 				sr.rweight *= d;
 			} else
-				ns2go = 1;
+				nstarget = 1;
 		}
-		dimlist[ndims++] = (int)np->mp;
-		for (niter = ns2go*MAXITER; (ns2go > 0) & (niter > 0); niter--) {
-			if (specjitter > 1.5)
+		setcolor(scol, 0., 0., 0.);
+		dimlist[ndims++] = (int)(size_t)np->mp;
+		maxiter = MAXITER*nstarget;
+		for (nstaken = ntrials = 0; nstaken < nstarget &&
+						ntrials < maxiter; ntrials++) {
+			if (ntrials)
 				d = frandom();
 			else
 				d = urand(ilhash(dimlist,ndims)+samplendx);
@@ -392,23 +393,30 @@ agaussamp(		/* sample anisotropic Gaussian specular */
 				h[i] = np->pnorm[i] +
 					d*(cosp*np->u[i] + sinp*np->v[i]);
 			d = -2.0 * DOT(h, r->rdir) / (1.0 + d*d);
-			if (d <= np->pdot + FTINY)
-				continue;
 			VSUM(sr.rdir, r->rdir, h, d);
-			if (DOT(sr.rdir, r->ron) <= FTINY)
+						/* sample rejection test */
+			if ((d = DOT(sr.rdir, r->ron)) <= FTINY)
 				continue;
 			checknorm(sr.rdir);
-			if (specjitter > 1.5) {	/* adjusted W-G-M-D weight */
-				d = 2.*(1. - np->pdot/d);
-				copycolor(sr.rcoef, scol);
-				scalecolor(sr.rcoef, d);
-				rayclear(&sr);
+			if (nstarget > 1) {	/* W-G-M-D adjustment */
+				if (nstaken) rayclear(&sr);
+				rayvalue(&sr);
+				d = 2./(1. + r->rod/d);
+				scalecolor(sr.rcol, d);
+				addcolor(scol, sr.rcol);
+			} else {
+				rayvalue(&sr);
+				multcolor(sr.rcol, sr.rcoef);
+				addcolor(r->rcol, sr.rcol);
 			}
-			rayvalue(&sr);
-			multcolor(sr.rcol, sr.rcoef);
-			addcolor(r->rcol, sr.rcol);
-			--ns2go;
+			++nstaken;
 		}
+		if (nstarget > 1) {		/* final W-G-M-D weighting */
+			multcolor(scol, sr.rcoef);
+			d = (double)nstarget/ntrials;
+			scalecolor(scol, d);
+			addcolor(r->rcol, scol);
+		}
 		ndims--;
 	}
 					/* compute transmission */
@@ -416,21 +424,23 @@ agaussamp(		/* sample anisotropic Gaussian specular */
 	scalecolor(sr.rcoef, np->tspec);
 	if ((np->specfl & (SP_TRAN|SP_TBLT)) == SP_TRAN &&
 			rayorigin(&sr, SPECULAR, r, sr.rcoef) == 0) {
-		ns2go = 1;
+		nstarget = 1;
 		if (specjitter > 1.5) {	/* multiple samples? */
-			ns2go = specjitter*r->rweight + .5;
-			if (sr.rweight <= minweight*ns2go)
-				ns2go = sr.rweight/minweight;
-			if (ns2go > 1) {
-				d = 1./ns2go;
+			nstarget = specjitter*r->rweight + .5;
+			if (sr.rweight <= minweight*nstarget)
+				nstarget = sr.rweight/minweight;
+			if (nstarget > 1) {
+				d = 1./nstarget;
 				scalecolor(sr.rcoef, d);
 				sr.rweight *= d;
 			} else
-				ns2go = 1;
+				nstarget = 1;
 		}
-		dimlist[ndims++] = (int)np->mp;
-		for (niter = ns2go*MAXITER; (ns2go > 0) & (niter > 0); niter--) {
-			if (specjitter > 1.5)
+		dimlist[ndims++] = (int)(size_t)np->mp;
+		maxiter = MAXITER*nstarget;
+		for (nstaken = ntrials = 0; nstaken < nstarget &&
+						ntrials < maxiter; ntrials++) {
+			if (ntrials)
 				d = frandom();
 			else
 				d = urand(ilhash(dimlist,ndims)+1823+samplendx);
@@ -455,12 +465,12 @@ agaussamp(		/* sample anisotropic Gaussian specular */
 			if (DOT(sr.rdir, r->ron) >= -FTINY)
 				continue;
 			normalize(sr.rdir);	/* OK, normalize */
-			if (specjitter > 1.5)	/* multi-sampling */
+			if (nstaken)		/* multi-sampling */
 				rayclear(&sr);
 			rayvalue(&sr);
 			multcolor(sr.rcol, sr.rcoef);
 			addcolor(r->rcol, sr.rcol);
-			--ns2go;
+			++nstaken;
 		}
 		ndims--;
 	}