--- ray/src/cv/bsdf2ttree.c	2014/03/24 03:50:28	2.28
+++ ray/src/cv/bsdf2ttree.c	2016/02/02 18:02:32	2.32
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdf2ttree.c,v 2.28 2014/03/24 03:50:28 greg Exp $";
+static const char RCSid[] = "$Id: bsdf2ttree.c,v 2.32 2016/02/02 18:02:32 greg Exp $";
 #endif
 /*
  * Load measured BSDF interpolant and write out as XML file with tensor tree.
@@ -19,9 +19,9 @@ static const char RCSid[] = "$Id: bsdf2ttree.c,v 2.28 
 				/* global argv[0] */
 char			*progname;
 				/* percentage to cull (<0 to turn off) */
-double			pctcull = 90.;
+static double		pctcull = 90.;
 				/* sampling order */
-int			samp_order = 6;
+static int		samp_order = 6;
 				/* super-sampling threshold */
 const double		ssamp_thresh = 0.35;
 				/* number of super-samples */
@@ -34,6 +34,7 @@ static int		lobe_lim = 15000;
 static int		do_prog = 79;
 
 
+
 /* Start new progress bar */
 #define prog_start(s)	if (do_prog) fprintf(stderr, "%s: %s...\n", progname, s); else
 
@@ -41,18 +42,21 @@ static int		do_prog = 79;
 static void
 prog_show(double frac)
 {
-	char	pbar[256];
-	int	nchars;
+	static unsigned	call_cnt = 0;
+	static char	lastc[] = "-\\|/";
+	char		pbar[256];
+	int		nchars;
 
-	if (do_prog <= 0) return;
+	if (do_prog <= 1) 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;
+	else if (frac >= 1) frac = .9999;
+	nchars = do_prog*frac;
 	pbar[0] = '\r';
 	memset(pbar+1, '*', nchars);
-	memset(pbar+1+nchars, '-', do_prog-nchars);
+	pbar[nchars+1] = lastc[call_cnt++ & 3];
+	memset(pbar+2+nchars, '-', do_prog-nchars-1);
 	pbar[do_prog+1] = '\0';
 	fputs(pbar, stderr);
 }
@@ -70,76 +74,6 @@ prog_done(void)
 	fputc('\r', stderr);
 }
 
-/* Output XML prologue to stdout */
-static void
-xml_prologue(int ac, char *av[])
-{
-	puts("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-	puts("<WindowElement xmlns=\"http://windows.lbl.gov\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://windows.lbl.gov/BSDF-v1.4.xsd\">");
-	fputs("<!-- File produced by:", stdout);
-	while (ac-- > 0) {
-		fputc(' ', stdout);
-		fputs(*av++, stdout);
-	}
-	puts(" -->");
-	puts("<WindowElementType>System</WindowElementType>");
-	puts("<FileType>BSDF</FileType>");
-	puts("<Optical>");
-	puts("<Layer>");
-	puts("\t<Material>");
-	printf("\t\t<Name>%s</Name>\n", bsdf_name[0] ? bsdf_name : "Unknown");
-	printf("\t\t<Manufacturer>%s</Manufacturer>\n",
-			bsdf_manuf[0] ? bsdf_manuf : "Unknown");
-	puts("\t\t<DeviceType>Other</DeviceType>");
-	puts("\t</Material>");
-	puts("\t<DataDefinition>");
-	printf("\t\t<IncidentDataStructure>TensorTree%c</IncidentDataStructure>\n",
-			single_plane_incident ? '3' : '4');
-	puts("\t</DataDefinition>");
-}
-
-/* Output XML data prologue to stdout */
-static void
-data_prologue()
-{
-	static const char	*bsdf_type[4] = {
-					"Reflection Front",
-					"Transmission Front",
-					"Transmission Back",
-					"Reflection Back"
-				};
-
-	puts("\t<WavelengthData>");
-	puts("\t\t<LayerNumber>System</LayerNumber>");
-	puts("\t\t<Wavelength unit=\"Integral\">Visible</Wavelength>");
-	puts("\t\t<SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
-	puts("\t\t<DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>");
-	puts("\t\t<WavelengthDataBlock>");
-	printf("\t\t\t<WavelengthDataDirection>%s</WavelengthDataDirection>\n",
-			bsdf_type[(input_orient>0)<<1 | (output_orient>0)]);
-	puts("\t\t\t<AngleBasis>LBNL/Shirley-Chiu</AngleBasis>");
-	puts("\t\t\t<ScatteringDataType>BTDF</ScatteringDataType>");
-	puts("\t\t\t<ScatteringData>");
-}
-
-/* Output XML data epilogue to stdout */
-static void
-data_epilogue(void)
-{
-	puts("\t\t\t</ScatteringData>");
-	puts("\t\t</WavelengthDataBlock>");
-	puts("\t</WavelengthData>");
-}
-
-/* Output XML epilogue to stdout */
-static void
-xml_epilogue(void)
-{
-	puts("</Layer>");
-	puts("</Optical>");
-	puts("</WindowElement>");
-}
-
 /* Compute absolute relative difference */
 static double
 abs_diff(double v1, double v0)
@@ -199,8 +133,7 @@ eval_isotropic(char *funame)
 			iovec[5] = output_orient *
 				sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]);
 			if (funame == NULL)
-			    bsdf = eval_rbfrep(rbf, iovec+3) *
-						output_orient/iovec[5];
+			    bsdf = eval_rbfrep(rbf, iovec+3);
 			else {
 			    if (assignD) {
 				varset("Dx", '=', -iovec[3]);
@@ -313,8 +246,7 @@ eval_anisotropic(char *funame)
 			iovec[5] = output_orient *
 				sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]);
 			if (funame == NULL)
-			    bsdf = eval_rbfrep(rbf, iovec+3) *
-						output_orient/iovec[5];
+			    bsdf = eval_rbfrep(rbf, iovec+3);
 			else {
 			    if (assignD) {
 				varset("Dx", '=', -iovec[3]);