--- ray/src/common/bsdf.c	2012/03/05 00:17:06	2.39
+++ ray/src/common/bsdf.c	2012/09/02 15:33:15	2.42
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdf.c,v 2.39 2012/03/05 00:17:06 greg Exp $";
+static const char RCSid[] = "$Id: bsdf.c,v 2.42 2012/09/02 15:33:15 greg Exp $";
 #endif
 /*
  *  bsdf.c
@@ -38,6 +38,9 @@ const char		*SDerrorEnglish[] = {
 /* Additional information on last error (ASCII English) */
 char			SDerrorDetail[256];
 
+/* Empty distribution for getCDist() calls that fail for some reason */
+const SDCDst		SDemptyCD;
+
 /* Cache of loaded BSDFs */
 struct SDCache_s	*SDcacheList = NULL;
 
@@ -94,11 +97,13 @@ SDloadGeometry(SDData *sd, ezxml_t wdb)
 		return SDEnone;
 	if ((geom = ezxml_child(wdb, "Name")) != NULL) {
 		strncpy(sd->matn, ezxml_txt(geom), SDnameLn);
-		sd->matn[SDnameLn-1] = '\0';
+		if (sd->matn[SDnameLn-1])
+			strcpy(sd->matn+(SDnameLn-4), "...");
 	}
 	if ((geom = ezxml_child(wdb, "Manufacturer")) != NULL) {
 		strncpy(sd->makr, ezxml_txt(geom), SDnameLn);
-		sd->makr[SDnameLn-1] = '\0';
+		if (sd->makr[SDnameLn-1])
+			strcpy(sd->makr+(SDnameLn-4), "...");
 	}
 	sd->dim[0] = sd->dim[1] = sd->dim[2] = .0;
 	SDerrorDetail[0] = '\0';
@@ -211,6 +216,9 @@ SDloadFile(SDData *sd, const char *fname)
 	if (sd->tf != NULL && sd->tf->maxHemi <= .001) {
 		SDfreeSpectralDF(sd->tf); sd->tf = NULL;
 	}
+	if (sd->tb != NULL && sd->tb->maxHemi <= .001) {
+		SDfreeSpectralDF(sd->tb); sd->tb = NULL;
+	}
 				/* return success */
 	return SDEnone;
 }
@@ -345,6 +353,10 @@ SDfreeBSDF(SDData *sd)
 		SDfreeSpectralDF(sd->tf);
 		sd->tf = NULL;
 	}
+	if (sd->tb != NULL) {
+		SDfreeSpectralDF(sd->tb);
+		sd->tb = NULL;
+	}
 	sd->rLambFront.cieY = .0;
 	sd->rLambFront.spec.flags = 0;
 	sd->rLambBack.cieY = .0;
@@ -432,6 +444,7 @@ SDfreeCache(const SDData *sd)
 		SDfreeCumulativeCache(sd->rf);
 		SDfreeCumulativeCache(sd->rb);
 		SDfreeCumulativeCache(sd->tf);
+		SDfreeCumulativeCache(sd->tb);
 		return;
 	}
 					/* remove from list and free */
@@ -498,7 +511,15 @@ SDmultiSamp(double t[], int n, double randX)
 	unsigned	nBits;
 	double		scale;
 	bitmask_t	ndx, coord[MS_MAXDIM];
-	
+
+	if (n <= 0)			/* check corner cases */
+		return;
+	if (randX < 0) randX = 0;
+	else if (randX >= 1.) randX = 0.999999999999999;
+	if (n == 1) {
+		t[0] = randX;
+		return;
+	}
 	while (n > MS_MAXDIM)		/* punt for higher dimensions */
 		t[--n] = rand()*(1./(RAND_MAX+.5));
 	nBits = (8*sizeof(bitmask_t) - 1) / n;
@@ -552,11 +573,13 @@ SDsizeBSDF(double *projSA, const FVECT v1, const RREAL
 	case 0:
 		return SDEargument;
 	}
-	if (v1[2] > 0)			/* front surface query? */
+	if (v1[2] > 0) {		/* front surface query? */
 		rdf = sd->rf;
-	else
+		tdf = (sd->tf != NULL) ? sd->tf : sd->tb;
+	} else {
 		rdf = sd->rb;
-	tdf = sd->tf;
+		tdf = (sd->tb != NULL) ? sd->tb : sd->tf;
+	}
 	if (v2 != NULL)			/* bidirectional? */
 		if (v1[2] > 0 ^ v2[2] > 0)
 			rdf = NULL;
@@ -604,9 +627,12 @@ SDevalBSDF(SDValue *sv, const FVECT outVec, const FVEC
 	} else if (!(inFront | outFront)) {
 		*sv = sd->rLambBack;
 		sdf = sd->rb;
-	} else /* inFront ^ outFront */ {
+	} else if (inFront) {
 		*sv = sd->tLamb;
-		sdf = sd->tf;
+		sdf = (sd->tf != NULL) ? sd->tf : sd->tb;
+	} else /* inBack */ {
+		*sv = sd->tLamb;
+		sdf = (sd->tb != NULL) ? sd->tb : sd->tf;
 	}
 	sv->cieY *= 1./M_PI;
 					/* add non-diffuse components */
@@ -630,7 +656,7 @@ double
 SDdirectHemi(const FVECT inVec, int sflags, const SDData *sd)
 {
 	double		hsum;
-	SDSpectralDF	*rdf;
+	SDSpectralDF	*rdf, *tdf;
 	const SDCDst	*cd;
 	int		i;
 					/* check arguments */
@@ -640,26 +666,28 @@ SDdirectHemi(const FVECT inVec, int sflags, const SDDa
 	if (inVec[2] > 0) {
 		hsum = sd->rLambFront.cieY;
 		rdf = sd->rf;
+		tdf = (sd->tf != NULL) ? sd->tf : sd->tb;
 	} else /* !inFront */ {
 		hsum = sd->rLambBack.cieY;
 		rdf = sd->rb;
+		tdf = (sd->tb != NULL) ? sd->tb : sd->tf;
 	}
 	if ((sflags & SDsampDf+SDsampR) != SDsampDf+SDsampR)
 		hsum = .0;
 	if ((sflags & SDsampDf+SDsampT) == SDsampDf+SDsampT)
 		hsum += sd->tLamb.cieY;
 					/* gather non-diffuse components */
-	i = ((sflags & SDsampSp+SDsampR) == SDsampSp+SDsampR &&
-			rdf != NULL) ? rdf->ncomp : 0;
+	i = (((sflags & SDsampSp+SDsampR) == SDsampSp+SDsampR) &
+			(rdf != NULL)) ? rdf->ncomp : 0;
 	while (i-- > 0) {		/* non-diffuse reflection */
 		cd = (*rdf->comp[i].func->getCDist)(inVec, &rdf->comp[i]);
 		if (cd != NULL)
 			hsum += cd->cTotal;
 	}
-	i = ((sflags & SDsampSp+SDsampT) == SDsampSp+SDsampT &&
-			sd->tf != NULL) ? sd->tf->ncomp : 0;
+	i = (((sflags & SDsampSp+SDsampT) == SDsampSp+SDsampT) &
+			(tdf != NULL)) ? tdf->ncomp : 0;
 	while (i-- > 0) {		/* non-diffuse transmission */
-		cd = (*sd->tf->comp[i].func->getCDist)(inVec, &sd->tf->comp[i]);
+		cd = (*tdf->comp[i].func->getCDist)(inVec, &tdf->comp[i]);
 		if (cd != NULL)
 			hsum += cd->cTotal;
 	}
@@ -673,7 +701,7 @@ SDsampBSDF(SDValue *sv, FVECT ioVec, double randX, int
 	SDError		ec;
 	FVECT		inVec;
 	int		inFront;
-	SDSpectralDF	*rdf;
+	SDSpectralDF	*rdf, *tdf;
 	double		rdiff;
 	float		coef[SDmaxCh];
 	int		i, j, n, nr;
@@ -690,9 +718,11 @@ SDsampBSDF(SDValue *sv, FVECT ioVec, double randX, int
 	if (inFront) {
 		*sv = sd->rLambFront;
 		rdf = sd->rf;
+		tdf = (sd->tf != NULL) ? sd->tf : sd->tb;
 	} else /* !inFront */ {
 		*sv = sd->rLambBack;
 		rdf = sd->rb;
+		tdf = (sd->tb != NULL) ? sd->tb : sd->tf;
 	}
 	if ((sflags & SDsampDf+SDsampR) != SDsampDf+SDsampR)
 		sv->cieY = .0;
@@ -700,15 +730,15 @@ SDsampBSDF(SDValue *sv, FVECT ioVec, double randX, int
 	if ((sflags & SDsampDf+SDsampT) == SDsampDf+SDsampT)
 		sv->cieY += sd->tLamb.cieY;
 					/* gather non-diffuse components */
-	i = nr = ((sflags & SDsampSp+SDsampR) == SDsampSp+SDsampR &&
-			rdf != NULL) ? rdf->ncomp : 0;
-	j = ((sflags & SDsampSp+SDsampT) == SDsampSp+SDsampT &&
-			sd->tf != NULL) ? sd->tf->ncomp : 0;
+	i = nr = (((sflags & SDsampSp+SDsampR) == SDsampSp+SDsampR) &
+			(rdf != NULL)) ? rdf->ncomp : 0;
+	j = (((sflags & SDsampSp+SDsampT) == SDsampSp+SDsampT) &
+			(tdf != NULL)) ? tdf->ncomp : 0;
 	n = i + j;
 	if (n > 0 && (cdarr = (const SDCDst **)malloc(n*sizeof(SDCDst *))) == NULL)
 		return SDEmemory;
 	while (j-- > 0) {		/* non-diffuse transmission */
-		cdarr[i+j] = (*sd->tf->comp[j].func->getCDist)(inVec, &sd->tf->comp[j]);
+		cdarr[i+j] = (*tdf->comp[j].func->getCDist)(inVec, &tdf->comp[j]);
 		if (cdarr[i+j] == NULL) {
 			free(cdarr);
 			return SDEmemory;
@@ -751,7 +781,7 @@ SDsampBSDF(SDValue *sv, FVECT ioVec, double randX, int
 	if (i >= n)
 		return SDEinternal;
 					/* compute sample direction */
-	sdc = (i < nr) ? &rdf->comp[i] : &sd->tf->comp[i-nr];
+	sdc = (i < nr) ? &rdf->comp[i] : &tdf->comp[i-nr];
 	ec = (*sdc->func->sampCDist)(ioVec, randX/cdarr[i]->cTotal, cdarr[i]);
 	if (ec)
 		return ec;
@@ -1427,7 +1457,7 @@ r_BSDF_incvec(		/* compute random input vector at give
 	if (!getBSDF_incvec(v, b, i))
 		return(0);
 	rad = sqrt(getBSDF_incohm(b, i) / PI);
-	multisamp(pert, 3, rv);
+	SDmultiSamp(pert, 3, rv);
 	for (j = 0; j < 3; j++)
 		v[j] += rad*(2.*pert[j] - 1.);
 	if (xm != NULL)
@@ -1452,7 +1482,7 @@ r_BSDF_outvec(		/* compute random output vector at giv
 	if (!getBSDF_outvec(v, b, o))
 		return(0);
 	rad = sqrt(getBSDF_outohm(b, o) / PI);
-	multisamp(pert, 3, rv);
+	SDmultiSamp(pert, 3, rv);
 	for (j = 0; j < 3; j++)
 		v[j] += rad*(2.*pert[j] - 1.);
 	if (xm != NULL)