--- ray/src/cv/pabopto2bsdf.c	2014/03/21 01:04:42	2.21
+++ ray/src/cv/pabopto2bsdf.c	2014/10/03 21:57:06	2.27
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.21 2014/03/21 01:04:42 greg Exp $";
+static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.27 2014/10/03 21:57:06 greg Exp $";
 #endif
 /*
  * Load measured BSDF data in PAB-Opto format.
@@ -21,7 +21,8 @@ char			*progname;
 
 typedef struct {
 	const char	*fname;		/* input file path */
-	double		theta, phi;	/* input angles */
+	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)? */
 	long		dstart;		/* data start offset in file */
@@ -60,6 +61,7 @@ init_pabopto_inp(const int i, const char *fname)
 	}
 	inpfile[i].fname = fname;
 	inpfile[i].isDSF = -1;
+	inpfile[i].up_phi = 0;
 	inpfile[i].theta = inpfile[i].phi = -10001.;
 				/* read header information */
 	while ((c = getc(fp)) == '#' || c == EOF) {
@@ -77,11 +79,15 @@ init_pabopto_inp(const int i, const char *fname)
 				inpfile[i].isDSF = 1;
 				continue;
 			}
-			if (!strcasecmp(typ, "BSDF")) {
+			if (!strcasecmp(typ, "BSDF") ||
+					!strcasecmp(typ, "BRDF") ||
+					!strcasecmp(typ, "BTDF")) {
 				inpfile[i].isDSF = 0;
 				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,6 +108,8 @@ init_pabopto_inp(const int i, const char *fname)
 		fputs(": unknown incident angle\n", stderr);
 		return(0);
 	}
+				/* 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];
@@ -129,7 +137,7 @@ add_pabopto_inp(const int 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
 		new_bsdf_data(inpfile[i].theta, inpfile[i].phi);
@@ -139,7 +147,8 @@ add_pabopto_inp(const int i)
 #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);
+		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);
@@ -184,7 +193,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_indir);
+	qsort(inpfile, ninpfiles, sizeof(PGINPUT), cmp_indir);
 						/* compile measurements */
 	for (i = 0; i < ninpfiles; i++)
 		if (!add_pabopto_inp(i))
@@ -236,7 +245,7 @@ main(int argc, char *argv[])
 		if (dsf_grid[i][j].sum.n > 0) {
 			ovec_from_pos(dir, i, j);
 			bsdf = dsf_grid[i][j].sum.v /
-				(dsf_grid[i][j].sum.n*output_orient*dir[2]);
+			   ((double)dsf_grid[i][j].sum.n*output_orient*dir[2]);
 			if (bsdf <= bsdf_min*.6)
 				continue;
 			bsdf = log(bsdf + 1e-5) - min_log;
@@ -252,7 +261,7 @@ 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 = 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",
@@ -272,7 +281,7 @@ main(int argc, char *argv[])
 	for (i = 0; i < GRIDRES; i++)
 	    for (j = 0; j < GRIDRES; j++) {
 		ovec_from_pos(dir, i, j);
-		bsdf = eval_rbfrep(dsf_list, dir) / (output_orient*dir[2]);
+		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);