--- ray/src/util/rad.c	1998/01/23 17:17:32	2.55
+++ 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
 
 /*
@@ -15,61 +15,63 @@ static char SCCSid[] = "$SunId$ LBL";
 #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 VIEWS		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 */
@@ -184,7 +186,7 @@ char	*argv[];
 	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);
 	quit(1);
 }