--- ray/src/cv/bsdfrep.c	2012/11/08 22:05:04	2.7
+++ ray/src/cv/bsdfrep.c	2013/03/20 01:00:22	2.12
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdfrep.c,v 2.7 2012/11/08 22:05:04 greg Exp $";
+static const char RCSid[] = "$Id: bsdfrep.c,v 2.12 2013/03/20 01:00:22 greg Exp $";
 #endif
 /*
  * Support BSDF representation as radial basis functions.
@@ -26,6 +26,12 @@ int			single_plane_incident = -1;
 int			input_orient = 0;
 int			output_orient = 0;
 
+				/* BSDF histogram */
+int			bsdf_hist[HISTLEN];
+
+				/* BSDF value for boundary regions */
+double			bsdf_min = 0;
+
 				/* processed incident DSF measurements */
 RBFNODE			*dsf_list = NULL;
 
@@ -82,7 +88,7 @@ new_input_direction(double new_theta, double new_phi)
 int
 use_symmetry(FVECT vec)
 {
-	double	phi = get_phi360(vec);
+	const double	phi = get_phi360(vec);
 
 	switch (inp_coverage) {
 	case INP_QUAD1|INP_QUAD2|INP_QUAD3|INP_QUAD4:
@@ -188,14 +194,8 @@ rotate_rbf(RBFNODE *rbf, const FVECT invec)
 	FVECT			outvec;
 	int			pos[2];
 	int			n;
-#ifdef DEBUG
-	double	tdiff = 180./M_PI*fabs(acos(invec[2])-acos(rbf->invec[2]));
-	if (tdiff >= 1.5)
-		fprintf(stderr,
-			"%s: Warning - rotated theta differs by %.1f degrees\n",
-				progname, tdiff);
-#endif
-	for (n = rbf->nrbf; n-- > 0; ) {
+
+	for (n = ((-.01 > phi) | (phi > .01))*rbf->nrbf; n-- > 0; ) {
 		ovec_from_pos(outvec, rbf->rbfa[n].gx, rbf->rbfa[n].gy);
 		spinvector(outvec, outvec, vnorm, phi);
 		pos_from_vec(pos, outvec);
@@ -221,7 +221,7 @@ ovec_from_pos(FVECT vec, int xpos, int ypos)
 	double	uv[2];
 	double	r2;
 	
-	SDsquare2disk(uv, (1./grid_res)*(xpos+.5), (1./grid_res)*(ypos+.5));
+	SDsquare2disk(uv, (xpos+.5)/grid_res, (ypos+.5)/grid_res);
 				/* uniform hemispherical projection */
 	r2 = uv[0]*uv[0] + uv[1]*uv[1];
 	vec[0] = vec[1] = sqrt(2. - r2);
@@ -247,14 +247,17 @@ pos_from_vec(int pos[2], const FVECT vec)
 double
 eval_rbfrep(const RBFNODE *rp, const FVECT outvec)
 {
-	double		res = .0;
+	double		res = 0;
 	const RBFVAL	*rbfp;
 	FVECT		odir;
 	double		sig2;
 	int		n;
-
-	if (rp == NULL)
-		return(.0);
+				/* use minimum if no information avail. */
+	if (rp == NULL) {
+		if (outvec[2] > 0 ^ output_orient > 0)
+			return(.0);
+		return(bsdf_min*output_orient*outvec[2]);
+	}
 	rbfp = rp->rbfa;
 	for (n = rp->nrbf; n--; rbfp++) {
 		ovec_from_pos(odir, rbfp->gx, rbfp->gy);
@@ -396,6 +399,7 @@ save_bsdf_rep(FILE *ofp)
 	fprintf(ofp, "SYMMETRY=%d\n", !single_plane_incident * inp_coverage);
 	fprintf(ofp, "IO_SIDES= %d %d\n", input_orient, output_orient);
 	fprintf(ofp, "GRIDRES=%d\n", grid_res);
+	fprintf(ofp, "BSDFMIN=%g\n", bsdf_min);
 	fputformat(BSDFREP_FMT, ofp);
 	fputc('\n', ofp);
 					/* write each DSF */
@@ -461,6 +465,10 @@ headline(char *s, void *p)
 		sscanf(s+8, "%d", &grid_res);
 		return(0);
 	}
+	if (!strncmp(s, "BSDFMIN=", 8)) {
+		sscanf(s+8, "%lf", &bsdf_min);
+		return(0);
+	}
 	if (formatval(fmt, s) && strcmp(fmt, BSDFREP_FMT))
 		return(-1);
 	return(0);
@@ -491,13 +499,17 @@ load_bsdf_rep(FILE *ifp)
 		rbfh.invec[0] = getflt(ifp);
 		rbfh.invec[1] = getflt(ifp);
 		rbfh.invec[2] = getflt(ifp);
+		if (normalize(rbfh.invec) == 0) {
+			fprintf(stderr, "%s: zero incident vector\n", progname);
+			return(0);
+		}
 		rbfh.vtotal = getflt(ifp);
 		rbfh.nrbf = getint(4, ifp);
 		newrbf = (RBFNODE *)malloc(sizeof(RBFNODE) +
 					sizeof(RBFVAL)*(rbfh.nrbf-1));
 		if (newrbf == NULL)
 			goto memerr;
-		memcpy(newrbf, &rbfh, sizeof(RBFNODE));
+		memcpy(newrbf, &rbfh, sizeof(RBFNODE)-sizeof(RBFVAL));
 		for (i = 0; i < rbfh.nrbf; i++) {
 			newrbf->rbfa[i].peak = getflt(ifp);
 			newrbf->rbfa[i].crad = getint(2, ifp) & 0xffff;