--- ray/src/util/rad.c	1994/03/24 12:28:22	2.39
+++ ray/src/util/rad.c	1995/08/28 10:12:40	2.45
@@ -38,7 +38,7 @@ int	onevalue(), catvalues(), boolvalue(),
 #define ZONE		9		/* simulation zone */
 #define QUALITY		10		/* desired rendering quality */
 #define OCTREE		11		/* octree file name */
-#define PICTURE		12		/* picture 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 */
@@ -49,8 +49,10 @@ int	onevalue(), catvalues(), boolvalue(),
 #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 */
+#define ZFILE		24		/* distance file root name */
 				/* total number of variables */
-#define NVARS		23
+#define NVARS		25
 
 VARIABLE	vv[NVARS] = {		/* variable-value pairs */
 	{"objects",	3,	0,	NULL,	catvalues},
@@ -76,6 +78,8 @@ VARIABLE	vv[NVARS] = {		/* variable-value pairs */
 	{"PENUMBRAS",	3,	0,	NULL,	boolvalue},
 	{"VARIABILITY",	3,	0,	NULL,	qualvalue},
 	{"REPORT",	3,	0,	NULL,	onevalue},
+	{"RAWFILE",	3,	0,	NULL,	onevalue},
+	{"ZFILE",	2,	0,	NULL,	onevalue},
 };
 
 VARIABLE	*matchvar();
@@ -97,7 +101,7 @@ char	*nvalue();
 
 				/* overture calculation file */
 #ifdef NIX
-char	overfile[] = "overture.raw";
+char	overfile[] = "overture.unf";
 #else
 char	overfile[] = "/dev/null";
 #endif
@@ -117,6 +121,7 @@ time_t	oct1date;		/* date of post-mkillum octree (>= m
 int	nowarn = 0;		/* no warnings */
 int	explicate = 0;		/* explicate variables */
 int	silent = 0;		/* do work silently */
+int	touchonly = 0;		/* touch files only */
 int	noaction = 0;		/* don't do anything */
 int	sayview = 0;		/* print view out */
 char	*rvdevice = NULL;	/* rview output device */
@@ -148,6 +153,9 @@ char	*argv[];
 		case 'n':
 			noaction++;
 			break;
+		case 't':
+			touchonly++;
+			break;
 		case 'e':
 			explicate++;
 			break;
@@ -199,7 +207,7 @@ char	*argv[];
 	exit(0);
 userr:
 	fprintf(stderr,
-	"Usage: %s [-s][-n][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
+"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
 			progname);
 	exit(1);
 }
@@ -685,22 +693,28 @@ oconv()				/* run oconv and mkillum if necessary */
 
 	oconvopts(ocopts);		/* get options */
 	if (octreedate < scenedate) {	/* check date on original octree */
-						/* 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,
+		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));
-			exit(1);
+						progname, vval(OCTREE));
+				unlink(vval(OCTREE));
+				exit(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;
@@ -709,53 +723,67 @@ oconv()				/* run oconv and mkillum if necessary */
 		return;
 						/* make octree0 */
 	if (oct0date < scenedate | oct0date < illumdate) {
-						/* build command */
+		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);
+				exit(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);
+			exit(1);
+		}
+						/* make octree1 (frozen) */
 		if (octreedate)
-			sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
-				vval(OCTREE), vval(ILLUM), oct0name);
+			sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
+				vval(OCTREE), illumtmp, oct1name);
 		else if (vdef(MATERIAL))
-			sprintf(combuf, "oconv%s %s %s > %s", ocopts,
-				vval(MATERIAL), vval(ILLUM), oct0name);
+			sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
+				vval(MATERIAL), illumtmp, oct1name);
 		else
-			sprintf(combuf, "oconv%s %s > %s", ocopts,
-				vval(ILLUM), oct0name);
+			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, oct0name);
-			unlink(oct0name);
+					progname, oct1name);
+			unlink(oct1name);
 			exit(1);
 		}
-		oct0date = time((time_t *)NULL);
+		rmfile(illumtmp);
 	}
-	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);
-		exit(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);
-		exit(1);
-	}
 	oct1date = time((time_t *)NULL);
-	rmfile(illumtmp);
+	if (oct1date < oct0date)	/* in case clock is off */
+		oct1date = oct0date;
 }
 
 
@@ -801,7 +829,10 @@ checkambfile()			/* check date on ambient file */
 	if (!(afdate = fdate(vval(AMBFILE))))
 		return;
 	if (oct1date > afdate)
-		rmfile(vval(AMBFILE));
+		if (touchonly)
+			touch(vval(AMBFILE));
+		else
+			rmfile(vval(AMBFILE));
 }
 
 
@@ -1015,7 +1046,7 @@ char	*po;
 	}
 	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 .01");
@@ -1152,7 +1183,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! */
@@ -1207,6 +1238,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 */
@@ -1334,7 +1368,7 @@ char	*opts, *po;
 	char	*vw;
 	char	combuf[512];
 					/* build command */
-	if ((vw = getview(0, NULL)) == NULL)
+	if (touchonly || (vw = getview(0, NULL)) == NULL)
 		return;
 	if (sayview)
 		printview(vw);
@@ -1355,10 +1389,12 @@ rpict(opts, po)				/* run rpict and pfilt for each vie
 char	*opts, *po;
 {
 	char	combuf[1024];
-	char	rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
+	char	rawfile[MAXPATH], picfile[MAXPATH];
+	char	zopt[MAXPATH+4], rep[MAXPATH+16], res[32];
 	char	pfopts[128];
 	char	vs[32], *vw;
 	int	vn, mult;
+	time_t	rfdt, pfdt;
 					/* get pfilt options */
 	pfiltopts(pfopts);
 					/* get resolution, reporting */
@@ -1407,14 +1443,30 @@ char	*opts, *po;
 		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) >= oct1date)
+		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;
+		}
 						/* build rpict command */
-		sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
-		if (fdate(rawfile) >= oct1date)		/* recover */
-			sprintf(combuf, "rpict%s%s%s -ro %s %s",
-					rep, po, opts, rawfile, oct1name);
+		if (rfdt >= oct1date)		/* recover */
+			sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
+				rep, po, opts, zopt, rawfile, oct1name);
 		else {
 			if (overture) {		/* run overture calculation */
 				sprintf(combuf,
@@ -1431,35 +1483,57 @@ char	*opts, *po;
 				rmfile(overfile);
 #endif
 			}
-			sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
-					rep, vw, res, po, opts,
-				oct1name, rawfile);
+			sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
+					rep, vw, res, po, opts, zopt,
+					oct1name, rawfile);
 		}
 		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);
+				exit(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);
 	}
 }
 
 
+touch(fn)			/* update a file */
+char	*fn;
+{
+	if (!silent)
+		printf("\ttouch %s\n", fn);
+	if (noaction)
+		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)));
+}
+
+
 runcom(cs)			/* run command */
 char	*cs;
 {
@@ -1484,6 +1558,21 @@ char	*fn;
 	if (noaction)
 		return(0);
 	return(unlink(fn));
+}
+
+
+mvfile(fold, fnew)		/* move a file */
+char	*fold, *fnew;
+{
+	if (!silent)
+#ifdef MSDOS
+		printf("\trename %s %s\n", fold, fnew);
+#else
+		printf("\tmv %s %s\n", fold, fnew);
+#endif
+	if (noaction)
+		return(0);
+	return(rename(fold, fnew));
 }