--- ray/src/cv/bsdf2klems.c	2013/08/11 14:32:34	2.9
+++ ray/src/cv/bsdf2klems.c	2014/03/12 21:15:31	2.13
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdf2klems.c,v 2.9 2013/08/11 14:32:34 greg Exp $";
+static const char RCSid[] = "$Id: bsdf2klems.c,v 2.13 2014/03/12 21:15:31 greg Exp $";
 #endif
 /*
  * Load measured BSDF interpolant and write out as XML file with Klems matrix.
@@ -25,9 +25,40 @@ char			*progname;
 static const char	*kbasis = "LBNL/Klems Full";
 				/* number of BSDF samples per patch */
 static int		npsamps = 256;
+				/* limit on number of RBF lobes */
+static int		lobe_lim = 15000;
+				/* progress bar length */
+static int		do_prog = 79;
 
+
+/* Start new progress bar */
+#define prog_start(s)	if (do_prog) fprintf(stderr, "%s: %s...\n", progname, s); else
+
+/* Draw progress bar of the appropriate length */
+static void
+prog_show(double frac)
+{
+	char	pbar[256];
+	int	nchars;
+
+	if (do_prog <= 0) return;
+	if (do_prog > sizeof(pbar)-2)
+		do_prog = sizeof(pbar)-2;
+	if (frac < 0) frac = 0;
+	else if (frac > 1) frac = 1;
+	nchars = do_prog*frac + .5;
+	pbar[0] = '\r';
+	memset(pbar+1, '*', nchars);
+	memset(pbar+1+nchars, '-', do_prog-nchars);
+	pbar[do_prog+1] = '\0';
+	fputs(pbar, stderr);
+}
+
+/* Finish progress bar */
+#define	prog_done()	if (do_prog) fputc('\n',stderr); else
+
 /* Return angle basis corresponding to the given name */
-ANGLE_BASIS *
+static ANGLE_BASIS *
 get_basis(const char *bn)
 {
 	int	n = nabases;
@@ -56,8 +87,10 @@ xml_header(int ac, char *av[])
 static void
 xml_prologue(const SDData *sd)
 {
-	const char	*matn = (sd && sd->matn[0]) ? sd->matn : "Name";
-	const char	*makr = (sd && sd->makr[0]) ? sd->makr : "Manufacturer";
+	const char	*matn = (sd && sd->matn[0]) ? sd->matn :
+				bsdf_name[0] ? bsdf_name : "Unknown";
+	const char	*makr = (sd && sd->makr[0]) ? sd->makr :
+				bsdf_manuf[0] ? bsdf_manuf : "Unknown";
 	ANGLE_BASIS	*abp = get_basis(kbasis);
 	int		i;
 
@@ -293,8 +326,10 @@ eval_function(char *funame)
 		printf("\t%.3e\n", sum/npsamps);
 	    }
 	    putchar('\n');
+	    prog_show((j+1.)/abp->nangles);
 	}
 	data_epilogue();			/* finish output */
+	prog_done();
 }
 
 /* Interpolate and output a radial basis function BSDF representation */
@@ -319,7 +354,7 @@ eval_rbf(void)
 	    else
 		bi_getvec(vin, i+.5*(i>0), abp);
 
-	    rbf = advect_rbf(vin);		/* compute radial basis func */
+	    rbf = advect_rbf(vin, lobe_lim);	/* compute radial basis func */
 
 	    for (j = 0; j < abp->nangles; j++) {
 	        sum = 0;			/* sample over exiting patch */
@@ -329,12 +364,14 @@ eval_rbf(void)
 		    else
 			bo_getvec(vout, j+(n+frandom())/npsamps, abp);
 
-		    sum += eval_rbfrep(rbf, vout) / vout[2];
+		    sum += eval_rbfrep(rbf, vout);
 		}
-		bsdfarr[j*abp->nangles + i] = sum*output_orient/npsamps;
+		fo_getvec(vout, j+.5, abp);	/* use centered secant */
+		bsdfarr[j*abp->nangles + i] = sum / (npsamps*vout[2]);
 	    }
 	    if (rbf != NULL)
 		free(rbf);
+	    prog_show((i+1.)/abp->nangles);
 	}
 	n = 0;					/* write out our matrix */
 	for (j = 0; j < abp->nangles; j++) {
@@ -343,6 +380,7 @@ eval_rbf(void)
 	    putchar('\n');
 	}
 	data_epilogue();			/* finish output */
+	prog_done();
 }
 
 /* Read in BSDF and interpolate as Klems matrix representation */
@@ -385,6 +423,12 @@ main(int argc, char *argv[])
 		case 'q':
 			kbasis = "LBNL/Klems Quarter";
 			break;
+		case 'l':
+			lobe_lim = atoi(argv[++i]);
+			break;
+		case 'p':
+			do_prog = atoi(argv[i]+2);
+			break;
 		default:
 			goto userr;
 		}
@@ -393,8 +437,7 @@ main(int argc, char *argv[])
 			fprintf(stderr,
 	"%s: need single function with 6 arguments: bsdf(ix,iy,iz,ox,oy,oz)\n",
 					progname);
-			fprintf(stderr, "\tor 3 arguments using Dx,Dy,Dz: bsdf(ix,iy,iz)\n",
-					progname);
+			fprintf(stderr, "\tor 3 arguments using Dx,Dy,Dz: bsdf(ix,iy,iz)\n");
 			goto userr;
 		}
 		++eclock;
@@ -403,16 +446,20 @@ main(int argc, char *argv[])
 		if (dofwd) {
 			input_orient = -1;
 			output_orient = -1;
-			eval_function(argv[i]);		/* outside reflectance */
+			prog_start("Evaluating outside reflectance");
+			eval_function(argv[i]);
 			output_orient = 1;
-			eval_function(argv[i]);		/* outside -> inside */
+			prog_start("Evaluating outside->inside transmission");
+			eval_function(argv[i]);
 		}
 		if (dobwd) {
 			input_orient = 1;
 			output_orient = 1;
-			eval_function(argv[i]);		/* inside reflectance */
+			prog_start("Evaluating inside reflectance");
+			eval_function(argv[i]);
 			output_orient = -1;
-			eval_function(argv[i]);		/* inside -> outside */
+			prog_start("Evaluating inside->outside transmission");
+			eval_function(argv[i]);
 		}
 		xml_epilogue();			/* finish XML output & exit */
 		return(0);
@@ -428,6 +475,7 @@ main(int argc, char *argv[])
 	if (i < argc) {				/* open input files if given */
 		int	nbsdf = 0;
 		for ( ; i < argc; i++) {	/* interpolate each component */
+			char	pbuf[256];
 			FILE	*fpin = fopen(argv[i], "rb");
 			if (fpin == NULL) {
 				fprintf(stderr, "%s: cannot open BSDF interpolant '%s'\n",
@@ -441,6 +489,8 @@ main(int argc, char *argv[])
 				xml_header(argc, argv);
 				xml_prologue(NULL);
 			}
+			sprintf(pbuf, "Interpolating component '%s'", argv[i]);
+			prog_start(pbuf);
 			eval_rbf();
 		}
 		xml_epilogue();			/* finish XML output & exit */
@@ -451,12 +501,13 @@ main(int argc, char *argv[])
 		return(1);
 	xml_header(argc, argv);			/* start XML output */
 	xml_prologue(NULL);
+	prog_start("Interpolating from standard input");
 	eval_rbf();				/* resample dist. */
 	xml_epilogue();				/* finish XML output & exit */
 	return(0);
 userr:
 	fprintf(stderr,
-	"Usage: %s [-n spp][-h|-q][bsdf.sir ..] > bsdf.xml\n", progname);
+	"Usage: %s [-n spp][-h|-q][-l maxlobes] [bsdf.sir ..] > bsdf.xml\n", progname);
 	fprintf(stderr,
 	"   or: %s [-n spp][-h|-q] bsdf_in.xml > bsdf_out.xml\n", progname);
 	fprintf(stderr,