--- ray/src/cv/pabopto2bsdf.c	2014/02/17 21:56:22	2.13
+++ ray/src/cv/pabopto2bsdf.c	2016/02/02 00:42:11	2.29
@@ -1,12 +1,14 @@
 #ifndef lint
-static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.13 2014/02/17 21:56:22 greg Exp $";
+static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.29 2016/02/02 00:42:11 greg Exp $";
 #endif
 /*
  * Load measured BSDF data in PAB-Opto format.
+ * Assumes that surface-normal (Z-axis) faces into room unless -t option given.
  *
  *	G. Ward
  */
 
+#define _USE_MATH_DEFINES
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14,35 +16,37 @@ static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.1
 #include <math.h>
 #include "platform.h"
 #include "bsdfrep.h"
+#include "resolu.h"
 				/* global argv[0] */
 char			*progname;
 
 typedef struct {
 	const char	*fname;		/* input file path */
-	double		theta, phi;	/* incident angles (in degrees) */
+	double		theta, phi;	/* input angles (degrees) */
+	double		up_phi;		/* azimuth for "up" direction */
+	int		igp[2];		/* input grid position */
 	int		isDSF;		/* data is DSF (rather than BSDF)? */
+	int		nspec;		/* number of spectral samples */
 	long		dstart;		/* data start offset in file */
 } PGINPUT;
 
 PGINPUT		*inpfile;	/* input files sorted by incidence */
 int		ninpfiles;	/* number of input files */
 
+int		rev_orient = 0;	/* shall we reverse surface orientation? */
+
 /* Compare incident angles */
 static int
-cmp_inang(const void *p1, const void *p2)
+cmp_indir(const void *p1, const void *p2)
 {
 	const PGINPUT	*inp1 = (const PGINPUT *)p1;
 	const PGINPUT	*inp2 = (const PGINPUT *)p2;
+	int		ydif = inp1->igp[1] - inp2->igp[1];
 	
-	if (inp1->theta > inp2->theta+FTINY)
-		return(1);
-	if (inp1->theta < inp2->theta-FTINY)
-		return(-1);
-	if (inp1->phi > inp2->phi+FTINY)
-		return(1);
-	if (inp1->phi < inp2->phi-FTINY)
-		return(-1);
-	return(0);
+	if (ydif)
+		return(ydif);
+
+	return(inp1->igp[0] - inp2->igp[0]);
 }
 
 /* Prepare a PAB-Opto input file by reading its header */
@@ -50,6 +54,7 @@ static int
 init_pabopto_inp(const int i, const char *fname)
 {
 	FILE	*fp = fopen(fname, "r");
+	FVECT	dv;
 	char	buf[2048];
 	int	c;
 	
@@ -60,10 +65,12 @@ init_pabopto_inp(const int i, const char *fname)
 	}
 	inpfile[i].fname = fname;
 	inpfile[i].isDSF = -1;
+	inpfile[i].nspec = 0;
+	inpfile[i].up_phi = 0;
 	inpfile[i].theta = inpfile[i].phi = -10001.;
 				/* read header information */
 	while ((c = getc(fp)) == '#' || c == EOF) {
-		char	typ[32];
+		char	typ[64];
 		if (fgets(buf, sizeof(buf), fp) == NULL) {
 			fputs(fname, stderr);
 			fputs(": unexpected EOF\n", stderr);
@@ -72,16 +79,24 @@ init_pabopto_inp(const int i, const char *fname)
 		}
 		if (sscanf(buf, "sample_name \"%[^\"]\"", bsdf_name) == 1)
 			continue;
+		if (sscanf(buf, "colorimetry: %s", typ) == 1) {
+			if (!strcasecmp(typ, "CIE-XYZ"))
+				inpfile[i].nspec = 3;
+			else if (!strcasecmp(typ, "CIE-Y"))
+				inpfile[i].nspec = 1;
+			continue;
+		}
 		if (sscanf(buf, "format: theta phi %s", typ) == 1) {
-			if (!strcasecmp(typ, "DSF")) {
+			if (!strcasecmp(typ, "DSF"))
 				inpfile[i].isDSF = 1;
-				continue;
-			}
-			if (!strcasecmp(typ, "BSDF")) {
+			else if (!strcasecmp(typ, "BSDF") ||
+					!strcasecmp(typ, "BRDF") ||
+					!strcasecmp(typ, "BTDF"))
 				inpfile[i].isDSF = 0;
-				continue;
-			}
+			continue;
 		}
+		if (sscanf(buf, "upphi %lf", &inpfile[i].up_phi) == 1)
+			continue;
 		if (sscanf(buf, "intheta %lf", &inpfile[i].theta) == 1)
 			continue;
 		if (sscanf(buf, "inphi %lf", &inpfile[i].phi) == 1)
@@ -102,8 +117,18 @@ init_pabopto_inp(const int i, const char *fname)
 		fputs(": unknown incident angle\n", stderr);
 		return(0);
 	}
-	while (inpfile[i].phi < 0)	/* normalize phi direction */
-		inpfile[i].phi += 360.;
+	if (rev_orient) {	/* reverse Z-axis to face outside */
+		inpfile[i].theta = 180. - inpfile[i].theta;
+		inpfile[i].phi = 360. - inpfile[i].phi;
+	}
+				/* convert to Y-up orientation */
+	inpfile[i].phi += 90.-inpfile[i].up_phi;
+				/* convert angle to grid position */
+	dv[2] = sin(M_PI/180.*inpfile[i].theta);
+	dv[0] = cos(M_PI/180.*inpfile[i].phi)*dv[2];
+	dv[1] = sin(M_PI/180.*inpfile[i].phi)*dv[2];
+	dv[2] = sqrt(1. - dv[2]*dv[2]);
+	pos_from_vec(inpfile[i].igp, dv);
 	return(1);
 }
 
@@ -111,9 +136,9 @@ init_pabopto_inp(const int i, const char *fname)
 static int
 add_pabopto_inp(const int i)
 {
-	FILE	*fp = fopen(inpfile[i].fname, "r");
-	double	theta_out, phi_out, val;
-	int	n, c;
+	FILE		*fp = fopen(inpfile[i].fname, "r");
+	double		theta_out, phi_out, val[3];
+	int		n, c;
 	
 	if (fp == NULL || fseek(fp, inpfile[i].dstart, 0) == EOF) {
 		fputs(inpfile[i].fname, stderr);
@@ -121,21 +146,36 @@ add_pabopto_inp(const int i)
 		return(0);
 	}
 					/* prepare input grid */
-	if (!i || cmp_inang(&inpfile[i-1], &inpfile[i])) {
-		if (i)			/* need to process previous incidence */
+	if (!i || cmp_indir(&inpfile[i-1], &inpfile[i])) {
+		if (i)			/* process previous incidence */
 			make_rbfrep();
 #ifdef DEBUG
-		fprintf(stderr, "New incident (theta,phi)=(%f,%f)\n",
+		fprintf(stderr, "New incident (theta,phi)=(%.1f,%.1f)\n",
 					inpfile[i].theta, inpfile[i].phi);
 #endif
+		if (inpfile[i].nspec)
+			set_spectral_samples(inpfile[i].nspec);
 		new_bsdf_data(inpfile[i].theta, inpfile[i].phi);
 	}
 #ifdef DEBUG
 	fprintf(stderr, "Loading measurements from '%s'...\n", inpfile[i].fname);
 #endif
 					/* read scattering data */
-	while (fscanf(fp, "%lf %lf %lf\n", &theta_out, &phi_out, &val) == 3)
-		add_bsdf_data(theta_out, phi_out, val, inpfile[i].isDSF);
+	while (fscanf(fp, "%lf %lf %lf", &theta_out, &phi_out, val) == 3) {
+		for (n = 1; n < inpfile[i].nspec; n++)
+			if (fscanf(fp, "%lf", val+n) != 1) {
+				fprintf(stderr, "%s: warning: unexpected EOF\n",
+						inpfile[i].fname);
+				fclose(fp);
+				return(1);
+			}
+		if (rev_orient) {	/* reverse Z-axis to face outside */
+			theta_out = 180. - theta_out;
+			phi_out = 360. - phi_out;
+		}
+		add_bsdf_data(theta_out, phi_out+90.-inpfile[i].up_phi,
+				val, inpfile[i].isDSF);
+	}
 	n = 0;
 	while ((c = getc(fp)) != EOF)
 		n += !isspace(c);
@@ -162,13 +202,17 @@ main(int argc, char *argv[])
 	progname = argv[0];			/* get options */
 	while (argc > 2 && argv[1][0] == '-') {
 		switch (argv[1][1]) {
+		case 't':
+			rev_orient = !rev_orient;
+			break;
 		case 'n':
 			nprocs = atoi(argv[2]);
+			argv++; argc--;
 			break;
 		default:
 			goto userr;
 		}
-		argv += 2; argc -= 2;
+		argv++; argc--;
 	}
 						/* initialize & sort inputs */
 	ninpfiles = argc - 1;
@@ -180,7 +224,7 @@ main(int argc, char *argv[])
 	for (i = 0; i < ninpfiles; i++)
 		if (!init_pabopto_inp(i, argv[i+1]))
 			return(1);
-	qsort(inpfile, ninpfiles, sizeof(PGINPUT), &cmp_inang);
+	qsort(inpfile, ninpfiles, sizeof(PGINPUT), cmp_indir);
 						/* compile measurements */
 	for (i = 0; i < ninpfiles; i++)
 		if (!add_pabopto_inp(i))
@@ -190,7 +234,7 @@ main(int argc, char *argv[])
 	save_bsdf_rep(stdout);			/* write it out */
 	return(0);
 userr:
-	fprintf(stderr, "Usage: %s [-n nproc] meas1.dat meas2.dat .. > bsdf.sir\n",
+	fprintf(stderr, "Usage: %s [-t][-n nproc] meas1.dat meas2.dat .. > bsdf.sir\n",
 					progname);
 	return(1);
 }
@@ -206,8 +250,9 @@ main(int argc, char *argv[])
 	FVECT	dir;
 	int	i, j, n;
 
+	progname = argv[0];
 	if (argc != 2) {
-		fprintf(stderr, "Usage: %s input.dat > output.rad\n", argv[0]);
+		fprintf(stderr, "Usage: %s input.dat > output.rad\n", progname);
 		return(1);
 	}
 	ninpfiles = 1;
@@ -215,7 +260,10 @@ main(int argc, char *argv[])
 	if (!init_pabopto_inp(0, argv[1]) || !add_pabopto_inp(0))
 		return(1);
 						/* reduce data set */
-	make_rbfrep();
+	if (make_rbfrep() == NULL) {
+		fprintf(stderr, "%s: nothing to plot!\n", progname);
+		exit(1);
+	}
 #ifdef DEBUG
 	fprintf(stderr, "Minimum BSDF = %.4f\n", bsdf_min);
 #endif
@@ -223,15 +271,15 @@ main(int argc, char *argv[])
 #if 1						/* produce spheres at meas. */
 	puts("void plastic yellow\n0\n0\n5 .6 .4 .01 .04 .08\n");
 	n = 0;
-	for (i = 0; i < GRIDRES; i++)
-	    for (j = 0; j < GRIDRES; j++)
-		if (dsf_grid[i][j].nval > 0) {
+	for (i = 0; i < grid_res; i++)
+	    for (j = 0; j < grid_res; j++)
+		if (dsf_grid[i][j].sum.n > 0) {
 			ovec_from_pos(dir, i, j);
-			bsdf = dsf_grid[i][j].vsum /
-				(dsf_grid[i][j].nval*output_orient*dir[2]);
+			bsdf = dsf_grid[i][j].sum.v /
+			   ((double)dsf_grid[i][j].sum.n*output_orient*dir[2]);
 			if (bsdf <= bsdf_min*.6)
 				continue;
-			bsdf = log(bsdf) - min_log;
+			bsdf = log(bsdf + 1e-5) - min_log;
 			ovec_from_pos(dir, i, j);
 			printf("yellow sphere s%04d\n0\n0\n", ++n);
 			printf("4 %.6g %.6g %.6g %.6g\n\n",
@@ -244,8 +292,8 @@ main(int argc, char *argv[])
 	for (n = 0; n < dsf_list->nrbf; n++) {
 		RBFVAL	*rbf = &dsf_list->rbfa[n];
 		ovec_from_pos(dir, rbf->gx, rbf->gy);
-		bsdf = eval_rbfrep(dsf_list, dir) / (output_orient*dir[2]);
-		bsdf = log(bsdf) - min_log;
+		bsdf = eval_rbfrep(dsf_list, dir);
+		bsdf = log(bsdf + 1e-5) - min_log;
 		printf("red sphere p%04d\n0\n0\n", ++n);
 		printf("4 %.6g %.6g %.6g %.6g\n\n",
 				dir[0]*bsdf, dir[1]*bsdf, dir[2]*bsdf,
@@ -255,17 +303,17 @@ main(int argc, char *argv[])
 #if 1						/* output continuous surface */
 	puts("void trans tgreen\n0\n0\n7 .7 1 .7 .04 .04 .9 1\n");
 	fflush(stdout);
-	sprintf(buf, "gensurf tgreen bsdf - - - %d %d", GRIDRES-1, GRIDRES-1);
+	sprintf(buf, "gensurf tgreen bsdf - - - %d %d", grid_res-1, grid_res-1);
 	pfp = popen(buf, "w");
 	if (pfp == NULL) {
-		fprintf(stderr, "%s: cannot open '| %s'\n", argv[0], buf);
+		fprintf(stderr, "%s: cannot open '| %s'\n", progname, buf);
 		return(1);
 	}
-	for (i = 0; i < GRIDRES; i++)
-	    for (j = 0; j < GRIDRES; j++) {
+	for (i = 0; i < grid_res; i++)
+	    for (j = 0; j < grid_res; j++) {
 		ovec_from_pos(dir, i, j);
-		bsdf = eval_rbfrep(dsf_list, dir) / (output_orient*dir[2]);
-		bsdf = log(bsdf) - min_log;
+		bsdf = eval_rbfrep(dsf_list, dir);
+		bsdf = log(bsdf + 1e-5) - min_log;
 		fprintf(pfp, "%.8e %.8e %.8e\n",
 				dir[0]*bsdf, dir[1]*bsdf, dir[2]*bsdf);
 	    }