--- ray/src/common/testBSDF.c	2017/05/15 22:15:40	1.12
+++ ray/src/common/testBSDF.c	2021/03/27 17:50:18	1.16
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: testBSDF.c,v 1.12 2017/05/15 22:15:40 greg Exp $";
+static const char RCSid[] = "$Id: testBSDF.c,v 1.16 2021/03/27 17:50:18 greg Exp $";
 #endif
 /*
  * Simple test program to demonstrate BSDF operation.
@@ -8,7 +8,6 @@ static const char RCSid[] = "$Id: testBSDF.c,v 1.12 20
  */
 
 #define	_USE_MATH_DEFINES
-#include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <ctype.h>
@@ -108,8 +107,12 @@ main(int argc, char *argv[])
 			printf("Manufacturer: '%s'\n", bsdf->makr);
 			printf("Width, Height, Thickness (m): %.4e, %.4e, %.4e\n",
 					bsdf->dim[0], bsdf->dim[1], bsdf->dim[2]);
-			printf("Has geometry: %s\n", bsdf->mgf ? "yes" : "no");
-			continue;
+			if (bsdf->mgf)
+				printf("Has geometry: %lu bytes\n",
+						(unsigned long)strlen(bsdf->mgf));
+			else
+				printf("Has geometry: no\n");
+			break;
 		case 'C':			/* report constant values */
 			if (!bsdf)
 				goto noBSDFerr;
@@ -123,14 +126,15 @@ main(int argc, char *argv[])
 						bsdf->rb->maxHemi);
 			if (bsdf->tf)
 				printf("Peak front hemispherical transmittance: %.3e\n",
-						bsdf->tLamb.cieY + bsdf->tf->maxHemi);
+						bsdf->tLambFront.cieY + bsdf->tf->maxHemi);
 			if (bsdf->tb)
 				printf("Peak back hemispherical transmittance: %.3e\n",
-						bsdf->tLamb.cieY + bsdf->tb->maxHemi);
+						bsdf->tLambBack.cieY + bsdf->tb->maxHemi);
 			printXYZ("Diffuse Front Reflectance: ", &bsdf->rLambFront);
 			printXYZ("Diffuse Back Reflectance: ", &bsdf->rLambBack);
-			printXYZ("Diffuse Transmittance: ", &bsdf->tLamb);
-			continue;
+			printXYZ("Diffuse Front Transmittance: ", &bsdf->tLambFront);
+			printXYZ("Diffuse Back Transmittance: ", &bsdf->tLambBack);
+			break;
 		case 'Q':			/* query BSDF value */
 			if (!bsdf)
 				goto noBSDFerr;
@@ -140,7 +144,7 @@ main(int argc, char *argv[])
 			vec_from_deg(vout, atof(sskip2(cp,3)), atof(sskip2(cp,4)));
 			if (!SDreportError(SDevalBSDF(&val, vout, vin, bsdf), stderr))
 				printXYZ("", &val);
-			continue;
+			break;
 		case 'S':			/* sample BSDF */
 			if (!bsdf)
 				goto noBSDFerr;
@@ -168,7 +172,7 @@ main(int argc, char *argv[])
 				printf("%.8f %.8f %.8f ", vout[0], vout[1], vout[2]);
 				printXYZ("", &val);
 			}
-			continue;
+			break;
 		case 'H':			/* hemispherical values */
 		case 'R':
 		case 'T':
@@ -186,7 +190,7 @@ main(int argc, char *argv[])
 				sflags &= ~SDsampSp;
 			vec_from_deg(vin, atof(sskip2(cp,1)), atof(sskip2(cp,2)));
 			printf("%.4e\n", SDdirectHemi(vin, sflags, bsdf));
-			continue;
+			break;
 		case 'A':			/* resolution in proj. steradians */
 			if (!bsdf)
 				goto noBSDFerr;
@@ -202,9 +206,12 @@ main(int argc, char *argv[])
 						SDqueryMin+SDqueryMax, bsdf), stderr))
 					continue;
 			printf("%.4e %.4e\n", proja[0], proja[1]);
-			continue;
+			break;
+		default:
+			Usage(argv[0]);
+			break;
 		}
-		Usage(argv[0]);
+		fflush(stdout);			/* in case we're on remote */
 		continue;
 noBSDFerr:
 		fprintf(stderr, "%s: First, use 'L' command to load BSDF\n", argv[0]);