--- ray/src/cv/bsdfrep.c	2012/11/07 03:04:23	2.5
+++ ray/src/cv/bsdfrep.c	2012/11/09 02:16:29	2.8
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdfrep.c,v 2.5 2012/11/07 03:04:23 greg Exp $";
+static const char RCSid[] = "$Id: bsdfrep.c,v 2.8 2012/11/09 02:16:29 greg Exp $";
 #endif
 /*
  * Support BSDF representation as radial basis functions.
@@ -56,6 +56,8 @@ new_input_direction(double new_theta, double new_phi)
 		new_theta = -new_theta;
 		new_phi += 180.;
 	}
+	if ((theta_in_deg = new_theta) < 1.0)
+		return(1);		/* don't rely on phi near normal */
 	while (new_phi < 0)
 		new_phi += 360.;
 	while (new_phi >= 360.)
@@ -64,7 +66,6 @@ new_input_direction(double new_theta, double new_phi)
 		single_plane_incident = (round(new_phi) == round(phi_in_deg));
 	else if (single_plane_incident < 0)
 		single_plane_incident = 1;
-	theta_in_deg = new_theta;	/* assume it's OK */
 	phi_in_deg = new_phi;
 	if ((1. < new_phi) & (new_phi < 89.))
 		inp_coverage |= INP_QUAD1;
@@ -177,6 +178,27 @@ rev_rbf_symmetry(RBFNODE *rbf, int sym)
 			rbf->rbfa[n].gy = grid_res-1 - rbf->rbfa[n].gy;
 }
 
+/* Rotate RBF to correspond to given incident vector */
+void
+rotate_rbf(RBFNODE *rbf, const FVECT invec)
+{
+	static const FVECT	vnorm = {.0, .0, 1.};
+	const double		phi = atan2(invec[1],invec[0]) -
+					atan2(rbf->invec[1],rbf->invec[0]);
+	FVECT			outvec;
+	int			pos[2];
+	int			n;
+
+	for (n = 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);
+		rbf->rbfa[n].gx = pos[0];
+		rbf->rbfa[n].gy = pos[1];
+	}
+	VCOPY(rbf->invec, invec);
+}
+
 /* Compute volume associated with Gaussian lobe */
 double
 rbf_volume(const RBFVAL *rbfp)
@@ -193,7 +215,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);
@@ -219,7 +241,7 @@ 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;
@@ -469,7 +491,7 @@ load_bsdf_rep(FILE *ifp)
 					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;