--- ray/src/cv/pabopto2bsdf.c	2013/10/19 00:11:50	2.6
+++ ray/src/cv/pabopto2bsdf.c	2014/01/30 18:19:43	2.11
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.6 2013/10/19 00:11:50 greg Exp $";
+static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.11 2014/01/30 18:19:43 greg Exp $";
 #endif
 /*
  * Load measured BSDF data in PAB-Opto format.
@@ -70,6 +70,8 @@ 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;
@@ -145,7 +147,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[])
@@ -214,53 +216,62 @@ main(int argc, char *argv[])
 		return(1);
 						/* reduce data set */
 	make_rbfrep();
-						/* produce spheres at meas. */
+#ifdef DEBUG
+	fprintf(stderr, "Minimum BSDF = %.4f\n", bsdf_min);
+#endif
+#if 1						/* produce spheres at meas. */
 	puts("void plastic yellow\n0\n0\n5 .6 .4 .01 .04 .08\n");
-	puts("void plastic pink\n0\n0\n5 .5 .05 .9 .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].vsum > .0f) {
+		if (dsf_grid[i][j].nval > 0) {
 			ovec_from_pos(dir, i, j);
-			bsdf = dsf_grid[i][j].vsum / dir[2];
+			bsdf = dsf_grid[i][j].vsum /
+				(dsf_grid[i][j].nval*output_orient*dir[2]);
 			if (bsdf <= bsdf_min*.6)
 				continue;
 			bsdf = log(bsdf) - min_log;
-			if (dsf_grid[i][j].nval) {
-				printf("pink cone c%04d\n0\n0\n8\n", ++n);
-				printf("\t%.6g %.6g %.6g\n",
-					dir[0]*bsdf, dir[1]*bsdf, dir[2]*bsdf);
-				printf("\t%.6g %.6g %.6g\n",
-					dir[0]*bsdf*1.02, dir[1]*bsdf*1.02,
-					dir[2]*bsdf*1.02);
-				printf("\t%.6g\t0\n", .02*bsdf);
-			} else {
-				ovec_from_pos(dir, i, j);
-				printf("yellow sphere s%04d\n0\n0\n", ++n);
-				printf("4 %.6g %.6g %.6g %.6g\n\n",
+			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,
-					.01*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) - 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", argv[0], 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 = eval_rbfrep(dsf_list, dir) / (output_orient*dir[2]);
 		bsdf = log(bsdf) - 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