--- ray/src/rt/lookamb.c	2003/02/25 02:47:22	2.8
+++ ray/src/rt/lookamb.c	2023/11/15 18:02:52	2.18
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: lookamb.c,v 2.8 2003/02/25 02:47:22 greg Exp $";
+static const char	RCSid[] = "$Id: lookamb.c,v 2.18 2023/11/15 18:02:52 greg Exp $";
 #endif
 /*
  *  lookamb.c - program to examine ambient components.
@@ -7,8 +7,8 @@ static const char	RCSid[] = "$Id: lookamb.c,v 2.8 2003
 
 #include "copyright.h"
 
+#include  "platform.h"
 #include  "ray.h"
-
 #include  "ambient.h"
 
 
@@ -19,10 +19,112 @@ int  reverse = 0;
 AMBVAL  av;
 
 
-main(argc, argv)		/* load ambient values from a file */
-int  argc;
-char  *argv[];
+static void
+lookamb(			/* load & convert ambient values from a file */
+	FILE  *fp
+)
 {
+	FVECT	norm, uvec;
+	COLOR	avcol;
+
+	while (readambval(&av, fp)) {
+		decodedir(norm, av.ndir);
+		decodedir(uvec, av.udir);
+		scolor2rgb(avcol, av.val, AMB_CNDX[3], AMB_WLPART);
+		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(avcol,RED),
+						colval(avcol,GRN),
+						colval(avcol,BLU));
+			printf("%f\t%f\t", av.gpos[0], av.gpos[1]);
+			printf("%f\t%f\t", av.gdir[0], av.gdir[1]);
+			printf("%u\n", av.corral);
+		} else {
+			printf("Position:\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(avcol,RED),
+					colval(avcol,GRN), colval(avcol,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]);
+			printf("Corral:\t\t%8X\n\n", av.corral);
+		}
+		if (ferror(stdout))
+			exit(1);
+	}
+}
+
+
+static void
+writamb(			/* write binary ambient values to stdout */
+	FILE  *fp
+)
+{
+	FVECT	norm;
+	COLOR	avcol;
+
+	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, "%hd %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",
+				&avcol[RED], &avcol[GRN], &avcol[BLU]) != 3)
+			return;
+		setscolor(av.val, avcol[RED], avcol[GRN], avcol[BLU]);
+		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;
+		if (dataonly) {
+			if (fscanf(fp, "%u", &av.corral) != 1)
+				return;
+		} else if (fscanf(fp, "%*s %X", &av.corral) != 1)
+			return;
+		av.next = NULL;
+		if (writambval(&av, stdout) < 0)
+			exit(1);
+	}
+}
+
+
+int
+main(		/* load ambient values from a file */
+	int  argc,
+	char  *argv[]
+)
+{
 	FILE  *fp;
 	int  i;
 
@@ -53,6 +155,7 @@ char  *argv[];
 		return(1);
 	}
 	if (reverse) {
+		SET_FILE_BINARY(stdout);
 		if (header) {
 			if (checkheader(fp, "ascii", stdout) < 0)
 				goto formaterr;
@@ -60,24 +163,20 @@ char  *argv[];
 			newheader("RADIANCE", stdout);
 			printargs(argc, argv, stdout);
 		}
+		fputncomp(3, stdout);
 		fputformat(AMBFMT, stdout);
-		putchar('\n');
-#ifdef MSDOS
-		setmode(fileno(stdout), O_BINARY);
-#endif
+		fputc('\n', stdout);
 		putambmagic(stdout);
 		writamb(fp);
 	} else {
-#ifdef MSDOS
-		setmode(fileno(fp), O_BINARY);
-#endif
-		if (checkheader(fp, AMBFMT, header ? stdout : (FILE *)NULL) < 0)
+		SET_FILE_BINARY(fp);
+		if (getheader(fp, amb_headline, header ? stdout : (FILE *)NULL) < 0)
 			goto formaterr;
 		if (!hasambmagic(fp))
 			goto formaterr;
 		if (header) {
 			fputformat("ascii", stdout);
-			putchar('\n');
+			fputc('\n', stdout);
 		}
 		lookamb(fp);
 	}
@@ -86,83 +185,4 @@ char  *argv[];
 formaterr:
 	fprintf(stderr, "%s: format error on input\n", argv[0]);
 	exit(1);
-}
-
-
-void
-lookamb(fp)			/* get ambient values from a file */
-FILE  *fp;
-{
-	while (readambval(&av, fp)) {
-		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", av.dir[0], av.dir[1], av.dir[2]);
-			printf("%d\t%f\t%f\t", av.lvl, av.weight, av.rad);
-			printf("%e\t%e\t%e\t", colval(av.val,RED),
-						colval(av.val,GRN),
-						colval(av.val,BLU));
-			printf("%f\t%f\t%f\t", av.gpos[0],
-					av.gpos[1], av.gpos[2]);
-			printf("%f\t%f\t%f\n", av.gdir[0],
-					av.gdir[1], av.gdir[2]);
-		} else {
-			printf("\nPosition:\t%f\t%f\t%f\n", av.pos[0],
-					av.pos[1], av.pos[2]);
-			printf("Direction:\t%f\t%f\t%f\n", av.dir[0],
-					av.dir[1], av.dir[2]);
-			printf("Lvl,Wt,Rad:\t%d\t\t%f\t%f\n", av.lvl,
-					av.weight, av.rad);
-			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\t%f\n", av.gpos[0],
-					av.gpos[1], av.gpos[2]);
-			printf("Dir.Grad:\t%f\t%f\t%f\n", av.gdir[0],
-					av.gdir[1], av.gdir[2]);
-		}
-		if (ferror(stdout))
-			exit(1);
-	}
-}
-
-
-void
-writamb(fp)			/* write binary ambient values */
-FILE  *fp;
-{
-	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, "%f %f %f",
-				&av.dir[0], &av.dir[1], &av.dir[2]) != 3)
-			return;
-		if (!dataonly)
-			fscanf(fp, "%*s");
-		if (fscanf(fp, "%d %f %f",
-				&av.lvl, &av.weight, &av.rad) != 3)
-			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 %f",
-				&av.gpos[0], &av.gpos[1], &av.gpos[2]) != 3)
-			return;
-		if (!dataonly)
-			fscanf(fp, "%*s");
-		if (fscanf(fp, "%f %f %f",
-				&av.gdir[0], &av.gdir[1], &av.gdir[2]) != 3)
-			return;
-		av.next = NULL;
-		writambval(&av, stdout);
-		if (ferror(stdout))
-			exit(1);
-	}
 }