--- ray/src/cv/bsdfrep.c	2013/10/19 00:11:50	2.15
+++ ray/src/cv/bsdfrep.c	2013/11/09 05:47:49	2.19
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdfrep.c,v 2.15 2013/10/19 00:11:50 greg Exp $";
+static const char RCSid[] = "$Id: bsdfrep.c,v 2.19 2013/11/09 05:47:49 greg Exp $";
 #endif
 /*
  * Support BSDF representation as radial basis functions.
@@ -14,6 +14,9 @@ static const char RCSid[] = "$Id: bsdfrep.c,v 2.15 201
 #include "rtio.h"
 #include "resolu.h"
 #include "bsdfrep.h"
+				/* name and manufacturer if known */
+char			bsdf_name[256];
+char			bsdf_manuf[256];
 				/* active grid resolution */
 int			grid_res = GRIDRES;
 
@@ -258,11 +261,13 @@ rbf_volume(const RBFVAL *rbfp)
 double
 eval_rbfrep(const RBFNODE *rp, const FVECT outvec)
 {
+	const double	rfact2 = (38./M_PI/M_PI)*(grid_res*grid_res);
 	double		minval = bsdf_min*output_orient*outvec[2];
+	int		pos[2];
 	double		res = 0;
 	const RBFVAL	*rbfp;
 	FVECT		odir;
-	double		sig2;
+	double		rad2;
 	int		n;
 				/* check for wrong side */
 	if (outvec[2] > 0 ^ output_orient > 0)
@@ -270,14 +275,19 @@ eval_rbfrep(const RBFNODE *rp, const FVECT outvec)
 				/* use minimum if no information avail. */
 	if (rp == NULL)
 		return(minval);
+				/* optimization for fast lobe culling */
+	pos_from_vec(pos, outvec);
 				/* sum radial basis function */
 	rbfp = rp->rbfa;
 	for (n = rp->nrbf; n--; rbfp++) {
+		int	d2 = (pos[0]-rbfp->gx)*(pos[0]-rbfp->gx) +
+				(pos[1]-rbfp->gy)*(pos[1]-rbfp->gy);
+		rad2 = R2ANG(rbfp->crad);
+		rad2 *= rad2;
+		if (d2 > rad2*rfact2)
+			continue;
 		ovec_from_pos(odir, rbfp->gx, rbfp->gy);
-		sig2 = R2ANG(rbfp->crad);
-		sig2 = (DOT(odir,outvec) - 1.) / (sig2*sig2);
-		if (sig2 > -19.)
-			res += rbfp->peak * exp(sig2);
+		res += rbfp->peak * exp((DOT(odir,outvec) - 1.) / rad2);
 	}
 	if (res < minval)	/* never return less than minval */
 		return(minval);
@@ -397,6 +407,8 @@ clear_bsdf_rep(void)
 		dsf_list = rbf->next;
 		free(rbf);
 	}
+	bsdf_name[0] = '\0';
+	bsdf_manuf[0] = '\0';
 	inp_coverage = 0;
 	single_plane_incident = -1;
 	input_orient = output_orient = 0;
@@ -411,6 +423,10 @@ save_bsdf_rep(FILE *ofp)
 	MIGRATION	*mig;
 	int		i, n;
 					/* finish header */
+	if (bsdf_name[0])
+		fprintf(ofp, "NAME=%s\n", bsdf_name);
+	if (bsdf_manuf[0])
+		fprintf(ofp, "MANUFACT=%s\n", bsdf_manuf);
 	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);
@@ -467,6 +483,14 @@ headline(char *s, void *p)
 {
 	char	fmt[32];
 
+	if (!strncmp(s, "NAME=", 5)) {
+		strcpy(bsdf_name, s+5);
+		bsdf_name[strlen(bsdf_name)-1] = '\0';
+	}
+	if (!strncmp(s, "MANUFACT=", 9)) {
+		strcpy(bsdf_manuf, s+9);
+		bsdf_manuf[strlen(bsdf_manuf)-1] = '\0';
+	}
 	if (!strncmp(s, "SYMMETRY=", 9)) {
 		inp_coverage = atoi(s+9);
 		single_plane_incident = !inp_coverage;
@@ -506,8 +530,7 @@ load_bsdf_rep(FILE *ifp)
 				progname);
 		return(0);
 	}
-	rbfh.next = NULL;		/* read each DSF */
-	rbfh.ejl = NULL;
+	memset(&rbfh, 0, sizeof(rbfh));	/* read each DSF */
 	while ((rbfh.ord = getint(4, ifp)) >= 0) {
 		RBFNODE		*newrbf;
 
@@ -524,7 +547,7 @@ load_bsdf_rep(FILE *ifp)
 					sizeof(RBFVAL)*(rbfh.nrbf-1));
 		if (newrbf == NULL)
 			goto memerr;
-		memcpy(newrbf, &rbfh, sizeof(RBFNODE)-sizeof(RBFVAL));
+		*newrbf = rbfh;
 		for (i = 0; i < rbfh.nrbf; i++) {
 			newrbf->rbfa[i].peak = getflt(ifp);
 			newrbf->rbfa[i].crad = getint(2, ifp) & 0xffff;