--- ray/src/util/rad.c	1993/03/12 13:37:03	2.4
+++ ray/src/util/rad.c	2005/12/08 17:06:11	2.82
@@ -1,122 +1,171 @@
-/* Copyright (c) 1993 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: rad.c,v 2.82 2005/12/08 17:06:11 greg Exp $";
 #endif
-
 /*
  * Executive program for oconv, rpict and pfilt
  */
 
 #include "standard.h"
-#include "paths.h"
+
 #include <ctype.h>
+#include <time.h>
 
+#include "platform.h"
+#include "rtprocess.h"
+#include "view.h"
+#include "paths.h"
+#include "vars.h"
 
-typedef struct {
-	char	*name;		/* variable name */
-	short	nick;		/* # characters required for nickname */
-	short	nass;		/* # assignments made */
-	char	*value;		/* assigned value(s) */
-	int	(*fixval)();	/* assignment checking function */
-} VARIABLE;
+#ifdef _WIN32
+  #define DELCMD "del"
+  #define RENAMECMD "rename"
+#else
+  #define DELCMD "rm -f"
+  #define RENAMECMD "mv"
+  #include <sys/types.h>
+  #include <sys/wait.h>
+#endif
 
-int	onevalue(), catvalues();
-
-				/* variables */
-#define OBJECT		0		/* object files */
-#define SCENE		1		/* scene files */
-#define MATERIAL	2		/* material files */
-#define RENDER		3		/* rendering options */
-#define OCONV		4		/* oconv options */
-#define PFILT		5		/* pfilt options */
-#define VIEW		6		/* view(s) for picture(s) */
-#define ZONE		7		/* simulation zone */
-#define QUALITY		8		/* desired rendering quality */
-#define OCTREE		9		/* octree file name */
-#define PICTURE		10		/* picture file name */
-#define AMBFILE		11		/* ambient file name */
-#define OPTFILE		12		/* rendering options file */
-#define EXPOSURE	13		/* picture exposure setting */
-#define RESOLUTION	14		/* maximum picture resolution */
-#define UP		15		/* view up (X, Y or Z) */
-#define INDIRECT	16		/* indirection in lighting */
-#define DETAIL		17		/* level of scene detail */
-#define PENUMBRAS	18		/* shadow penumbras are desired */
-#define VARIABILITY	19		/* level of light variability */
-#define REPORT		20		/* report frequency and errfile */
+				/* 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 */
-#define NVARS		21
+int NVARS = 26;
 
-VARIABLE	vv[NVARS] = {		/* variable-value pairs */
-	{"objects",	3,	0,	NULL,	catvalues},
-	{"scene",	3,	0,	NULL,	catvalues},
+VARIABLE	vv[] = {		/* variable-value pairs */
+	{"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},
-	{"render",	3,	0,	NULL,	catvalues},
+	{"mkillum",	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,	onevalue},
 	{"OCTREE",	3,	0,	NULL,	onevalue},
-	{"PICTURE",	3,	0,	NULL,	onevalue},
-	{"AMBFILE",	3,	0,	NULL,	onevalue},
 	{"OPTFILE",	3,	0,	NULL,	onevalue},
-	{"EXPOSURE",	3,	0,	NULL,	onevalue},
+	{"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,	onevalue},
-	{"DETAIL",	3,	0,	NULL,	onevalue},
-	{"PENUMBRAS",	3,	0,	NULL,	onevalue},
-	{"VARIABILITY",	3,	0,	NULL,	onevalue},
-	{"REPORT",	3,	0,	NULL,	onevalue},
+	{"VARIABILITY",	3,	0,	NULL,	qualvalue},
+	{"view",	2,	0,	NULL,	NULL},
+	{"ZFILE",	2,	0,	NULL,	onevalue},
+	{"ZONE",	2,	0,	NULL,	onevalue},
 };
 
-VARIABLE	*matchvar();
-char	*nvalue();
-int	vscale();
+				/* overture calculation file */
+#ifdef NULL_DEVICE
+char	overfile[] = NULL_DEVICE;
+#else
+char	overfile[] = "overture.unf";
+#endif
 
-#define UPPER(c)	((c)&~0x20)	/* ASCII trick */
 
-#define vnam(vc)	(vv[vc].name)
-#define vdef(vc)	(vv[vc].nass)
-#define vval(vc)	(vv[vc].value)
-#define vint(vc)	atoi(vval(vc))
-#define vlet(vc)	UPPER(vval(vc)[0])
-#define vbool(vc)	(vlet(vc)=='T')
+time_t	scenedate;		/* date of latest scene or object file */
+time_t	octreedate;		/* date of octree */
+time_t	matdate;		/* date of latest material file */
+time_t	illumdate;		/* date of last illum file */
 
-#define HIGH		2
-#define MEDIUM		1
-#define LOW		0
+char	*oct0name;		/* name of pre-mkillum octree */
+time_t	oct0date;		/* date of pre-mkillum octree */
+char	*oct1name;		/* name of post-mkillum octree */
+time_t	oct1date;		/* date of post-mkillum octree (>= matdate) */
 
-int	lowqopts(), medqopts(), hiqopts();
-int	(*setqopts[3])() = {lowqopts, medqopts, hiqopts};
-
-#define renderopts	(*setqopts[vscale(QUALITY)])
-
-extern long	fdate(), time();
-
-long	scenedate;		/* date of latest scene or object file */
-long	octreedate;		/* date of octree */
-
+int	nowarn = 0;		/* no warnings */
 int	explicate = 0;		/* explicate variables */
 int	silent = 0;		/* do work silently */
-int	noaction = 0;		/* don't do anything */
-char	*rvdevice = NULL;	/* rview output device */
+int	touchonly = 0;		/* touch files only */
+int	nprocs = 1;		/* maximum executing processes */
+int	sayview = 0;		/* print view out */
+char	*rvdevice = NULL;	/* rvu output device */
 char	*viewselect = NULL;	/* specific view only */
 
 int	overture = 0;		/* overture calculation needed */
 
+int	children_running = 0;	/* set negative in children */
+
 char	*progname;		/* global argv[0] */
+char	*rifname;		/* global rad input file name */
 
-char	radname[MAXPATH];	/* root Radiance file name */
+char	radname[PATH_MAX];	/* root Radiance file name */
 
+#define	inchild()	(children_running < 0)
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+static void rootname(char	*rn, char	*fn);
+static time_t checklast(char	*fnames);
+static char * newfname(char	*orig, int	pred);
+static void checkfiles(void);
+static void getoctcube(double	org[3], double	*sizp);
+static void setdefaults(void);
+static void oconv(void);
+static char * addarg(char	*op, char	*arg);
+static void oconvopts(char	*oo);
+static void mkillumopts(char	*mo);
+static void checkambfile(void);
+static double ambval(void);
+static void renderopts(char	*op, char	*po);
+static void lowqopts(char	*op, char	*po);
+static void medqopts(char	*op, char	*po);
+static void hiqopts(char	*op, char	*po);
+static void xferopts(char	*ro);
+static void pfiltopts(char	*po);
+static int matchword(char	*s1, char	*s2);
+static char * specview(char	*vs);
+static char * getview(int	n, char	*vn);
+static int myprintview(char	*vopts, FILE	*fp);
+static void rvu(char	*opts, char	*po);
+static void rpict(char	*opts, char	*po);
+static int touch(char	*fn);
+static int runcom(char	*cs);
+static int rmfile(char	*fn);
+static int mvfile(char	*fold, char	*fnew);
+static int next_process(void);
+static void wait_process(int	all);
+static void finish_process(void);
+static void badvalue(int	vc);
+static void syserr(char	*s);
+
+
+int
+main(
+	int	argc,
+	char	*argv[]
+)
 {
 	char	ropts[512];
+	char	popts[64];
 	int	i;
 
 	progname = argv[0];
@@ -127,29 +176,51 @@ char	*argv[];
 			silent++;
 			break;
 		case 'n':
-			noaction++;
+			nprocs = 0;
 			break;
+		case 'N':
+			nprocs = atoi(argv[++i]);
+			if (nprocs < 0)
+				nprocs = 0;
+			break;
+		case 't':
+			touchonly++;
+			break;
 		case 'e':
 			explicate++;
 			break;
 		case 'o':
 			rvdevice = argv[++i];
 			break;
+		case 'V':
+			sayview++;
+			break;
 		case 'v':
 			viewselect = argv[++i];
 			break;
+		case 'w':
+			nowarn++;
+			break;
 		default:
 			goto userr;
 		}
 	if (i >= argc)
 		goto userr;
+	rifname = argv[i];
+				/* check command-line options */
+	if ((nprocs > 1) & (viewselect != NULL))
+		nprocs = 1;
 				/* assign Radiance root file name */
-	rootname(radname, argv[i]);
+	rootname(radname, rifname);
 				/* load variable values */
-	load(argv[i]);
+	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 */
@@ -158,30 +229,37 @@ char	*argv[];
 	setdefaults();
 				/* print all values if requested */
 	if (explicate)
-		printvals();
-				/* run simulation */
+		printvars(stdout);
+				/* build octree (and run mkillum) */
 	oconv();
-	renderopts(ropts);
+				/* check date on ambient file */
+	checkambfile();
+				/* run simulation */
+	renderopts(ropts, popts);
 	xferopts(ropts);
 	if (rvdevice != NULL)
-		rview(ropts);
+		rvu(ropts, popts);
 	else
-		rpict(ropts);
-	exit(0);
+		rpict(ropts, popts);
+	quit(0);
 userr:
 	fprintf(stderr,
-	"Usage: %s [-s][-n][-e][-v view][-o dev] rfile [VAR=value ..]\n",
+"Usage: %s [-w][-s][-n|-N npr][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
 			progname);
-	exit(1);
+	quit(1);
+	return 1; /* pro forma return */
 }
 
 
-rootname(rn, fn)		/* remove tail from end of fn */
-register char	*rn, *fn;
+static void
+rootname(		/* remove tail from end of fn */
+	register char	*rn,
+	register char	*fn
+)
 {
 	char	*tp, *dp;
 
-	for (tp = NULL, dp = rn; *rn = *fn++; rn++)
+	for (tp = NULL, dp = rn; (*rn = *fn++); rn++)
 		if (ISDIRSEP(*rn))
 			dp = rn;
 		else if (*rn == '.')
@@ -191,260 +269,151 @@ register char	*rn, *fn;
 }
 
 
-load(rfname)			/* load Radiance simulation file */
-char	*rfname;
+static time_t
+checklast(			/* check files and find most recent */
+	register char	*fnames
+)
 {
-	FILE	*fp;
-	char	buf[512];
-	register char	*cp;
+	char	thisfile[PATH_MAX];
+	time_t	thisdate, lastdate = 0;
 
-	if (rfname == NULL)
-		fp = stdin;
-	else if ((fp = fopen(rfname, "r")) == NULL)
-		syserr(rfname);
-	while (fgetline(buf, sizeof(buf), fp) != NULL) {
-		for (cp = buf; *cp; cp++) {
-			switch (*cp) {
-			case '\\':
-			case '\n':
-				*cp = ' ';
-				continue;
-			case '#':
-				*cp = '\0';
-				break;
-			default:
-				continue;
-			}
-			break;
+	if (fnames == NULL)
+		return(0);
+	while ((fnames = nextword(thisfile, PATH_MAX, fnames)) != NULL) {
+		if (thisfile[0] == '!' ||
+				(thisfile[0] == '\\' && thisfile[1] == '!')) {
+			if (!lastdate)
+				lastdate = 1;
+			continue;
 		}
-		setvariable(buf);
+		if (!(thisdate = fdate(thisfile)))
+			syserr(thisfile);
+		if (thisdate > lastdate)
+			lastdate = thisdate;
 	}
-	fclose(fp);
+	return(lastdate);
 }
 
 
-setvariable(ass)		/* assign variable according to string */
-register char	*ass;
+static char *
+newfname(		/* create modified file name */
+	char	*orig,
+	int	pred
+)
 {
-	char	varname[32];
 	register char	*cp;
-	register VARIABLE	*vp;
-	register int	i;
-	int	n;
+	register int	n;
+	int	suffix;
 
-	while (isspace(*ass))		/* skip leading space */
-		ass++;
-	cp = varname;			/* extract name */
-	while (cp < varname+sizeof(varname)-1
-			&& *ass && !isspace(*ass) && *ass != '=')
-		*cp++ = *ass++;
-	*cp = '\0';
-	if (!varname[0])
-		return;		/* no variable name! */
-					/* trim value */
-	while (isspace(*ass) || *ass == '=')
-		ass++;
-	cp = ass + strlen(ass);
-	do
-		*cp-- = '\0';
-	while (cp >= ass && isspace(*cp));
-	n = cp - ass + 1;
-	if (!n) {
-		fprintf(stderr, "%s: warning - missing value for variable '%s'\n",
-				progname, varname);
-		return;
+	n = 0; cp = orig; suffix = -1;		/* suffix position, length */
+	while (*cp) {
+		if (*cp == '.') suffix = n;
+		else if (ISDIRSEP(*cp)) suffix = -1;
+		cp++; n++;
 	}
-					/* match variable from list */
-	vp = matchvar(varname);
-	if (vp == NULL) {
-		fprintf(stderr, "%s: unknown variable '%s'\n",
-				progname, varname);
-		exit(1);
-	}
-					/* assign new value */
-	if (i = vp->nass) {
-		cp = vp->value;
-		while (i--)
-			while (*cp++)
-				;
-		i = cp - vp->value;
-		vp->value = realloc(vp->value, i+n+1);
-	} else
-		vp->value = malloc(n+1);
-	if (vp->value == NULL)
+	if (suffix == -1) suffix = n;
+	if ((cp = bmalloc(n+2)) == NULL)
 		syserr(progname);
-	strcpy(vp->value+i, ass);
-	vp->nass++;
-}
-
-
-VARIABLE *
-matchvar(nam)			/* match a variable by its name */
-char	*nam;
-{
-	int	n = strlen(nam);
-	register int	i;
-
-	for (i = 0; i < NVARS; i++)
-		if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n))
-			return(vv+i);
-	return(NULL);
-}
-
-
-char *
-nvalue(vp, n)			/* return nth variable value */
-VARIABLE	*vp;
-register int	n;
-{
-	register char	*cp;
-
-	if (vp == NULL || n < 0 || n >= vp->nass)
-		return(NULL);
-	cp = vp->value;
-	while (n--)
-		while (*cp++)
-			;
+	strncpy(cp, orig, suffix);
+	cp[suffix] = pred;			/* root name + pred + suffix */
+	strcpy(cp+suffix+1, orig+suffix);
 	return(cp);
 }
 
 
-int
-vscale(vc)			/* return scale for variable vc */
-int	vc;
+static void
+checkfiles(void)			/* check for existence and modified times */
 {
-	switch(vlet(vc)) {
-	case 'H':
-		return(HIGH);
-	case 'M':
-		return(MEDIUM);
-	case 'L':
-		return(LOW);
-	}
-	badvalue(vc);
-}
+	time_t	objdate;
 
-
-checkvalues()			/* check assignments */
-{
-	register int	i;
-
-	for (i = 0; i < NVARS; i++)
-		if (vv[i].fixval != NULL)
-			(*vv[i].fixval)(vv+i);
-}
-
-
-onevalue(vp)			/* only one assignment for this variable */
-register VARIABLE	*vp;
-{
-	if (vp->nass < 2)
-		return;
-	fprintf(stderr, "%s: warning - multiple assignment of variable '%s'\n",
-			progname, vp->name);
-	do
-		vp->value += strlen(vp->value)+1;
-	while (--vp->nass > 1);
-}
-
-
-catvalues(vp)			/* concatenate variable values */
-register VARIABLE	*vp;
-{
-	register char	*cp;
-
-	if (vp->nass < 2)
-		return;
-	for (cp = vp->value; vp->nass > 1; vp->nass--) {
-		while (*cp)
-			cp++;
-		*cp++ = ' ';
-	}
-}
-
-
-long
-checklast(fnames)			/* check files and find most recent */
-register char	*fnames;
-{
-	char	thisfile[MAXPATH];
-	long	thisdate, lastdate = -1;
-	register char	*cp;
-
-	while (*fnames) {
-		while (isspace(*fnames)) fnames++;
-		cp = thisfile;
-		while (*fnames && !isspace(*fnames))
-			*cp++ = *fnames++;
-		*cp = '\0';
-		if ((thisdate = fdate(thisfile)) < 0)
-			syserr(thisfile);
-		if (thisdate > lastdate)
-			lastdate = thisdate;
-	}
-	return(lastdate);
-}
-
-
-checkfiles()			/* check for existence and modified times */
-{
-	char	*cp;
-	long	objdate;
-
 	if (!vdef(OCTREE)) {
-		if ((cp = bmalloc(strlen(radname)+5)) == NULL)
+		if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL)
 			syserr(progname);
-		sprintf(cp, "%s.oct", radname);
-		vval(OCTREE) = cp;
+		sprintf(vval(OCTREE), "%s.oct", radname);
 		vdef(OCTREE)++;
+	} else if (vval(OCTREE)[0] == '!') {
+		fprintf(stderr, "%s: illegal '%s' specification\n",
+				progname, vnam(OCTREE));
+		quit(1);
 	}
 	octreedate = fdate(vval(OCTREE));
-	scenedate = -1;
-	if (vdef(SCENE)) {
-		scenedate = checklast(vval(SCENE));
-		if (vdef(OBJECT)) {
-			objdate = checklast(vval(OBJECT));
-			if (objdate > scenedate)
-				scenedate = objdate;
-		}
+	if (vdef(ILLUM)) {		/* illum requires secondary octrees */
+		oct0name = newfname(vval(OCTREE), '0');
+		oct1name = newfname(vval(OCTREE), '1');
+		oct0date = fdate(oct0name);
+		oct1date = fdate(oct1name);
+	} else
+		oct0name = oct1name = vval(OCTREE);
+	if ((scenedate = checklast(vval(SCENE))) &&
+			(objdate = checklast(vval(OBJECT))) > scenedate)
+		scenedate = objdate;
+	illumdate = checklast(vval(ILLUM));
+	if (!octreedate & !scenedate & !illumdate) {
+		fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname,
+				vnam(OCTREE), vnam(SCENE), vnam(ILLUM));
+		quit(1);
 	}
-	if (octreedate < 0 & scenedate < 0) {
-		fprintf(stderr, "%s: need '%s' or '%s'\n", progname,
-				vnam(OCTREE), vnam(SCENE));
-		exit(1);
-	}
+	matdate = checklast(vval(MATERIAL));
 }	
 
 
-getoctcube(org, sizp)		/* get octree bounding cube */
-double	org[3], *sizp;
+static void
+getoctcube(		/* get octree bounding cube */
+	double	org[3],
+	double	*sizp
+)
 {
-	extern FILE	*popen();
 	static double	oorg[3], osiz = 0.;
-	char	buf[MAXPATH+16];
+	double	min[3], max[3];
+	char	buf[1024];
 	FILE	*fp;
+	register int	i;
 
 	if (osiz <= FTINY) {
-		oconv();		/* does nothing if done already */
-		sprintf(buf, "getinfo -d < %s", vval(OCTREE));
-		if ((fp = popen(buf, "r")) == NULL)
-			syserr("getinfo");
-		if (fscanf(fp, "%lf %lf %lf %lf", &oorg[0], &oorg[1],
-				&oorg[2], &osiz) != 4) {
-			fprintf(stderr,
+		if (!nprocs && fdate(oct1name) <
+				(scenedate>illumdate?scenedate:illumdate)) {
+							/* run getbbox */
+			sprintf(buf, "getbbox -w -h %s",
+				vdef(SCENE) ? vval(SCENE) : vval(ILLUM));
+			if ((fp = popen(buf, "r")) == NULL)
+				syserr("getbbox");
+			if (fscanf(fp, "%lf %lf %lf %lf %lf %lf",
+					&min[0], &max[0], &min[1], &max[1],
+					&min[2], &max[2]) != 6) {
+				fprintf(stderr,
+			"%s: error reading bounding box from getbbox\n",
+						progname);
+				quit(1);
+			}
+			for (i = 0; i < 3; i++)
+				if (max[i] - min[i] > osiz)
+					osiz = max[i] - min[i];
+			for (i = 0; i < 3; i++)
+				oorg[i] = (max[i]+min[i]-osiz)*.5;
+			pclose(fp);
+		} else {				/* from octree */
+			oconv();	/* does nothing if done already */
+			sprintf(buf, "getinfo -d < %s", oct1name);
+			if ((fp = popen(buf, "r")) == NULL)
+				syserr("getinfo");
+			if (fscanf(fp, "%lf %lf %lf %lf", &oorg[0], &oorg[1],
+					&oorg[2], &osiz) != 4) {
+				fprintf(stderr,
 			"%s: error reading bounding cube from getinfo\n",
-					progname);
-			exit(1);
+						progname);
+				quit(1);
+			}
+			pclose(fp);
 		}
-		pclose(fp);
 	}
 	org[0] = oorg[0]; org[1] = oorg[1]; org[2] = oorg[2]; *sizp = osiz;
 }
 
 
-setdefaults()			/* set default values for unassigned var's */
+static void
+setdefaults(void)			/* set default values for unassigned var's */
 {
-	double	org[3], size;
+	double	org[3], lim[3], size;
 	char	buf[128];
 
 	if (!vdef(ZONE)) {
@@ -454,6 +423,16 @@ setdefaults()			/* set default values for unassigned v
 		vval(ZONE) = savqstr(buf);
 		vdef(ZONE)++;
 	}
+	if (!vdef(EYESEP)) {
+		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf",
+				&org[0], &lim[0], &org[1], &lim[1],
+				&org[2], &lim[2]) != 6)
+			badvalue(ZONE);
+		sprintf(buf, "%f",
+			0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2]));
+		vval(EYESEP) = savqstr(buf);
+		vdef(EYESEP)++;
+	}
 	if (!vdef(INDIRECT)) {
 		vval(INDIRECT) = "0";
 		vdef(INDIRECT)++;
@@ -470,9 +449,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";
@@ -489,55 +468,126 @@ setdefaults()			/* set default values for unassigned v
 }
 
 
-printvals()			/* print variable values */
+static void
+oconv(void)				/* run oconv and mkillum if necessary */
 {
-	register int	i, j;
+	static char	illumtmp[] = "ilXXXXXX";
+	char	combuf[PATH_MAX], ocopts[64], mkopts[1024];
 
-	for (i = 0; i < NVARS; i++)
-		for (j = 0; j < vdef(i); j++)
-			printf("%s= %s\n", vnam(i), nvalue(vv+i, j));
-	fflush(stdout);
-}
-
-
-oconv()				/* run oconv if necessary */
-{
-	char	combuf[512], ocopts[64];
-
-	if (octreedate >= scenedate)	/* check dates */
+	oconvopts(ocopts);		/* get options */
+	if (octreedate < scenedate) {	/* check date on original octree */
+		if (touchonly && octreedate)
+			touch(vval(OCTREE));
+		else {				/* build command */
+			if (vdef(MATERIAL))
+				sprintf(combuf, "oconv%s %s %s > %s", ocopts,
+						vval(MATERIAL), vval(SCENE),
+						vval(OCTREE));
+			else
+				sprintf(combuf, "oconv%s %s > %s", ocopts,
+						vval(SCENE), vval(OCTREE));
+			
+			if (runcom(combuf)) {		/* run it */
+				fprintf(stderr,
+				"%s: error generating octree\n\t%s removed\n",
+						progname, vval(OCTREE));
+				unlink(vval(OCTREE));
+				quit(1);
+			}
+		}
+		octreedate = time((time_t *)NULL);
+		if (octreedate < scenedate)	/* in case clock is off */
+			octreedate = scenedate;
+	}
+	if (oct1name == vval(OCTREE))		/* no mkillum? */
+		oct1date = octreedate > matdate ? octreedate : matdate;
+	if ((oct1date >= octreedate) & (oct1date >= matdate)
+			& (oct1date >= illumdate))	/* all done */
 		return;
-					/* build command */
-	oconvopts(ocopts);
-	if (vdef(MATERIAL))
-		sprintf(combuf, "oconv%s %s %s > %s", ocopts,
-				vval(MATERIAL), vval(SCENE), vval(OCTREE));
-	else
-		sprintf(combuf, "oconv%s %s > %s", ocopts,
-				vval(SCENE), vval(OCTREE));
-	
-	if (runcom(combuf)) {		/* run it */
-		fprintf(stderr, "%s: error generating octree\n\t%s removed\n",
-				progname, vval(OCTREE));
-		unlink(vval(OCTREE));
-		exit(1);
+						/* make octree0 */
+	if ((oct0date < scenedate) | (oct0date < illumdate)) {
+		if (touchonly && oct0date)
+			touch(oct0name);
+		else {				/* build command */
+			if (octreedate)
+				sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
+					vval(OCTREE), vval(ILLUM), oct0name);
+			else if (vdef(MATERIAL))
+				sprintf(combuf, "oconv%s %s %s > %s", ocopts,
+					vval(MATERIAL), vval(ILLUM), oct0name);
+			else
+				sprintf(combuf, "oconv%s %s > %s", ocopts,
+					vval(ILLUM), oct0name);
+			if (runcom(combuf)) {		/* run it */
+				fprintf(stderr,
+				"%s: error generating octree\n\t%s removed\n",
+						progname, oct0name);
+				unlink(oct0name);
+				quit(1);
+			}
+		}
+		oct0date = time((time_t *)NULL);
+		if (oct0date < octreedate)	/* in case clock is off */
+			oct0date = octreedate;
+		if (oct0date < illumdate)	/* ditto */
+			oct0date = illumdate;
+		}
+	if (touchonly && oct1date)
+		touch(oct1name);
+	else {
+		mkillumopts(mkopts);		/* build mkillum command */
+		mktemp(illumtmp);
+		sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
+				oct0name, vval(ILLUM), illumtmp);
+		if (runcom(combuf)) {			/* run it */
+			fprintf(stderr, "%s: error running mkillum\n",
+					progname);
+			unlink(illumtmp);
+			quit(1);
+		}
+						/* make octree1 (frozen) */
+		if (octreedate)
+			sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
+				vval(OCTREE), illumtmp, oct1name);
+		else if (vdef(MATERIAL))
+			sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
+				vval(MATERIAL), illumtmp, oct1name);
+		else
+			sprintf(combuf, "oconv%s -f %s > %s", ocopts,
+				illumtmp, oct1name);
+		if (runcom(combuf)) {		/* run it */
+			fprintf(stderr,
+				"%s: error generating octree\n\t%s removed\n",
+					progname, oct1name);
+			unlink(oct1name);
+			unlink(illumtmp);
+			quit(1);
+		}
+		rmfile(illumtmp);
 	}
-	octreedate = time(0);
+	oct1date = time((time_t *)NULL);
+	if (oct1date < oct0date)	/* in case clock is off */
+		oct1date = oct0date;
 }
 
 
-char *
-addarg(op, arg)				/* add argument and advance pointer */
-register char	*op, *arg;
+static char *
+addarg(				/* add argument and advance pointer */
+register char	*op,
+register char	*arg
+)
 {
 	*op = ' ';
-	while (*++op = *arg++)
+	while ( (*++op = *arg++) )
 		;
 	return(op);
 }
 
 
-oconvopts(oo)				/* get oconv options */
-register char	*oo;
+static void
+oconvopts(				/* get oconv options */
+	register char	*oo
+)
 {
 	/* BEWARE:  This may be called via setdefaults(), so no assumptions */
 
@@ -547,59 +597,123 @@ register char	*oo;
 }
 
 
-double
-ambval()				/* compute ambient value */
+static void
+mkillumopts(				/* get mkillum options */
+	char	*mo
+)
 {
+	/* BEWARE:  This may be called via setdefaults(), so no assumptions */
+
+	if (nprocs > 1) {
+		sprintf(mo, " -n %d", nprocs);
+		while (*mo)
+			mo++;
+	} else
+		*mo = '\0';
+	if (vdef(MKILLUM))
+		addarg(mo, vval(MKILLUM));
+}
+
+
+static void
+checkambfile(void)			/* check date on ambient file */
+{
+	time_t	afdate;
+
+	if (!vdef(AMBFILE))
+		return;
+	if (!(afdate = fdate(vval(AMBFILE))))
+		return;
+	if (oct1date > afdate) {
+		if (touchonly)
+			touch(vval(AMBFILE));
+		else
+			rmfile(vval(AMBFILE));
+	}
+}
+
+
+static double
+ambval(void)				/* compute ambient value */
+{
 	if (vdef(EXPOSURE)) {
 		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
-			return(.5/pow(2.,atof(vval(EXPOSURE))));
-		if (isdigit(vval(EXPOSURE)[0]) || vval(EXPOSURE)[0] == '.')
-			return(.5/atof(vval(EXPOSURE)));
-		badvalue(EXPOSURE);
+			return(.5/pow(2.,vflt(EXPOSURE)));
+		return(.5/vflt(EXPOSURE));
 	}
 	if (vlet(ZONE) == 'E')
 		return(10.);
 	if (vlet(ZONE) == 'I')
 		return(.01);
 	badvalue(ZONE);
+	return 0; /* pro forma return */
 }
 
 
-lowqopts(op)				/* low quality rendering options */
-register char	*op;
+static void
+renderopts(			/* set rendering options */
+	char	*op,
+	char	*po
+)
 {
+	switch(vscale(QUALITY)) {
+	case LOW:
+		lowqopts(op, po);
+		break;
+	case MEDIUM:
+		medqopts(op, po);
+		break;
+	case HIGH:
+		hiqopts(op, po);
+		break;
+	}
+}
+
+
+static void
+lowqopts(			/* low quality rendering options */
+	register char	*op,
+	char	*po
+)
+{
 	double	d, org[3], siz[3];
 
 	*op = '\0';
+	*po = '\0';
 	if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
 			&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
 		badvalue(ZONE);
 	siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
+	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
+		badvalue(ZONE);
 	getoctcube(org, &d);
 	d *= 3./(siz[0]+siz[1]+siz[2]);
 	switch (vscale(DETAIL)) {
 	case LOW:
-		op = addarg(op, "-ps 16 -dp 16");
-		sprintf(op, " -ar %d", (int)(4*d));
+		po = addarg(po, "-ps 16");
+		op = addarg(op, "-dp 64");
+		sprintf(op, " -ar %d", (int)(8*d));
 		op += strlen(op);
 		break;
 	case MEDIUM:
-		op = addarg(op, "-ps 8 -dp 32");
-		sprintf(op, " -ar %d", (int)(8*d));
+		po = addarg(po, "-ps 8");
+		op = addarg(op, "-dp 128");
+		sprintf(op, " -ar %d", (int)(16*d));
 		op += strlen(op);
 		break;
 	case HIGH:
-		op = addarg(op, "-ps 4 -dp 64");
-		sprintf(op, " -ar %d", (int)(16*d));
+		po = addarg(po, "-ps 4");
+		op = addarg(op, "-dp 256");
+		sprintf(op, " -ar %d", (int)(32*d));
 		op += strlen(op);
 		break;
 	}
-	op = addarg(op, "-pt .16");
+	po = addarg(po, "-pt .16");
 	if (vbool(PENUMBRAS))
 		op = addarg(op, "-ds .4");
 	else
 		op = addarg(op, "-ds 0");
-	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .7");
+	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5");
 	if (vdef(AMBFILE)) {
 		sprintf(op, " -af %s", vval(AMBFILE));
 		op += strlen(op);
@@ -607,65 +721,80 @@ register char	*op;
 		overture = 0;
 	switch (vscale(VARIABILITY)) {
 	case LOW:
-		op = addarg(op, "-aa .4 -ad 32");
+		op = addarg(op, "-aa .3 -ad 256");
 		break;
 	case MEDIUM:
-		op = addarg(op, "-aa .3 -ad 64");
+		op = addarg(op, "-aa .25 -ad 512");
 		break;
 	case HIGH:
-		op = addarg(op, "-aa .25 -ad 128");
+		op = addarg(op, "-aa .2 -ad 1024");
 		break;
 	}
 	op = addarg(op, "-as 0");
 	d = ambval();
 	sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
 	op += strlen(op);
-	op = addarg(op, "-lr 3 -lw .02");
+	op = addarg(op, "-lr 6 -lw .01");
 	if (vdef(RENDER))
 		op = addarg(op, vval(RENDER));
 }
 
 
-medqopts(op)				/* medium quality rendering options */
-register char	*op;
+static void
+medqopts(			/* medium quality rendering options */
+	register char	*op,
+	char	*po
+)
 {
-	double	d, org[3], siz[3];
+	double	d, org[3], siz[3], asz;
 
 	*op = '\0';
+	*po = '\0';
 	if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
 			&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
 		badvalue(ZONE);
 	siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
+	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
+		badvalue(ZONE);
 	getoctcube(org, &d);
-	d *= 3./(siz[0]+siz[1]+siz[2]);
+	asz = (siz[0]+siz[1]+siz[2])/3.;
+	d /= asz;
 	switch (vscale(DETAIL)) {
 	case LOW:
-		op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
-		op = addarg(op, "-dp 64");
-		sprintf(op, " -ar %d", (int)(8*d));
+		po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
+		op = addarg(op, "-dp 256");
+		sprintf(op, " -ar %d", (int)(16*d));
 		op += strlen(op);
+		sprintf(op, " -ms %.2g", asz/20.);
+		op += strlen(op);
 		break;
 	case MEDIUM:
-		op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
-		op = addarg(op, "-dp 128");
-		sprintf(op, " -ar %d", (int)(16*d));
+		po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
+		op = addarg(op, "-dp 512");
+		sprintf(op, " -ar %d", (int)(32*d));
 		op += strlen(op);
+		sprintf(op, " -ms %.2g", asz/40.);
+		op += strlen(op);
 		break;
 	case HIGH:
-		op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
-		op = addarg(op, "-dp 256");
-		sprintf(op, " -ar %d", (int)(32*d));
+		po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
+		op = addarg(op, "-dp 1024");
+		sprintf(op, " -ar %d", (int)(64*d));
 		op += strlen(op);
+		sprintf(op, " -ms %.2g", asz/80.);
+		op += strlen(op);
 		break;
 	}
-	op = addarg(op, "-pt .08");
+	po = addarg(po, "-pt .08");
 	if (vbool(PENUMBRAS))
-		op = addarg(op, "-ds .2 -dj .35");
+		op = addarg(op, "-ds .2 -dj .5");
 	else
 		op = addarg(op, "-ds .3");
-	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .15");
-	sprintf(op, " -ab %d", overture=vint(INDIRECT));
-	op += strlen(op);
+	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
+	if ( (overture = vint(INDIRECT)) ) {
+		sprintf(op, " -ab %d", overture);
+		op += strlen(op);
+	}
 	if (vdef(AMBFILE)) {
 		sprintf(op, " -af %s", vval(AMBFILE));
 		op += strlen(op);
@@ -673,62 +802,75 @@ register char	*op;
 		overture = 0;
 	switch (vscale(VARIABILITY)) {
 	case LOW:
-		op = addarg(op, "-aa .25 -ad 128 -as 0");
+		op = addarg(op, "-aa .2 -ad 329 -as 42");
 		break;
 	case MEDIUM:
-		op = addarg(op, "-aa .2 -ad 300 -as 64");
+		op = addarg(op, "-aa .15 -ad 800 -as 128");
 		break;
 	case HIGH:
-		op = addarg(op, "-aa .15 -ad 500 -as 128");
+		op = addarg(op, "-aa .1 -ad 1536 -as 392");
 		break;
 	}
 	d = ambval();
 	sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
 	op += strlen(op);
-	op = addarg(op, "-lr 6 -lw .002");
+	op = addarg(op, "-lr 8 -lw .002");
 	if (vdef(RENDER))
 		op = addarg(op, vval(RENDER));
 }
 
 
-hiqopts(op)				/* high quality rendering options */
-register char	*op;
+static void
+hiqopts(				/* high quality rendering options */
+	register char	*op,
+	char	*po
+)
 {
-	double	d, org[3], siz[3];
+	double	d, org[3], siz[3], asz;
 
 	*op = '\0';
+	*po = '\0';
 	if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
 			&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
 		badvalue(ZONE);
 	siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
+	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
+		badvalue(ZONE);
 	getoctcube(org, &d);
-	d *= 3./(siz[0]+siz[1]+siz[2]);
+	asz = (siz[0]+siz[1]+siz[2])/3.;
+	d /= asz;
 	switch (vscale(DETAIL)) {
 	case LOW:
-		op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
-		op = addarg(op, "-dp 256");
-		sprintf(op, " -ar %d", (int)(16*d));
+		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
+		op = addarg(op, "-dp 1024");
+		sprintf(op, " -ar %d", (int)(32*d));
 		op += strlen(op);
+		sprintf(op, " -ms %.2g", asz/40.);
+		op += strlen(op);
 		break;
 	case MEDIUM:
-		op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
-		op = addarg(op, "-dp 512");
-		sprintf(op, " -ar %d", (int)(32*d));
+		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
+		op = addarg(op, "-dp 2048");
+		sprintf(op, " -ar %d", (int)(64*d));
 		op += strlen(op);
+		sprintf(op, " -ms %.2g", asz/80.);
+		op += strlen(op);
 		break;
 	case HIGH:
-		op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
-		op = addarg(op, "-dp 1024");
-		sprintf(op, " -ar %d", (int)(64*d));
+		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
+		op = addarg(op, "-dp 4096");
+		sprintf(op, " -ar %d", (int)(128*d));
 		op += strlen(op);
+		sprintf(op, " -ms %.2g", asz/160.);
+		op += strlen(op);
 		break;
 	}
-	op = addarg(op, "-pt .04");
+	po = addarg(po, "-pt .04");
 	if (vbool(PENUMBRAS))
-		op = addarg(op, "-ds .1 -dj .7");
+		op = addarg(op, "-ds .1 -dj .65");
 	else
 		op = addarg(op, "-ds .2");
-	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .03");
+	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
 	sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
 	op += strlen(op);
 	if (vdef(AMBFILE)) {
@@ -738,13 +880,13 @@ register char	*op;
 		overture = 0;
 	switch (vscale(VARIABILITY)) {
 	case LOW:
-		op = addarg(op, "-aa .15 -ad 200 -as 0");
+		op = addarg(op, "-aa .125 -ad 512 -as 64");
 		break;
 	case MEDIUM:
-		op = addarg(op, "-aa .125 -ad 512 -as 128");
+		op = addarg(op, "-aa .1 -ad 1536 -as 768");
 		break;
 	case HIGH:
-		op = addarg(op, "-aa .08 -ad 850 -as 256");
+		op = addarg(op, "-aa .075 -ad 4096 -as 2048");
 		break;
 	}
 	d = ambval();
@@ -756,58 +898,67 @@ register char	*op;
 }
 
 
-xferopts(ro)				/* transfer options if indicated */
-char	*ro;
+static void
+xferopts(				/* transfer options if indicated */
+	char	*ro
+)
 {
 	int	fd, n;
+	register char	*cp;
 	
 	n = strlen(ro);
 	if (n < 2)
 		return;
 	if (vdef(OPTFILE)) {
-		if ((fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666)) == -1)
+		for (cp = ro; cp[1]; cp++)
+			if (isspace(cp[1]) && (cp[2] == '@' ||
+					(cp[2] == '-' && isalpha(cp[3]))))
+				*cp = '\n';
+			else
+				*cp = cp[1];
+		*cp = '\n';
+		fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666);
+		if (fd < 0 || write(fd, ro, n) != n || close(fd) < 0)
 			syserr(vval(OPTFILE));
-		if (write(fd, ro+1, n-1) != n-1)
-			syserr(vval(OPTFILE));
-		write(fd, "\n", 1);
-		close(fd);
-		sprintf(ro, " \"^%s\"", vval(OPTFILE));
+		sprintf(ro, " @%s", vval(OPTFILE));
 	}
-#ifdef MSDOS
+#ifdef _WIN32
 	else if (n > 50) {
-		register char	*evp = bmalloc(n+6);
-		if (evp == NULL)
-			syserr(progname);
-		strcpy(evp, "ROPT=");
-		strcat(evp, ro);
-		if (putenv(evp) != 0) {
-			fprintf(stderr, "%s: out of environment space\n",
-					progname);
-			exit(1);
-		}
+		setenv("ROPT", ro+1);
 		strcpy(ro, " $ROPT");
 	}
 #endif
 }
 
 
-pfiltopts(po)				/* get pfilt options */
-register char	*po;
+static void
+pfiltopts(				/* get pfilt options */
+	register char	*po
+)
 {
 	*po = '\0';
 	if (vdef(EXPOSURE)) {
 		po = addarg(po, "-1 -e");
 		po = addarg(po, vval(EXPOSURE));
 	}
-	if (vscale(QUALITY) == HIGH)
-		po = addarg(po, "-r .65");
+	switch (vscale(QUALITY)) {
+	case MEDIUM:
+		po = addarg(po, "-r .6");
+		break;
+	case HIGH:
+		po = addarg(po, "-m .25");
+		break;
+	}
 	if (vdef(PFILT))
 		po = addarg(po, vval(PFILT));
 }
 
 
-matchword(s1, s2)			/* match white-delimited words */
-register char	*s1, *s2;
+static int
+matchword(			/* match white-delimited words */
+	register char	*s1,
+	register char	*s2
+)
 {
 	while (isspace(*s1)) s1++;
 	while (isspace(*s2)) s2++;
@@ -818,9 +969,10 @@ register char	*s1, *s2;
 }
 
 
-char *
-specview(vs)				/* get proper view spec from vs */
-register char	*vs;
+static char *
+specview(				/* get proper view spec from vs */
+	register char	*vs
+)
 {
 	static char	vup[7][12] = {"-vu 0 0 -1","-vu 0 -1 0","-vu -1 0 0",
 			"-vu 0 0 1", "-vu 1 0 0","-vu 0 1 0","-vu 0 0 1"};
@@ -838,7 +990,7 @@ register char	*vs;
 			upax = 1-'X'+UPPER(vval(UP)[1]);
 		else
 			upax = 1-'X'+vlet(UP);
-		if (upax < 1 | upax > 3)
+		if ((upax < 1) | (upax > 3))
 			badvalue(UP);
 		if (vval(UP)[0] == '-')
 			upax = -upax;
@@ -861,7 +1013,7 @@ register char	*vs;
 		zpos = -1; vs++;
 	}
 	viewtype = 'v';
-	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h')
+	if((*vs == 'v') | (*vs == 'l') | (*vs == 'a') | (*vs == 'h') | (*vs == 'c'))
 		viewtype = *vs++;
 	cp = viewopts;
 	if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {	/* got one! */
@@ -872,6 +1024,8 @@ register char	*vs;
 			badvalue(ZONE);
 		for (i = 0; i < 3; i++) {
 			dim[i] -= cent[i];
+			if (dim[i] <= FTINY)
+				badvalue(ZONE);
 			cent[i] += .5*dim[i];
 		}
 		mult = vlet(ZONE)=='E' ? 2. : .45 ;
@@ -914,6 +1068,9 @@ register char	*vs;
 		case 'h':
 			cp = addarg(cp, "-vh 180 -vv 180");
 			break;
+		case 'c':
+			cp = addarg(cp, "-vh 180 -vv 90");
+			break;
 		}
 	} else {
 		while (!isspace(*vs))		/* else skip id */
@@ -924,20 +1081,28 @@ register char	*vs;
 			cp += strlen(cp);
 		}
 	}
-					/* append any additional options */
+	if (cp == viewopts)		/* append any additional options */
+		vs++;		/* skip prefixed space if unneeded */
 	strcpy(cp, vs);
+#ifdef _WIN32
+	if (strlen(viewopts) > 40) {
+		setenv("VIEW", viewopts);
+		return("$VIEW");
+	}
+#endif
 	return(viewopts);
 }
 
 
-char *
-getview(n, vn)				/* get view n, or NULL if none */
-int	n;
-char	*vn;
+static char *
+getview(				/* get view n, or NULL if none */
+	int	n,
+	char	*vn		/* returned view name */
+)
 {
 	register char	*mv;
 
-	if (viewselect != NULL) {
+	if (viewselect != NULL) {		/* command-line selected */
 		if (n)				/* only do one */
 			return(NULL);
 		if (viewselect[0] == '-') {	/* already specified */
@@ -950,50 +1115,118 @@ char	*vn;
 				;
 			*vn = '\0';
 		}
+						/* view number? */
+		if (isint(viewselect))
+			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? */
 	}
-	if (vn != NULL && (mv = nvalue(vv+VIEW, n)) != NULL) {
-		if (*mv != '-')
-			while (*mv && !isspace(*mv))
-				*vn++ = *mv++;
+	mv = nvalue(VIEWS, n);		/* use view n */
+	if ((vn != NULL) & (mv != NULL)) {
+		register char	*mv2 = mv;
+		if (*mv2 != '-')
+			while (*mv2 && !isspace(*mv2))
+				*vn++ = *mv2++;
 		*vn = '\0';
 	}
-	return(specview(nvalue(vv+VIEW, n)));	/* use view n */
+	return(specview(mv));
 }
 
 
-rview(opts)				/* run rview with first view */
-char	*opts;
+static int
+myprintview(			/* print out selected view */
+	register char	*vopts,
+	FILE	*fp
+)
 {
-	char	combuf[512];
+	VIEW	vwr;
+	char	buf[128];
+	register char	*cp;
+#ifdef _WIN32
+/* XXX Should we allow something like this for all platforms? */
+/* XXX Or is it still required at all? */
+again:
+#endif
+	if (vopts == NULL)
+		return(-1);
+#ifdef _WIN32
+	if (vopts[0] == '$') {
+		vopts = getenv(vopts+1);
+		goto again;
+	}
+#endif
+	vwr = stdview;
+	sscanview(&vwr, cp=vopts);		/* set initial options */
+	while ((cp = strstr(cp, "-vf ")) != NULL &&
+			*atos(buf, sizeof(buf), cp += 4)) {
+		viewfile(buf, &vwr, NULL);	/* load -vf file */
+		sscanview(&vwr, cp);		/* reset tail */
+	}
+	fputs(VIEWSTR, fp);
+	fprintview(&vwr, fp);			/* print full spec. */
+	fputc('\n', fp);
+	return(0);
+}
+
+
+static void
+rvu(				/* run rvu with first view */
+	char	*opts,
+	char	*po
+)
+{
+	char	*vw;
+	char	combuf[PATH_MAX];
 					/* build command */
-	sprintf(combuf, "rview %s%s ", getview(0, NULL), opts);
+	if (touchonly || (vw = getview(0, NULL)) == NULL)
+		return;
+	if (sayview)
+		myprintview(vw, stdout);
+	sprintf(combuf, "rvu %s%s%s -R %s ", vw, po, opts, rifname);
 	if (rvdevice != NULL)
 		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
-	strcat(combuf, vval(OCTREE));
+	if (vdef(EXPOSURE))
+		sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
+	strcat(combuf, oct1name);
 	if (runcom(combuf)) {		/* run it */
-		fprintf(stderr, "%s: error running rview\n", progname);
-		exit(1);
+		fprintf(stderr, "%s: error running rvu\n", progname);
+		quit(1);
 	}
 }
 
 
-rpict(opts)				/* run rpict and pfilt for each view */
-char	*opts;
+static void
+rpict(				/* run rpict and pfilt for each view */
+	char	*opts,
+	char	*po
+)
 {
-	char	combuf[1024];
-	char	rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
+	char	combuf[PATH_MAX];
+	char	rawfile[PATH_MAX], picfile[PATH_MAX];
+	char	zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
+	char	rppopt[128], *pfile = NULL;
 	char	pfopts[128];
 	char	vs[32], *vw;
 	int	vn, mult;
+	FILE	*fp;
+	time_t	rfdt, pfdt;
 					/* get pfilt options */
 	pfiltopts(pfopts);
 					/* get resolution, reporting */
-	mult = vscale(QUALITY)+1;
+	switch (vscale(QUALITY)) {
+	case LOW:
+		mult = 1;
+		break;
+	case MEDIUM:
+		mult = 2;
+		break;
+	case HIGH:
+		mult = 3;
+		break;
+	}
 	{
 		int	xres, yres;
 		double	aspect;
@@ -1020,108 +1253,321 @@ char	*opts;
 		else
 			badvalue(REPORT);
 	}
-					/* check date on ambient file */
-	if (vdef(AMBFILE)) {
-		long	afdate = fdate(vval(AMBFILE));
-		if (afdate >= 0 & octreedate > afdate)
-			rmfile(vval(AMBFILE));
+					/* set up parallel rendering */
+	if ((nprocs > 1) & (!vdef(ZFILE))) {
+		strcpy(rppopt, "-S 1 -PP pfXXXXXX");
+		pfile = rppopt+9;
+		if (mktemp(pfile) == NULL)
+			pfile = NULL;
 	}
-					/* do each view */
-	vn = 0;
+	vn = 0;					/* do each view */
 	while ((vw = getview(vn++, vs)) != NULL) {
+		if (sayview)
+			myprintview(vw, stdout);
 		if (!vs[0])
 			sprintf(vs, "%d", vn);
 		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
+		if (vdef(ZFILE))
+			sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
+		else
+			zopt[0] = '\0';
 						/* check date on picture */
-		if (fdate(picfile) > octreedate)
+		pfdt = fdate(picfile);
+		if (pfdt >= oct1date)
 			continue;
+						/* get raw file name */
+		sprintf(rawfile, "%s_%s.unf",
+			vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs);
+		rfdt = fdate(rawfile);
+		if (touchonly) {		/* update times only */
+			if (rfdt) {
+				if (rfdt < oct1date)
+					touch(rawfile);
+			} else if (pfdt && pfdt < oct1date)
+				touch(picfile);
+			continue;
+		}
+		if (next_process()) {		/* parallel running? */
+			if (pfile != NULL)
+				sleep(20);
+			continue;
+		}
+		/* XXX Remember to call finish_process() */
 						/* build rpict command */
-		sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
-		if (fdate(rawfile) > octreedate)	/* recover */
-			sprintf(combuf, "rpict%s%s -ro %s %s",
-					rep, opts, rawfile, vval(OCTREE));
-		else {
+		if (rfdt >= oct1date) {		/* recover */
+			sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
+				rep, po, opts, zopt, rawfile, oct1name);
+			if (runcom(combuf))	/* run rpict */
+				goto rperror;
+		} else {
 			if (overture) {		/* run overture calculation */
 				sprintf(combuf,
 				"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
 						rep, vw, opts,
-						vval(OCTREE), rawfile);
+						oct1name, overfile);
 				if (runcom(combuf)) {
 					fprintf(stderr,
-			"%s: error in overture for view %s\n\t%s removed\n",
-						progname, vs, rawfile);
-					unlink(rawfile);
-					exit(1);
+					"%s: error in overture for view %s\n",
+						progname, vs);
+					quit(1);
 				}
+#ifndef NULL_DEVICE
+				rmfile(overfile);
+#endif
 			}
-			sprintf(combuf, "rpict%s %s %s%s %s > %s",
-					rep, vw, res, opts,
-					vval(OCTREE), rawfile);
+			sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
+					rep, vw, res, po, opts,
+					zopt, oct1name, rawfile);
+			if (pfile != NULL && inchild()) {
+						/* rpict persistent mode */
+				if (!silent)
+					printf("\t%s\n", combuf);
+				fflush(stdout);
+				sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
+						rep, rppopt, res, po, opts,
+						oct1name, rawfile);
+				fp = popen(combuf, "w");
+				if (fp == NULL)
+					goto rperror;
+				myprintview(vw, fp);
+				if (pclose(fp))
+					goto rperror;
+			} else {		/* rpict normal mode */
+				if (runcom(combuf))
+					goto rperror;
+			}
 		}
-		if (runcom(combuf)) {		/* run rpict */
-			fprintf(stderr, "%s: error rendering view %s\n",
-					progname, vs);
-			exit(1);
-		}
+		if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
 						/* build pfilt command */
-		if (mult > 1)
-			sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
+			if (mult > 1)
+				sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
 					pfopts, mult, mult, rawfile, picfile);
-		else
-			sprintf(combuf, "pfilt%s %s > %s", pfopts,
-					rawfile, picfile);
-		if (runcom(combuf)) {		/* run pfilt */
-			fprintf(stderr,
-			"%s: error filtering view %s\n\t%s removed\n",
-					progname, vs, picfile);
-			unlink(picfile);
-			exit(1);
+			else
+				sprintf(combuf, "pfilt%s %s > %s", pfopts,
+						rawfile, picfile);
+			if (runcom(combuf)) {	/* run pfilt */
+				fprintf(stderr,
+				"%s: error filtering view %s\n\t%s removed\n",
+						progname, vs, picfile);
+				unlink(picfile);
+				quit(1);
+			}
 		}
-						/* remove raw file */
-		rmfile(rawfile);
+						/* remove/rename raw file */
+		if (vdef(RAWFILE)) {
+			sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
+			mvfile(rawfile, combuf);
+		} else
+			rmfile(rawfile);
+		finish_process();		/* exit if child */
 	}
+	wait_process(1);		/* wait for children to finish */
+	if (pfile != NULL) {		/* clean up rpict persistent mode */
+		RT_PID	pid;
+		fp = fopen(pfile, "r");
+		if (fp != NULL) {
+			if (fscanf(fp, "%*s %d", &pid) != 1 ||
+					kill(pid, 1) < 0)
+				unlink(pfile);
+			fclose(fp);
+		}
+	}
+	return;
+rperror:
+	fprintf(stderr, "%s: error rendering view %s\n", progname, vs);
+	quit(1);
 }
 
 
-runcom(cs)			/* run command */
-char	*cs;
+static int
+touch(			/* update a file */
+	char	*fn
+)
 {
+	if (!silent)
+		printf("\ttouch %s\n", fn);
+	if (!nprocs)
+		return(0);
+#ifdef notused
+	if (access(fn, F_OK) == -1)		/* create it */
+		if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
+			return(-1);
+#endif
+	return(setfdate(fn, time((time_t *)NULL)));
+}
+
+
+static int
+runcom(			/* run command */
+	char	*cs
+)
+{
 	if (!silent)		/* echo it */
 		printf("\t%s\n", cs);
-	if (noaction)
+	if (!nprocs)
 		return(0);
-	fflush(stdout);		/* flush output and pass to shell */
+	fflush(NULL);		/* flush output and pass to shell */
 	return(system(cs));
 }
 
 
-rmfile(fn)			/* remove a file */
-char	*fn;
+static int
+rmfile(			/* remove a file */
+	char	*fn
+)
 {
 	if (!silent)
-#ifdef MSDOS
-		printf("\tdel %s\n", fn);
-#else
-		printf("\trm -f %s\n", fn);
-#endif
-	if (noaction)
+		printf("\t%s %s\n", DELCMD, fn);
+	if (!nprocs)
 		return(0);
 	return(unlink(fn));
 }
 
 
-badvalue(vc)			/* report bad variable value and exit */
-int	vc;
+static int
+mvfile(		/* move a file */
+	char	*fold,
+	char	*fnew
+)
 {
+	if (!silent)
+		printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
+	if (!nprocs)
+		return(0);
+	return(rename(fold, fnew));
+}
+
+
+#ifdef RHAS_FORK_EXEC
+static int
+next_process(void)			/* fork the next process (max. nprocs) */
+{
+	RT_PID	child_pid;
+
+	if (nprocs <= 1)
+		return(0);		/* it's us or no one */
+	if (inchild()) {
+		fprintf(stderr, "%s: internal error 1 in next_process()\n",
+				progname);
+		quit(1);
+	}
+	if (children_running >= nprocs)
+		wait_process(0);	/* wait for someone to finish */
+	fflush(NULL);			/* flush output */
+	child_pid = fork();		/* split process */
+	if (child_pid == 0) {		/* we're the child */
+		children_running = -1;
+		return(0);
+	}
+	if (child_pid > 0) {		/* we're the parent */
+		++children_running;
+		return(1);
+	}
+	fprintf(stderr, "%s: warning -- fork() failed\n", progname);
+	return(0);
+}
+
+static void
+wait_process(			/* wait for process(es) to finish */
+	int	all
+)
+{
+	int	ourstatus = 0;
+	RT_PID	pid, status;
+
+	if (all)
+		all = children_running;
+	else if (children_running > 0)
+		all = 1;
+	while (all-- > 0) {
+		pid = wait(&status);
+		if (pid < 0)
+			syserr(progname);
+		status = status>>8 & 0xff;
+		--children_running;
+		if (status != 0) {	/* child's problem is our problem */
+			if ((ourstatus == 0) & (children_running > 0))
+				fprintf(stderr, "%s: waiting for remaining processes\n",
+						progname);
+			ourstatus = status;
+			all = children_running;
+		}
+	}
+	if (ourstatus != 0)
+		quit(ourstatus);	/* bad status from child */
+}
+#else	/* ! RHAS_FORK_EXEC */
+static int
+next_process(void)
+{
+	return(0);			/* cannot start new process */
+}
+static void
+wait_process(all)
+int	all;
+{
+	(void)all;			/* no one to wait for */
+}
+int
+kill(pid, sig) /* win|unix_process.c should also wait and kill */
+RT_PID pid, sig;
+{
+	return 0;
+}
+#endif	/* ! RHAS_FORK_EXEC */
+
+static void
+finish_process(void)			/* exit a child process */
+{
+	if (!inchild())
+		return;			/* in parent -- noop */
+	exit(0);
+}
+
+#ifdef _WIN32
+setenv(vname, value)		/* set an environment variable */
+char	*vname, *value;
+{
+	register char	*evp;
+
+	evp = bmalloc(strlen(vname)+strlen(value)+2);
+	if (evp == NULL)
+		syserr(progname);
+	sprintf(evp, "%s=%s", vname, value);
+	if (putenv(evp) != 0) {
+		fprintf(stderr, "%s: out of environment space\n", progname);
+		quit(1);
+	}
+	if (!silent)
+		printf("set %s\n", evp);
+}
+#endif
+
+
+static void
+badvalue(			/* report bad variable value and exit */
+	int	vc
+)
+{
 	fprintf(stderr, "%s: bad value for variable '%s'\n",
 			progname, vnam(vc));
-	exit(1);
+	quit(1);
 }
 
 
-syserr(s)			/* report a system error and exit */
-char	*s;
+static void
+syserr(			/* report a system error and exit */
+	char	*s
+)
 {
 	perror(s);
-	exit(1);
+	quit(1);
+}
+
+
+void
+quit(ec)			/* exit program */
+int	ec;
+{
+	exit(ec);
 }