--- ray/src/cv/pabopto2bsdf.c	2014/03/17 01:52:51	2.16
+++ ray/src/cv/pabopto2bsdf.c	2014/03/20 16:54:23	2.20
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.16 2014/03/17 01:52:51 greg Exp $";
+static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.20 2014/03/20 16:54:23 greg Exp $";
 #endif
 /*
  * Load measured BSDF data in PAB-Opto format.
@@ -7,6 +7,7 @@ static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.1
  *	G. Ward
  */
 
+#define _USE_MATH_DEFINES
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -20,7 +21,8 @@ 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;
@@ -30,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 */
@@ -51,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;
 	
@@ -103,8 +102,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);
 }
 
@@ -112,9 +115,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);
@@ -122,8 +125,8 @@ 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",
@@ -181,7 +184,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))