--- ray/src/rt/lookamb.c	2004/03/30 16:13:01	2.10
+++ ray/src/rt/lookamb.c	2014/04/23 06:04:18	2.12
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: lookamb.c,v 2.10 2004/03/30 16:13:01 schorsch Exp $";
+static const char	RCSid[] = "$Id: lookamb.c,v 2.12 2014/04/23 06:04:18 greg Exp $";
 #endif
 /*
  *  lookamb.c - program to examine ambient components.
@@ -19,76 +19,103 @@ int  reverse = 0;
 
 AMBVAL  av;
 
+#ifdef NEWAMB
 
-int
-main(		/* load ambient values from a file */
-	int  argc,
-	char  *argv[]
+
+static void
+lookamb(			/* load & convert ambient values from a file */
+	FILE  *fp
 )
 {
-	FILE  *fp;
-	int  i;
+	FVECT	norm, uvec;
 
-	for (i = 1; i < argc; i++)
-		if (argv[i][0] == '-')
-			switch (argv[i][1]) {
-			case 'd':
-				dataonly = 1;
-				break;
-			case 'r':
-				reverse = 1;
-				break;
-			case 'h':
-				header = 0;
-				break;
-			default:
-				fprintf(stderr, "%s: unknown option '%s'\n",
-						argv[0], argv[i]);
-				return(1);
-			}
-		else
-			break;
-
-	if (i >= argc)
-		fp = stdin;
-	else if ((fp = fopen(argv[i], "r")) == NULL) {
-		fprintf(stderr, "%s: file not found\n", argv[i]);
-		return(1);
-	}
-	if (reverse) {
-		if (header) {
-			if (checkheader(fp, "ascii", stdout) < 0)
-				goto formaterr;
+	while (readambval(&av, fp)) {
+		decodedir(norm, av.ndir);
+		decodedir(uvec, av.udir);
+		if (dataonly) {
+			printf("%f\t%f\t%f\t", av.pos[0], av.pos[1], av.pos[2]);
+			printf("%f\t%f\t%f\t", norm[0], norm[1], norm[2]);
+			printf("%f\t%f\t%f\t", uvec[0], uvec[1], uvec[2]);
+			printf("%d\t%f\t%f\t%f\t", av.lvl, av.weight,
+					av.rad[0], av.rad[1]);
+			printf("%e\t%e\t%e\t", colval(av.val,RED),
+						colval(av.val,GRN),
+						colval(av.val,BLU));
+			printf("%f\t%f\t", av.gpos[0], av.gpos[1]);
+			printf("%f\t%f\n", av.gdir[0], av.gdir[1]);
 		} else {
-			newheader("RADIANCE", stdout);
-			printargs(argc, argv, stdout);
+			printf("\nPosition:\t%f\t%f\t%f\n", av.pos[0],
+					av.pos[1], av.pos[2]);
+			printf("Normal:\t\t%f\t%f\t%f\n",
+					norm[0], norm[1], norm[2]);
+			printf("Uvector:\t%f\t%f\t%f\n",
+					uvec[0], uvec[1], uvec[2]);
+			printf("Lvl,Wt,UVrad:\t%d\t\t%f\t%f\t%f\n", av.lvl,
+					av.weight, av.rad[0], av.rad[1]);
+			printf("Value:\t\t%e\t%e\t%e\n", colval(av.val,RED),
+					colval(av.val,GRN), colval(av.val,BLU));
+			printf("Pos.Grad:\t%f\t%f\n", av.gpos[0], av.gpos[1]);
+			printf("Dir.Grad:\t%f\t%f\n", av.gdir[0], av.gdir[1]);
 		}
-		fputformat(AMBFMT, stdout);
-		putchar('\n');
-		SET_FILE_BINARY(stdout);
-		putambmagic(stdout);
-		writamb(fp);
-	} else {
-		SET_FILE_BINARY(fp);
-		if (checkheader(fp, AMBFMT, header ? stdout : (FILE *)NULL) < 0)
-			goto formaterr;
-		if (!hasambmagic(fp))
-			goto formaterr;
-		if (header) {
-			fputformat("ascii", stdout);
-			putchar('\n');
-		}
-		lookamb(fp);
+		if (ferror(stdout))
+			exit(1);
 	}
-	fclose(fp);
-	return(0);
-formaterr:
-	fprintf(stderr, "%s: format error on input\n", argv[0]);
-	exit(1);
 }
 
 
-extern void
+static void
+writamb(			/* write binary ambient values to stdout */
+	FILE  *fp
+)
+{
+	FVECT	norm;
+
+	for ( ; ; ) {
+		if (!dataonly)
+			fscanf(fp, "%*s");
+		if (fscanf(fp, "%f %f %f",
+				&av.pos[0], &av.pos[1], &av.pos[2]) != 3)
+			return;
+		if (!dataonly)
+			fscanf(fp, "%*s");
+		if (fscanf(fp, FVFORMAT, &norm[0], &norm[1], &norm[2]) != 3)
+			return;
+		av.ndir = encodedir(norm);
+		if (!dataonly)
+			fscanf(fp, "%*s");
+		if (fscanf(fp, FVFORMAT, &norm[0], &norm[1], &norm[2]) != 3)
+			return;
+		av.udir = encodedir(norm);
+		if (!dataonly)
+			fscanf(fp, "%*s");
+		if (fscanf(fp, "%d %f %f %f", &av.lvl, &av.weight,
+				&av.rad[0], &av.rad[1]) != 4)
+			return;
+		if (!dataonly)
+			fscanf(fp, "%*s");
+		if (fscanf(fp, "%f %f %f",
+				&av.val[RED], &av.val[GRN], &av.val[BLU]) != 3)
+			return;
+		if (!dataonly)
+			fscanf(fp, "%*s");
+		if (fscanf(fp, "%f %f", &av.gpos[0], &av.gpos[1]) != 2)
+			return;
+		if (!dataonly)
+			fscanf(fp, "%*s");
+		if (fscanf(fp, "%f %f", &av.gdir[0], &av.gdir[1]) != 2)
+			return;
+		av.next = NULL;
+		writambval(&av, stdout);
+		if (ferror(stdout))
+			exit(1);
+	}
+}
+
+
+#else /* ! NEWAMB */
+
+
+static void
 lookamb(			/* get ambient values from a file */
 	FILE  *fp
 )
@@ -125,7 +152,7 @@ lookamb(			/* get ambient values from a file */
 }
 
 
-extern void
+static void
 writamb(			/* write binary ambient values */
 	FILE  *fp
 )
@@ -166,4 +193,75 @@ writamb(			/* write binary ambient values */
 		if (ferror(stdout))
 			exit(1);
 	}
+}
+
+
+#endif	/* ! NEWAMB */
+
+
+int
+main(		/* load ambient values from a file */
+	int  argc,
+	char  *argv[]
+)
+{
+	FILE  *fp;
+	int  i;
+
+	for (i = 1; i < argc; i++)
+		if (argv[i][0] == '-')
+			switch (argv[i][1]) {
+			case 'd':
+				dataonly = 1;
+				break;
+			case 'r':
+				reverse = 1;
+				break;
+			case 'h':
+				header = 0;
+				break;
+			default:
+				fprintf(stderr, "%s: unknown option '%s'\n",
+						argv[0], argv[i]);
+				return(1);
+			}
+		else
+			break;
+
+	if (i >= argc)
+		fp = stdin;
+	else if ((fp = fopen(argv[i], "r")) == NULL) {
+		fprintf(stderr, "%s: file not found\n", argv[i]);
+		return(1);
+	}
+	if (reverse) {
+		if (header) {
+			if (checkheader(fp, "ascii", stdout) < 0)
+				goto formaterr;
+		} else {
+			newheader("RADIANCE", stdout);
+			printargs(argc, argv, stdout);
+		}
+		fputformat(AMBFMT, stdout);
+		putchar('\n');
+		SET_FILE_BINARY(stdout);
+		putambmagic(stdout);
+		writamb(fp);
+	} else {
+		SET_FILE_BINARY(fp);
+		if (checkheader(fp, AMBFMT, header ? stdout : (FILE *)NULL) < 0)
+			goto formaterr;
+		if (!hasambmagic(fp))
+			goto formaterr;
+		if (header) {
+			fputformat("ascii", stdout);
+			putchar('\n');
+		}
+		lookamb(fp);
+	}
+	fclose(fp);
+	return(0);
+formaterr:
+	fprintf(stderr, "%s: format error on input\n", argv[0]);
+	exit(1);
 }