--- ray/src/cv/pabopto2bsdf.c	2013/10/21 18:33:15	2.7
+++ ray/src/cv/pabopto2bsdf.c	2014/03/24 02:31:02	2.24
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.7 2013/10/21 18:33:15 greg Exp $";
+static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.24 2014/03/24 02:31:02 greg Exp $";
 #endif
 /*
  * Load measured BSDF data in PAB-Opto format.
@@ -7,6 +7,7 @@ static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.7
  *	G. Ward
  */
 
+#define _USE_MATH_DEFINES
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14,12 +15,14 @@ static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.7
 #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 */
+	int		igp[2];		/* input grid position */
 	int		isDSF;		/* data is DSF (rather than BSDF)? */
 	long		dstart;		/* data start offset in file */
 } PGINPUT;
@@ -29,20 +32,16 @@ int		ninpfiles;	/* number of input files */
 
 /* 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 +49,7 @@ static int
 init_pabopto_inp(const int i, const char *fname)
 {
 	FILE	*fp = fopen(fname, "r");
+	FVECT	dv;
 	char	buf[2048];
 	int	c;
 	
@@ -70,12 +70,16 @@ init_pabopto_inp(const int i, const char *fname)
 			fclose(fp);
 			return(0);
 		}
+		if (sscanf(buf, "sample_name \"%[^\"]\"", bsdf_name) == 1)
+			continue;
 		if (sscanf(buf, "format: theta phi %s", typ) == 1) {
 			if (!strcasecmp(typ, "DSF")) {
 				inpfile[i].isDSF = 1;
 				continue;
 			}
-			if (!strcasecmp(typ, "BSDF")) {
+			if (!strcasecmp(typ, "BSDF") ||
+					!strcasecmp(typ, "BRDF") ||
+					!strcasecmp(typ, "BTDF")) {
 				inpfile[i].isDSF = 0;
 				continue;
 			}
@@ -100,8 +104,12 @@ 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.;
+				/* 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);
 }
 
@@ -109,9 +117,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;
+	int		n, c;
 	
 	if (fp == NULL || fseek(fp, inpfile[i].dstart, 0) == EOF) {
 		fputs(inpfile[i].fname, stderr);
@@ -119,11 +127,11 @@ 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
 		new_bsdf_data(inpfile[i].theta, inpfile[i].phi);
@@ -145,7 +153,7 @@ add_pabopto_inp(const int i)
 	return(1);
 }
 
-#if 1
+#ifndef TEST_MAIN
 /* Read in PAB-Opto BSDF files and output RBF interpolant */
 int
 main(int argc, char *argv[])
@@ -178,7 +186,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))
@@ -204,8 +212,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;
@@ -213,43 +222,66 @@ main(int argc, char *argv[])
 	if (!init_pabopto_inp(0, argv[1]) || !add_pabopto_inp(0))
 		return(1);
 						/* reduce data set */
-	make_rbfrep();
-						/* produce spheres at meas. */
+	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
+	min_log = log(bsdf_min*.5 + 1e-5);
+#if 1						/* produce spheres at meas. */
 	puts("void plastic yellow\n0\n0\n5 .6 .4 .01 .04 .08\n");
-	min_log = log(bsdf_min*.5);
 	n = 0;
 	for (i = 0; i < GRIDRES; i++)
 	    for (j = 0; j < GRIDRES; j++)
-		if (dsf_grid[i][j].nval > 0) {
+		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*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",
 					dir[0]*bsdf, dir[1]*bsdf, dir[2]*bsdf,
 					.007*bsdf);
 		}
-						/* output continuous surface */
+#endif
+#if 1						/* spheres at RBF peaks */
+	puts("void plastic red\n0\n0\n5 .8 .01 .01 .04 .08\n");
+	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 + 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,
+				.011*bsdf);
+	}
+#endif
+#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);
 	pfp = popen(buf, "w");
 	if (pfp == NULL) {
-		fputs(buf, stderr);
-		fputs(": cannot start command\n", stderr);
+		fprintf(stderr, "%s: cannot open '| %s'\n", progname, buf);
 		return(1);
 	}
 	for (i = 0; i < GRIDRES; i++)
 	    for (j = 0; j < GRIDRES; j++) {
 		ovec_from_pos(dir, i, j);
-		bsdf = eval_rbfrep(dsf_list, dir) / dir[2];
-		bsdf = log(bsdf) - min_log;
+		bsdf = eval_rbfrep(dsf_list, dir) / (output_orient*dir[2]);
+		bsdf = log(bsdf + 1e-5) - min_log;
 		fprintf(pfp, "%.8e %.8e %.8e\n",
 				dir[0]*bsdf, dir[1]*bsdf, dir[2]*bsdf);
 	    }
-	return(pclose(pfp)==0 ? 0 : 1);
+	if (pclose(pfp) != 0)
+		return(1);
+#endif
+	return(0);
 }
 #endif