--- ray/src/common/bsdf_m.c	2011/04/19 21:31:22	3.10
+++ ray/src/common/bsdf_m.c	2011/07/07 15:48:00	3.19
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdf_m.c,v 3.10 2011/04/19 21:31:22 greg Exp $";
+static const char RCSid[] = "$Id: bsdf_m.c,v 3.19 2011/07/07 15:48:00 greg Exp $";
 #endif
 /*
  *  bsdf_m.c
@@ -11,6 +11,7 @@ static const char RCSid[] = "$Id: bsdf_m.c,v 3.10 2011
  *
  */
 
+#define	_USE_MATH_DEFINES
 #include "rtio.h"
 #include <stdlib.h>
 #include <math.h>
@@ -86,18 +87,6 @@ fequal(double a, double b)
 	return (a <= 1e-6) & (a >= -1e-6);
 }
 
-/* Returns the name of the given tag */
-#ifdef ezxml_name
-#undef ezxml_name
-static char *
-ezxml_name(ezxml_t xml)
-{
-	if (xml == NULL)
-		return NULL;
-	return xml->name;
-}
-#endif
-
 /* Returns the given tag's character content or empty string if none */
 #ifdef ezxml_txt
 #undef ezxml_txt
@@ -189,7 +178,7 @@ fo_getndx(const FVECT v, void *p)
 {
 	ANGLE_BASIS	*ab = (ANGLE_BASIS *)p;
 	int	li, ndx;
-	double	pol, azi, d;
+	double	pol, azi;
 
 	if (v == NULL)
 		return -1;
@@ -352,7 +341,7 @@ load_angle_basis(ezxml_t wab)
 					"ThetaBounds"), "LowerTheta"))),
 				abase_list[nabases].lat[i].tmin)) {
 			sprintf(SDerrorDetail, "Theta values disagree in '%s'",
-				abname);
+					abname);
 			return RC_DATERR;
 		}
 		abase_list[nabases].nangles +=
@@ -362,7 +351,7 @@ load_angle_basis(ezxml_t wab)
 				(abase_list[nabases].lat[i].nphis == 1 &&
 				abase_list[nabases].lat[i].tmin > FTINY)) {
 			sprintf(SDerrorDetail, "Illegal phi count in '%s'",
-				abname);
+					abname);
 			return RC_DATERR;
 		}
 	}
@@ -418,6 +407,8 @@ load_bsdf_data(SDData *sd, ezxml_t wdb, int rowinc)
 	int		i;
 					/* allocate BSDF component */
 	sdata = ezxml_txt(ezxml_child(wdb, "WavelengthDataDirection"));
+	if (!sdata)
+		return RC_FAIL;
 	/*
 	 * Remember that front and back are reversed from WINDOW 6 orientations
 	 * Favor their "Front" (incoming light) since that's more often valid
@@ -507,7 +498,7 @@ load_bsdf_data(SDData *sd, ezxml_t wdb, int rowinc)
 	df->comp[0].dist = dp;
 	df->comp[0].func = &SDhandleMtx;
 					/* read BSDF data */
-	sdata = ezxml_txt(ezxml_child(wdb,"ScatteringData"));
+	sdata = ezxml_txt(ezxml_child(wdb, "ScatteringData"));
 	if (!sdata || !*sdata) {
 		sprintf(SDerrorDetail, "Missing BSDF ScatteringData in '%s'",
 				sd->name);
@@ -521,12 +512,12 @@ load_bsdf_data(SDData *sd, ezxml_t wdb, int rowinc)
 					sd->name);
 			return RC_FORMERR;
 		}
-		while (*sdnext && isspace(*sdnext))
+		while (isspace(*sdnext))
 			sdnext++;
 		if (*sdnext == ',') sdnext++;
 		if (rowinc) {
 			int	r = i/dp->nout;
-			int	c = i - c*dp->nout;
+			int	c = i - r*dp->nout;
 			mBSDF_value(dp,r,c) = atof(sdata);
 		} else
 			dp->bsdf[i] = atof(sdata);
@@ -546,6 +537,10 @@ subtract_min(SDMat *sm)
 	for (i = n; --i; )
 		if (sm->bsdf[i] < minv)
 			minv = sm->bsdf[i];
+	
+	if (minv <= FTINY)
+		return .0;
+
 	for (i = n; i--; )
 		sm->bsdf[i] -= minv;
 
@@ -571,7 +566,7 @@ extract_diffuse(SDValue *dv, SDSpectralDF *df)
 		c_cmix(&dv->spec, dv->cieY, &dv->spec, ymin, &df->comp[n].cspec[0]);
 		dv->cieY += ymin;
 	}
-	df->maxHemi -= dv->cieY;	/* adjust minimum hemispherical */
+	df->maxHemi -= dv->cieY;	/* adjust maximum hemispherical */
 					/* make sure everything is set */
 	c_ccvt(&dv->spec, C_CSXY+C_CSSPEC);
 }
@@ -580,12 +575,11 @@ extract_diffuse(SDValue *dv, SDSpectralDF *df)
 SDError
 SDloadMtx(SDData *sd, ezxml_t wtl)
 {
-	ezxml_t			wld, wdb;
-	int			rowIn;
-	struct BSDF_data	*dp;
-	char			*txt;
-	int			rval;
-	
+	ezxml_t		wld, wdb;
+	int		rowIn;
+	char		*txt;
+	int		rval;
+					/* basic checks and data ordering */
 	txt = ezxml_txt(ezxml_child(ezxml_child(wtl,
 			"DataDefinition"), "IncidentDataStructure"));
 	if (txt == NULL || !*txt) {
@@ -604,12 +598,14 @@ SDloadMtx(SDData *sd, ezxml_t wtl)
 				sd->name);
 		return SDEsupport;
 	}
-				/* get angle basis */
-	rval = load_angle_basis(ezxml_child(ezxml_child(wtl,
-				"DataDefinition"), "AngleBasis"));
-	if (rval < 0)
-		return convert_errcode(rval);
-				/* load BSDF components */
+					/* get angle bases */
+	for (wld = ezxml_child(ezxml_child(wtl, "DataDefinition"), "AngleBasis");
+				wld != NULL; wld = wld->next) {
+		rval = load_angle_basis(wld);
+		if (rval < 0)
+			return convert_errcode(rval);
+	}
+					/* load BSDF components */
 	for (wld = ezxml_child(wtl, "WavelengthData");
 				wld != NULL; wld = wld->next) {
 		if (strcasecmp(ezxml_txt(ezxml_child(wld,"Wavelength")),
@@ -620,21 +616,25 @@ SDloadMtx(SDData *sd, ezxml_t wtl)
 			if ((rval = load_bsdf_data(sd, wdb, rowIn)) < 0)
 				return convert_errcode(rval);
 	}
-				/* separate diffuse components */
+					/* separate diffuse components */
 	extract_diffuse(&sd->rLambFront, sd->rf);
 	extract_diffuse(&sd->rLambBack, sd->rb);
 	extract_diffuse(&sd->tLamb, sd->tf);
-				/* return success */
+					/* return success */
 	return SDEnone;
 }
 
 /* Get Matrix BSDF value */
 static int
 SDgetMtxBSDF(float coef[SDmaxCh], const FVECT outVec,
-				const FVECT inVec, const void *dist)
+				const FVECT inVec, SDComponent *sdc)
 {
-	const SDMat	*dp = (const SDMat *)dist;
+	const SDMat	*dp;
 	int		i_ndx, o_ndx;
+					/* check arguments */
+	if ((coef == NULL) | (outVec == NULL) | (inVec == NULL) | (sdc == NULL)
+			|| (dp = (SDMat *)sdc->dist) == NULL)
+		return 0;
 					/* get angle indices */
 	i_ndx = mBSDF_incndx(dp, inVec);
 	o_ndx = mBSDF_outndx(dp, outVec);
@@ -649,26 +649,28 @@ SDgetMtxBSDF(float coef[SDmaxCh], const FVECT outVec,
 	return 1;			/* XXX monochrome for now */
 }
 
-/* Query solid angle for vector */
+/* Query solid angle for vector(s) */
 static SDError
 SDqueryMtxProjSA(double *psa, const FVECT v1, const RREAL *v2,
-					int qflags, const void *dist)
+					int qflags, SDComponent *sdc)
 {
-	const SDMat	*dp = (const SDMat *)dist;
+	const SDMat	*dp;
 	double		inc_psa, out_psa;
 					/* check arguments */
-	if ((psa == NULL) | (v1 == NULL) | (dp == NULL))
+	if ((psa == NULL) | (v1 == NULL) | (sdc == NULL) ||
+			(dp = (SDMat *)sdc->dist) == NULL)
 		return SDEargument;
 	if (v2 == NULL)
 		v2 = v1;
 					/* get projected solid angles */
 	out_psa = mBSDF_outohm(dp, mBSDF_outndx(dp, v1));
 	inc_psa = mBSDF_incohm(dp, mBSDF_incndx(dp, v2));
+	if ((v1 != v2) & (out_psa <= 0) & (inc_psa <= 0)) {
+		inc_psa = mBSDF_outohm(dp, mBSDF_outndx(dp, v2));
+		out_psa = mBSDF_incohm(dp, mBSDF_incndx(dp, v1));
+	}
 
 	switch (qflags) {		/* record based on flag settings */
-	case SDqueryVal:
-		psa[0] = .0;
-		/* fall through */
 	case SDqueryMax:
 		if (inc_psa > psa[0])
 			psa[0] = inc_psa;
@@ -676,11 +678,15 @@ SDqueryMtxProjSA(double *psa, const FVECT v1, const RR
 			psa[0] = out_psa;
 		break;
 	case SDqueryMin+SDqueryMax:
-		if (inc_psa > psa[0])
+		if (inc_psa > psa[1])
 			psa[1] = inc_psa;
-		if (out_psa > psa[0])
+		if (out_psa > psa[1])
 			psa[1] = out_psa;
 		/* fall through */
+	case SDqueryVal:
+		if (qflags == SDqueryVal)
+			psa[0] = M_PI;
+		/* fall through */
 	case SDqueryMin:
 		if ((inc_psa > 0) & (inc_psa < psa[0]))
 			psa[0] = inc_psa;
@@ -727,12 +733,13 @@ make_cdist(SDMatCDst *cd, const FVECT inVec, SDMat *dp
 static const SDCDst *
 SDgetMtxCDist(const FVECT inVec, SDComponent *sdc)
 {
-	SDMat		*dp = (SDMat *)sdc->dist;
+	SDMat		*dp;
 	int		reverse;
 	SDMatCDst	myCD;
 	SDMatCDst	*cd, *cdlast;
 					/* check arguments */
-	if ((inVec == NULL) | (dp == NULL))
+	if ((inVec == NULL) | (sdc == NULL) ||
+			(dp = (SDMat *)sdc->dist) == NULL)
 		return NULL;
 	memset(&myCD, 0, sizeof(myCD));
 	myCD.indx = mBSDF_incndx(dp, inVec);
@@ -751,17 +758,15 @@ SDgetMtxCDist(const FVECT inVec, SDComponent *sdc)
 		reverse = 1;
 	}
 	cdlast = NULL;			/* check for it in cache list */
-	for (cd = (SDMatCDst *)sdc->cdList;
-				cd != NULL; cd = (SDMatCDst *)cd->next) {
+	for (cd = (SDMatCDst *)sdc->cdList; cd != NULL;
+				cdlast = cd, cd = (SDMatCDst *)cd->next)
 		if (cd->indx == myCD.indx && (cd->calen == myCD.calen) &
 					(cd->ob_priv == myCD.ob_priv) &
 					(cd->ob_vec == myCD.ob_vec))
 			break;
-		cdlast = cd;
-	}
 	if (cd == NULL) {		/* need to allocate new entry */
 		cd = (SDMatCDst *)malloc(sizeof(SDMatCDst) +
-					myCD.calen*sizeof(myCD.carr[0]));
+					sizeof(myCD.carr[0])*myCD.calen);
 		if (cd == NULL)
 			return NULL;
 		*cd = myCD;		/* compute cumulative distribution */
@@ -781,19 +786,19 @@ SDgetMtxCDist(const FVECT inVec, SDComponent *sdc)
 
 /* Sample cumulative distribution */
 static SDError
-SDsampMtxCDist(FVECT outVec, double randX, const SDCDst *cdp)
+SDsampMtxCDist(FVECT ioVec, double randX, const SDCDst *cdp)
 {
 	const unsigned	maxval = ~0;
 	const SDMatCDst	*mcd = (const SDMatCDst *)cdp;
 	const unsigned	target = randX*maxval;
 	int		i, iupper, ilower;
 					/* check arguments */
-	if ((outVec == NULL) | (mcd == NULL))
+	if ((ioVec == NULL) | (mcd == NULL))
 		return SDEargument;
 					/* binary search to find index */
 	ilower = 0; iupper = mcd->calen;
 	while ((i = (iupper + ilower) >> 1) != ilower)
-		if ((long)target >= (long)mcd->carr[i])
+		if (target >= mcd->carr[i])
 			ilower = i;
 		else
 			iupper = i;
@@ -801,9 +806,9 @@ SDsampMtxCDist(FVECT outVec, double randX, const SDCDs
 	randX = (randX*maxval - mcd->carr[ilower]) /
 			(double)(mcd->carr[iupper] - mcd->carr[ilower]);
 					/* convert index to vector */
-	if ((*mcd->ob_vec)(outVec, i+randX, mcd->ob_priv))
+	if ((*mcd->ob_vec)(ioVec, i+randX, mcd->ob_priv))
 		return SDEnone;
-	strcpy(SDerrorDetail, "BSDF sampling fault");
+	strcpy(SDerrorDetail, "Matrix BSDF sampling fault");
 	return SDEinternal;
 }