--- ray/src/util/rad.c	1996/01/05 14:43:03	2.50
+++ ray/src/util/rad.c	1998/06/10 17:51:06	2.57
@@ -1,7 +1,7 @@
-/* Copyright (c) 1995 Regents of the University of California */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static char SCCSid[] = "$SunId$ SGI";
 #endif
 
 /*
@@ -9,66 +9,69 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 #include "standard.h"
+#include "view.h"
 #include "paths.h"
 #include "vars.h"
 #include <ctype.h>
 #include <sys/types.h>
 
-				/* variables */
-#define OBJECT		0		/* object files */
-#define SCENE		1		/* scene files */
-#define MATERIAL	2		/* material files */
-#define ILLUM		3		/* mkillum input files */
-#define MKILLUM		4		/* mkillum options */
-#define RENDER		5		/* rendering options */
-#define OCONV		6		/* oconv options */
-#define PFILT		7		/* pfilt options */
-#define VIEW		8		/* view(s) for picture(s) */
-#define ZONE		9		/* simulation zone */
-#define QUALITY		10		/* desired rendering quality */
-#define OCTREE		11		/* octree file name */
-#define PICTURE		12		/* picture file root name */
-#define AMBFILE		13		/* ambient file name */
-#define OPTFILE		14		/* rendering options file */
-#define EXPOSURE	15		/* picture exposure setting */
-#define RESOLUTION	16		/* maximum picture resolution */
-#define UP		17		/* view up (X, Y or Z) */
-#define INDIRECT	18		/* indirection in lighting */
-#define DETAIL		19		/* level of scene detail */
-#define PENUMBRAS	20		/* shadow penumbras are desired */
-#define VARIABILITY	21		/* level of light variability */
-#define REPORT		22		/* report frequency and errfile */
-#define RAWFILE		23		/* raw picture file root name */
+				/* variables (alphabetical by name) */
+#define AMBFILE		0		/* ambient file name */
+#define DETAIL		1		/* level of scene detail */
+#define EXPOSURE	2		/* picture exposure setting */
+#define EYESEP		3		/* interocular distance */
+#define ILLUM		4		/* mkillum input files */
+#define INDIRECT	5		/* indirection in lighting */
+#define MATERIAL	6		/* material files */
+#define MKILLUM		7		/* mkillum options */
+#define OBJECT		8		/* object files */
+#define OCONV		9		/* oconv options */
+#define OCTREE		10		/* octree file name */
+#define OPTFILE		11		/* rendering options file */
+#define PENUMBRAS	12		/* shadow penumbras are desired */
+#define PFILT		13		/* pfilt options */
+#define PICTURE		14		/* picture file root name */
+#define QUALITY		15		/* desired rendering quality */
+#define RAWFILE		16		/* raw picture file root name */
+#define RENDER		17		/* rendering options */
+#define REPORT		18		/* report frequency and errfile */
+#define RESOLUTION	19		/* maximum picture resolution */
+#define SCENE		20		/* scene files */
+#define UP		21		/* view up (X, Y or Z) */
+#define VARIABILITY	22		/* level of light variability */
+#define VIEWS		23		/* view(s) for picture(s) */
 #define ZFILE		24		/* distance file root name */
+#define ZONE		25		/* simulation zone */
 				/* total number of variables */
-int NVARS = 25;
+int NVARS = 26;
 
 VARIABLE	vv[] = {		/* variable-value pairs */
-	{"objects",	3,	0,	NULL,	catvalues},
-	{"scene",	3,	0,	NULL,	catvalues},
-	{"materials",	3,	0,	NULL,	catvalues},
+	{"AMBFILE",	3,	0,	NULL,	onevalue},
+	{"DETAIL",	3,	0,	NULL,	qualvalue},
+	{"EXPOSURE",	3,	0,	NULL,	fltvalue},
+	{"EYESEP",	3,	0,	NULL,	fltvalue},
 	{"illum",	3,	0,	NULL,	catvalues},
+	{"INDIRECT",	3,	0,	NULL,	intvalue},
+	{"materials",	3,	0,	NULL,	catvalues},
 	{"mkillum",	3,	0,	NULL,	catvalues},
-	{"render",	3,	0,	NULL,	catvalues},
+	{"objects",	3,	0,	NULL,	catvalues},
 	{"oconv",	3,	0,	NULL,	catvalues},
-	{"pfilt",	2,	0,	NULL,	catvalues},
-	{"view",	2,	0,	NULL,	NULL},
-	{"ZONE",	2,	0,	NULL,	onevalue},
-	{"QUALITY",	3,	0,	NULL,	qualvalue},
 	{"OCTREE",	3,	0,	NULL,	onevalue},
-	{"PICTURE",	3,	0,	NULL,	onevalue},
-	{"AMBFILE",	3,	0,	NULL,	onevalue},
 	{"OPTFILE",	3,	0,	NULL,	onevalue},
-	{"EXPOSURE",	3,	0,	NULL,	fltvalue},
+	{"PENUMBRAS",	3,	0,	NULL,	boolvalue},
+	{"pfilt",	2,	0,	NULL,	catvalues},
+	{"PICTURE",	3,	0,	NULL,	onevalue},
+	{"QUALITY",	3,	0,	NULL,	qualvalue},
+	{"RAWFILE",	3,	0,	NULL,	onevalue},
+	{"render",	3,	0,	NULL,	catvalues},
+	{"REPORT",	3,	0,	NULL,	onevalue},
 	{"RESOLUTION",	3,	0,	NULL,	onevalue},
+	{"scene",	3,	0,	NULL,	catvalues},
 	{"UP",		2,	0,	NULL,	onevalue},
-	{"INDIRECT",	3,	0,	NULL,	intvalue},
-	{"DETAIL",	3,	0,	NULL,	qualvalue},
-	{"PENUMBRAS",	3,	0,	NULL,	boolvalue},
 	{"VARIABILITY",	3,	0,	NULL,	qualvalue},
-	{"REPORT",	3,	0,	NULL,	onevalue},
-	{"RAWFILE",	3,	0,	NULL,	onevalue},
+	{"view",	2,	0,	NULL,	NULL},
 	{"ZFILE",	2,	0,	NULL,	onevalue},
+	{"ZONE",	2,	0,	NULL,	onevalue},
 };
 
 				/* overture calculation file */
@@ -155,7 +158,11 @@ char	*argv[];
 	loadvars(rifname);
 				/* get any additional assignments */
 	for (i++; i < argc; i++)
-		setvariable(argv[i]);
+		if (setvariable(argv[i], matchvar) < 0) {
+			fprintf(stderr, "%s: unknown variable: %s\n",
+					progname, argv[i]);
+			quit(1);
+		}
 				/* check assignments */
 	checkvalues();
 				/* check files and dates */
@@ -176,12 +183,12 @@ char	*argv[];
 		rview(ropts, popts);
 	else
 		rpict(ropts, popts);
-	exit(0);
+	quit(0);
 userr:
 	fprintf(stderr,
-"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
+"Usage: %s [-w][-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
 			progname);
-	exit(1);
+	quit(1);
 }
 
 
@@ -276,7 +283,7 @@ checkfiles()			/* check for existence and modified tim
 	if (!octreedate & !scenedate & !illumdate) {
 		fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname,
 				vnam(OCTREE), vnam(SCENE), vnam(ILLUM));
-		exit(1);
+		quit(1);
 	}
 	matdate = checklast(vval(MATERIAL));
 }	
@@ -306,7 +313,7 @@ double	org[3], *sizp;
 				fprintf(stderr,
 			"%s: error reading bounding box from getbbox\n",
 						progname);
-				exit(1);
+				quit(1);
 			}
 			for (i = 0; i < 3; i++)
 				if (max[i] - min[i] > osiz)
@@ -324,7 +331,7 @@ double	org[3], *sizp;
 				fprintf(stderr,
 			"%s: error reading bounding cube from getinfo\n",
 						progname);
-				exit(1);
+				quit(1);
 			}
 			pclose(fp);
 		}
@@ -360,9 +367,9 @@ setdefaults()			/* set default values for unassigned v
 		vval(PICTURE) = radname;
 		vdef(PICTURE)++;
 	}
-	if (!vdef(VIEW)) {
-		vval(VIEW) = "X";
-		vdef(VIEW)++;
+	if (!vdef(VIEWS)) {
+		vval(VIEWS) = "X";
+		vdef(VIEWS)++;
 	}
 	if (!vdef(DETAIL)) {
 		vval(DETAIL) = "M";
@@ -402,7 +409,7 @@ oconv()				/* run oconv and mkillum if necessary */
 				"%s: error generating octree\n\t%s removed\n",
 						progname, vval(OCTREE));
 				unlink(vval(OCTREE));
-				exit(1);
+				quit(1);
 			}
 		}
 		octreedate = time((time_t *)NULL);
@@ -433,7 +440,7 @@ oconv()				/* run oconv and mkillum if necessary */
 				"%s: error generating octree\n\t%s removed\n",
 						progname, oct0name);
 				unlink(oct0name);
-				exit(1);
+				quit(1);
 			}
 		}
 		oct0date = time((time_t *)NULL);
@@ -453,7 +460,7 @@ oconv()				/* run oconv and mkillum if necessary */
 			fprintf(stderr, "%s: error running mkillum\n",
 					progname);
 			unlink(illumtmp);
-			exit(1);
+			quit(1);
 		}
 						/* make octree1 (frozen) */
 		if (octreedate)
@@ -471,7 +478,7 @@ oconv()				/* run oconv and mkillum if necessary */
 					progname, oct1name);
 			unlink(oct1name);
 			unlink(illumtmp);
-			exit(1);
+			quit(1);
 		}
 		rmfile(illumtmp);
 	}
@@ -995,14 +1002,14 @@ char	*vn;		/* returned view name */
 		}
 						/* view number? */
 		if (isint(viewselect))
-			return(specview(nvalue(vv+VIEW, atoi(viewselect)-1)));
+			return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
 						/* check list */
-		while ((mv = nvalue(vv+VIEW, n++)) != NULL)
+		while ((mv = nvalue(VIEWS, n++)) != NULL)
 			if (matchword(viewselect, mv))
 				return(specview(mv));
 		return(specview(viewselect));	/* standard view? */
 	}
-	mv = nvalue(vv+VIEW, n);		/* use view n */
+	mv = nvalue(VIEWS, n);		/* use view n */
 	if (vn != NULL & mv != NULL) {
 		register char	*mv2 = mv;
 		if (*mv2 != '-')
@@ -1017,56 +1024,28 @@ char	*vn;		/* returned view name */
 printview(vopts)			/* print out selected view */
 register char	*vopts;
 {
-	extern char	*atos(), *getenv();
-	char	buf[256];
-	FILE	*fp;
+	extern char	*strstr(), *atos(), *getenv();
+	VIEW	vwr;
+	char	buf[128];
 	register char	*cp;
-
+again:
 	if (vopts == NULL)
 		return(-1);
-	fputs("VIEW=", stdout);
-	do {
-		if (matchword(vopts, "-vf")) {		/* expand view file */
-			vopts = sskip(vopts);
-			if (!*atos(buf, sizeof(buf), vopts))
-				return(-1);
-			if ((fp = fopen(buf, "r")) == NULL)
-				return(-1);
-			for (buf[sizeof(buf)-2] = '\n';
-					fgets(buf, sizeof(buf), fp) != NULL &&
-						buf[0] != '\n';
-					buf[sizeof(buf)-2] = '\n') {
-				if (buf[sizeof(buf)-2] != '\n') {
-					ungetc(buf[sizeof(buf)-2], fp);
-					buf[sizeof(buf)-2] = '\0';
-				}
-				if (matchword(buf, "VIEW=") ||
-						matchword(buf, "rview")) {
-					for (cp = sskip(buf); *cp && *cp != '\n'; cp++)
-						putchar(*cp);
-				}
-			}
-			fclose(fp);
-			vopts = sskip(vopts);
-		} else {
-			while (isspace(*vopts))
-				vopts++;
-			putchar(' ');
 #ifdef MSDOS
-			if (*vopts == '$') {		/* expand env. var. */
-				if (!*atos(buf, sizeof(buf), vopts+1))
-					return(-1);
-				if ((cp = getenv(buf)) == NULL)
-					return(-1);
-				fputs(cp, stdout);
-				vopts = sskip(vopts);
-			} else
+	if (vopts[0] == '$') {
+		vopts = getenv(vopts+1);
+		goto again;
+	}
 #endif
-				while (*vopts && !isspace(*vopts))
-					putchar(*vopts++);
-		}
-	} while (*vopts++);
-	putchar('\n');
+	copystruct(&vwr, &stdview);
+	cp = vopts;				/* get -vf files first */
+	while ((cp = strstr(cp, "-vf ")) != NULL &&
+			*atos(buf, sizeof(buf), cp += 4))
+		viewfile(buf, &vwr, NULL);
+	sscanview(&vwr, vopts);			/* get the rest */
+	fputs(VIEWSTR, stdout);
+	fprintview(&vwr, stdout);		/* print full spec. */
+	fputc('\n', stdout);
 	return(0);
 }
 
@@ -1089,7 +1068,7 @@ char	*opts, *po;
 	strcat(combuf, oct1name);
 	if (runcom(combuf)) {		/* run it */
 		fprintf(stderr, "%s: error running rview\n", progname);
-		exit(1);
+		quit(1);
 	}
 }
 
@@ -1186,7 +1165,7 @@ char	*opts, *po;
 					fprintf(stderr,
 					"%s: error in overture for view %s\n",
 						progname, vs);
-					exit(1);
+					quit(1);
 				}
 #ifdef NIX
 				rmfile(overfile);
@@ -1199,7 +1178,7 @@ char	*opts, *po;
 		if (runcom(combuf)) {		/* run rpict */
 			fprintf(stderr, "%s: error rendering view %s\n",
 					progname, vs);
-			exit(1);
+			quit(1);
 		}
 		if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
 						/* build pfilt command */
@@ -1214,7 +1193,7 @@ char	*opts, *po;
 				"%s: error filtering view %s\n\t%s removed\n",
 						progname, vs, picfile);
 				unlink(picfile);
-				exit(1);
+				quit(1);
 			}
 		}
 						/* remove/rename raw file */
@@ -1297,7 +1276,7 @@ char	*vname, *value;
 	sprintf(evp, "%s=%s", vname, value);
 	if (putenv(evp) != 0) {
 		fprintf(stderr, "%s: out of environment space\n", progname);
-		exit(1);
+		quit(1);
 	}
 	if (!silent)
 		printf("set %s\n", evp);
@@ -1310,7 +1289,7 @@ int	vc;
 {
 	fprintf(stderr, "%s: bad value for variable '%s'\n",
 			progname, vnam(vc));
-	exit(1);
+	quit(1);
 }
 
 
@@ -1318,5 +1297,12 @@ syserr(s)			/* report a system error and exit */
 char	*s;
 {
 	perror(s);
-	exit(1);
+	quit(1);
+}
+
+
+quit(ec)			/* exit program */
+int	ec;
+{
+	exit(ec);
 }