--- ray/src/util/ranimate.c	1996/01/22 17:19:37	2.4
+++ ray/src/util/ranimate.c	1996/01/24 14:31:36	2.8
@@ -57,8 +57,8 @@ VARIABLE	vv[] = {		/* variable-value pairs */
 	{"ANIMATE",	2,	0,	NULL,	onevalue},
 	{"TRANSFER",	2,	0,	NULL,	onevalue},
 	{"ARCHIVE",	2,	0,	NULL,	onevalue},
-	{"INTERP",	3,	0,	NULL,	intvalue},
-	{"OVERSAMP",	2,	0,	NULL,	fltvalue},
+	{"INTERPOLATE",	3,	0,	NULL,	intvalue},
+	{"OVERSAMPLE",	2,	0,	NULL,	fltvalue},
 	{"MBLUR",	2,	0,	NULL,	onevalue},
 	{"RTRACE",	2,	0,	NULL,	boolvalue},
 	{"DISKSPACE",	3,	0,	NULL,	fltvalue},
@@ -89,6 +89,9 @@ char	rresopt[32];		/* rendering resolution options */
 char	fresopt[32];		/* filter resolution options */
 int	pfiltalways;		/* always use pfilt? */
 
+char	arcargs[10240];		/* files to archive */
+char	*arcfirst, *arcnext;	/* pointers to first and next argument */
+
 struct pslot {
 	int	pid;			/* process ID (0 if empty) */
 	int	fout;			/* output frame number */
@@ -302,10 +305,15 @@ setdefaults()			/* set default values */
 		vdef(START)++;
 	}
 	if (!vdef(END)) {
-		sprintf(buf, "%d", countviews());
+		sprintf(buf, "%d", countviews()+vint(START)-1);
 		vval(END) = savqstr(buf);
 		vdef(END)++;
 	}
+	if (vint(END) < vint(START)) {
+		fprintf(stderr, "%s: ending frame less than starting frame\n",
+				progname);
+		quit(1);
+	}
 	if (!vdef(BASENAME)) {
 		sprintf(buf, "%s/frame%%03d", vval(DIRECTORY));
 		vval(BASENAME) = savqstr(buf);
@@ -401,8 +409,8 @@ sethosts()			/* set up process servers */
 }
 
 
-getradfile(rfname)		/* run rad and get needed variables */
-char	*rfname;
+getradfile(rfargs)		/* run rad and get needed variables */
+char	*rfargs;
 {
 	static short	mvar[] = {OCTREE,PFILT,RESOLUTION,EXPOSURE,-1};
 	char	combuf[256];
@@ -412,7 +420,7 @@ char	*rfname;
 	sprintf(rendopt, " @%s/render.opt", vval(DIRECTORY));
 	sprintf(combuf,
 	"rad -v 0 -s -e -w %s OPTFILE=%s | egrep '^[ \t]*(NOMATCH",
-			rfname, rendopt+2);
+			rfargs, rendopt+2);
 	cp = combuf;
 	while (*cp) cp++;		/* match unset variables */
 	for (i = 0; mvar[i] >= 0; i++)
@@ -424,8 +432,8 @@ char	*rfname;
 	sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
 	cp += 11;			/* point to file name */
 	if (system(combuf)) {
-		fprintf(stderr, "%s: bad rad input file \"%s\"\n",
-				progname, rfname);
+		fprintf(stderr, "%s: error executing rad command:\n\t%s\n",
+				progname, combuf);
 		quit(1);
 	}
 	loadvars(cp);			/* load variables and remove file */
@@ -482,6 +490,11 @@ animate()			/* run animation */
 				progname);
 		quit(1);
 	}
+					/* initialize archive argument list */
+	i = 16;
+	if (vdef(ARCHIVE) && strlen(vval(ARCHIVE)) > i)
+		i = strlen(vval(ARCHIVE));
+	arcnext = arcfirst = arcargs + i;
 					/* initialize status file */
 	if (astat.rnext == 0)
 		astat.rnext = astat.fnext = astat.tnext = vint(START);
@@ -576,7 +589,7 @@ filterframes()				/* catch up with filtering */
 		dofilt(i, vp, getexp(i), 0);		/* filter frame */
 	}
 	bwait(0);			/* wait for filter processes */
-	archive(astat.fnext, i-1);	/* archive originals */
+	archive();			/* archive originals */
 	astat.fnext = i;		/* update status */
 	putastat();
 }
@@ -657,7 +670,9 @@ char	*vfn;
 	inspoint = combuf + strlen(combuf);
 	sprintf(inspoint, " %s < %s", vval(OCTREE), vfn);
 					/* run in parallel */
-	if (pruncom(combuf, inspoint, (last-first+1)/(vint(INTERP)+1))) {
+	i = (last-first+1)/(vint(INTERP)+1);
+	if (i < 1) i = 1;
+	if (pruncom(combuf, inspoint, i)) {
 		fprintf(stderr, "%s: error rendering frames %d through %d\n",
 				progname, first, last);
 		quit(1);
@@ -735,53 +750,27 @@ int	frame;
 }
 
 
-archive(first, last)			/* archive and remove renderings */
-int	first, last;
+archive()			/* archive and remove renderings */
 {
 #define RMCOML	(sizeof(rmcom)-1)
 	static char	rmcom[] = "rm -f";
-	int	offset = RMCOML;
-	char	combuf[10240];
-	struct stat	stb;
-	register char	*cp;
 	register int	i;
 
-	if (noaction)
-		return;
-	if (vdef(ARCHIVE) && strlen(vval(ARCHIVE)) > offset)
-		offset = strlen(vval(ARCHIVE));
-	cp = combuf + offset;
-	*cp++ = ' ';				/* make argument list */
-	for (i = first; i <= last; i++) {
-		sprintf(cp, vval(BASENAME), i);
-		strcat(cp, ".unf");
-		if (stat(cp, &stb) == 0 && stb.st_size > 0) {	/* non-zero? */
-			while (*cp) cp++;
-			*cp++ = ' ';
-			sprintf(cp, vval(BASENAME), i);
-			strcat(cp, ".zbf");
-			if (access(cp, F_OK) == 0) {		/* exists? */
-				while (*cp) cp++;
-				*cp++ = ' ';
-			}
-		}
-	}
-	*--cp = '\0';
-	if (cp <= combuf + offset)		/* no files? */
-		return;
+	if (arcnext == arcfirst)
+		return;				/* nothing to do */
 	if (vdef(ARCHIVE)) {			/* run archive command */
 		i = strlen(vval(ARCHIVE));
-		strncpy(combuf+offset-i, vval(ARCHIVE), i);
-		if (runcom(combuf+offset-i)) {
-			fprintf(stderr,
-		"%s: error running archive command on frames %d through %d\n",
-					progname, first, last);
+		strncpy(arcfirst-i, vval(ARCHIVE), i);
+		if (runcom(arcfirst-i)) {
+			fprintf(stderr, "%s: error running archive command\n",
+					progname);
 			quit(1);
 		}
 	}
 						/* run remove command */
-	strncpy(combuf+offset-RMCOML, rmcom, RMCOML);
-	runcom(combuf+offset-RMCOML);
+	strncpy(arcfirst-RMCOML, rmcom, RMCOML);
+	runcom(arcfirst-RMCOML);
+	arcnext = arcfirst;			/* reset argument list */
 #undef RMCOML
 }
 
@@ -794,13 +783,18 @@ char	*ep;
 int	rvr;
 {
 	extern int	frecover();
+	static int	iter = 0;
 	char	fnbefore[128], fnafter[128];
-	char	combuf[1024], fname[128];
-	int	usepinterp, usepfilt;
+	char	combuf[1024], fname0[128], fname1[128];
+	int	usepinterp, usepfilt, nora_rgbe;
 	int	frseq[2];
 						/* check what is needed */
 	usepinterp = atoi(vval(MBLUR));
 	usepfilt = pfiltalways | ep==NULL;
+	if (ep != NULL && !strcmp(ep, "1"))
+		ep = "+0";
+	nora_rgbe = strcmp(vval(OVERSAMP),"1") || ep==NULL ||
+			*ep != '+' || *ep != '-' || !isint(ep);
 						/* compute rendered views */
 	frseq[0] = frame - ((frame-1) % (vint(INTERP)+1));
 	frseq[1] = frseq[0] + vint(INTERP) + 1;
@@ -809,11 +803,25 @@ int	rvr;
 	if (frseq[1] == frame) {			/* pfilt only */
 		frseq[0] = frseq[1];
 		usepinterp = 0;			/* update what's needed */
-		usepfilt |= vflt(OVERSAMP)>1.01 || strcmp(ep,"1");
-	} else if (frseq[0] == frame) {		/* no interpolation */
-						/* update what's needed */
-		if (!usepinterp)
-			usepfilt |= vflt(OVERSAMP)>1.01 || strcmp(ep,"1");
+		usepfilt |= nora_rgbe;
+	} else if (frseq[0] == frame) {		/* no interpolation needed */
+		if (!rvr && frame > 1+vint(INTERP)) {	/* archive previous */
+			*arcnext++ = ' ';
+			sprintf(arcnext, vval(BASENAME), frame-vint(INTERP)-1);
+			while (*arcnext) arcnext++;
+			strcpy(arcnext, ".unf");
+			arcnext += 4;
+			if (usepinterp || vint(INTERP)) {	/* and z-buf */
+				*arcnext++ = ' ';
+				sprintf(arcnext, vval(BASENAME),
+						frame-vint(INTERP)-1);
+				while (*arcnext) arcnext++;
+				strcpy(arcnext, ".zbf");
+				arcnext += 4;
+			}
+		}
+		if (!usepinterp)		/* update what's needed */
+			usepfilt |= nora_rgbe;
 	} else					/* interpolation needed */
 		usepinterp++;
 	if (frseq[1] >= astat.rnext)		/* next batch unavailable */
@@ -828,9 +836,10 @@ int	rvr;
 			return(1);
 		if (atoi(vval(MBLUR))) {
 			FILE	*fp;		/* motion blurring */
-			sprintf(fname, "%s/vw0", vval(DIRECTORY));
-			if ((fp = fopen(fname, "w")) == NULL) {
-				perror(fname); quit(1);
+			sprintf(fname0, "%s/vw0%c", vval(DIRECTORY),
+					'a'+(iter%26));
+			if ((fp = fopen(fname0, "w")) == NULL) {
+				perror(fname0); quit(1);
 			}
 			fputs(VIEWSTR, fp);
 			fprintview(vp, fp);
@@ -841,19 +850,20 @@ int	rvr;
 						progname, frame+1);
 				quit(1);
 			}
-			sprintf(fname, "%s/vw1", vval(DIRECTORY));
-			if ((fp = fopen(fname, "w")) == NULL) {
-				perror(fname); quit(1);
+			sprintf(fname1, "%s/vw1%c", vval(DIRECTORY),
+					'a'+(iter%26));
+			if ((fp = fopen(fname1, "w")) == NULL) {
+				perror(fname1); quit(1);
 			}
 			fputs(VIEWSTR, fp);
 			fprintview(vp, fp);
 			putc('\n', fp); fclose(fp);
 			sprintf(combuf,
-	"(pmblur %s %d %s/vw0 %s/vw1; rm -f %s/vw0 %s/vw1) | pinterp -B",
+			"(pmblur %s %d %s %s; rm -f %s %s) | pinterp -B",
 			*sskip(vval(MBLUR)) ? sskip2(vval(MBLUR),1) : "1",
-					atoi(vval(MBLUR)), vval(DIRECTORY),
-					vval(DIRECTORY), vval(DIRECTORY),
-					vval(DIRECTORY), vval(DIRECTORY));
+					atoi(vval(MBLUR)),
+					fname0, fname1, fname0, fname1);
+			iter++;
 		} else				/* no blurring */
 			strcpy(combuf, "pinterp");
 		strcat(combuf, viewopt(vp));
@@ -900,11 +910,11 @@ int	rvr;
 	} else {				/* else just check it */
 		if (rvr == 2)
 			return(1);
-		sprintf(combuf, "ra_rgbe -r %s.unf", fnbefore);
+		sprintf(combuf, "ra_rgbe -e %s -r %s.unf", ep, fnbefore);
 	}
 						/* output file name */
-	sprintf(fname, vval(BASENAME), frame);
-	sprintf(combuf+strlen(combuf), " > %s.pic", fname);
+	sprintf(fname0, vval(BASENAME), frame);
+	sprintf(combuf+strlen(combuf), " > %s.pic", fname0);
 	if (rvr)				/* in recovery */
 		return(runcom(combuf));
 	bruncom(combuf, frame, frecover);	/* else run in background */
@@ -936,6 +946,8 @@ int	n;
 			quit(1);
 		}
 	} else if (n < viewnum) {	/* rewind file */
+		if (viewnum == 1 && feof(viewfp))
+			return(&curview);		/* just one view */
 		if (fseek(viewfp, 0L, 0) == EOF) {
 			perror(vval(VIEWFILE));
 			quit(1);
@@ -945,7 +957,7 @@ int	n;
 	}
 	while (n > viewnum) {		/* scan to desired view */
 		if (fgets(linebuf, sizeof(linebuf), viewfp) == NULL)
-			return(NULL);
+			return(viewnum==1 ? &curview : NULL);
 		if (isview(linebuf) && sscanview(&curview, linebuf) > 0)
 			viewnum++;
 	}
@@ -1097,18 +1109,19 @@ int	(*rf)();
 	int	pid;
 	register struct pslot	*psl;
 
-	if (!silent)
-		printf("\t%s &\n", com);	/* echo command */
-	if (noaction)
+	if (noaction) {
+		if (!silent)
+			printf("\t%s\n", com);	/* echo command */
 		return(0);
-	fflush(stdout);
+	}
 					/* else start it when we can */
 	while ((pid = startjob(NULL, savestr(com), donecom)) == -1)
 		bwait(1);
-	if (!silent) {
+	if (!silent) {				/* echo command */
 		PSERVER	*ps;
 		int	psn = pid;
 		ps = findjob(&psn);
+		printf("\t%s\n", com);
 		printf("\tProcess started on %s\n", phostname(ps));
 		fflush(stdout);
 	}
@@ -1158,7 +1171,7 @@ int	maxcopies;
 	register PSERVER	*ps;
 
 	if (!silent)
-		printf("\t%s &\n", com);	/* echo command */
+		printf("\t%s\n", com);	/* echo command */
 	if (noaction)
 		return(0);
 	fflush(stdout);