--- ray/src/util/ranimate.c	1996/01/23 17:01:33	2.6
+++ ray/src/util/ranimate.c	1996/05/30 17:00:10	2.14
@@ -1,4 +1,4 @@
-/* Copyright (c) 1995 Regents of the University of California */
+/* Copyright (c) 1996 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -15,6 +15,12 @@ static char SCCSid[] = "$SunId$ LBL";
 #include "view.h"
 #include "vars.h"
 #include "netproc.h"
+				/* default remote shell */
+#ifdef _AUX_SOURCE
+#define REMSH		"remsh"
+#else
+#define REMSH		"rsh"
+#endif
 				/* input variables */
 #define HOST		0		/* rendering host machine */
 #define RENDER		1		/* rendering options */
@@ -38,8 +44,9 @@ static char SCCSid[] = "$SunId$ LBL";
 #define DISKSPACE	19		/* how much disk space to use */
 #define RESOLUTION	20		/* desired final resolution */
 #define EXPOSURE	21		/* how to compute exposure */
+#define RSH		22		/* remote shell script or program */
 
-int	NVARS = 22;		/* total number of variables */
+int	NVARS = 23;		/* total number of variables */
 
 VARIABLE	vv[] = {		/* variable-value pairs */
 	{"host",	4,	0,	NULL,	NULL},
@@ -64,6 +71,7 @@ VARIABLE	vv[] = {		/* variable-value pairs */
 	{"DISKSPACE",	3,	0,	NULL,	fltvalue},
 	{"RESOLUTION",	3,	0,	NULL,	onevalue},
 	{"EXPOSURE",	3,	0,	NULL,	onevalue},
+	{"RSH",		3,	0,	NULL,	onevalue},
 };
 
 #define SFNAME	"STATUS"		/* status file name */
@@ -84,11 +92,15 @@ int	nowarn = 0;		/* turn warnings off? */
 int	silent = 0;		/* silent mode? */
 int	noaction = 0;		/* take no action? */
 
+char	*remsh;			/* remote shell program/script */
 char	rendopt[2048] = "";	/* rendering options */
 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 */
@@ -106,7 +118,9 @@ struct pslot	*findpslot();
 VIEW	*getview();
 char	*getexp();
 
+extern time_t	fdate(), time();
 
+
 main(argc, argv)
 int	argc;
 char	*argv[];
@@ -163,8 +177,11 @@ char	*argv[];
 		argv[i] = vval(NEXTANIM);	/* just change input file */
 		if (!silent)
 			printargs(argc, argv, stdout);
-		execvp(progname, argv);		/* pass to next */
-		quit(1);			/* shouldn't return */
+		if ((argv[0] = getpath(progname,getenv("PATH"),X_OK)) == NULL)
+			fprintf(stderr, "%s: command not found\n", progname);
+		else
+			execv(progname, argv);
+		quit(1);
 	}
 	quit(0);
 userr:
@@ -175,13 +192,13 @@ userr:
 
 getastat()			/* check/set animation status */
 {
-	char	buf[256];
+	char	sfname[256];
 	FILE	*fp;
 
-	sprintf(buf, "%s/%s", vval(DIRECTORY), SFNAME);
-	if ((fp = fopen(buf, "r")) == NULL) {
+	sprintf(sfname, "%s/%s", vval(DIRECTORY), SFNAME);
+	if ((fp = fopen(sfname, "r")) == NULL) {
 		if (errno != ENOENT) {
-			perror(buf);
+			perror(sfname);
 			return(-1);
 		}
 		astat.rnext = astat.fnext = astat.tnext = 0;
@@ -201,8 +218,7 @@ getastat()			/* check/set animation status */
 		goto fmterr;
 	fclose(fp);
 	if (astat.pid != 0) {			/* thinks it's still running */
-		gethostname(buf, sizeof(buf));
-		if (strcmp(buf, astat.host)) {
+		if (strcmp(myhostname(), astat.host)) {
 			fprintf(stderr,
 			"%s: process %d may still be running on host %s\n",
 					progname, astat.pid, astat.host);
@@ -220,14 +236,19 @@ getastat()			/* check/set animation status */
 				progname, astat.cfname);
 		return(-1);
 	}
+						/* check control file mods. */
+	if (!nowarn && fdate(cfname) > fdate(sfname))
+		fprintf(stderr,
+			"%s: warning - control file modified since last run\n",
+				progname);
 setours:					/* set our values */
-	gethostname(astat.host, sizeof(astat.host));
+	strcpy(astat.host, myhostname());
 	astat.pid = getpid();
 	strcpy(astat.cfname, cfname);
 	return(0);
 fmterr:
 	fprintf(stderr, "%s: format error in status file \"%s\"\n",
-			progname, buf);
+			progname, sfname);
 	fclose(fp);
 	return(-1);
 }
@@ -279,6 +300,7 @@ checkdir()			/* make sure we have our directory */
 
 setdefaults()			/* set default values */
 {
+	extern char	*atos();
 	char	buf[256];
 
 	if (vdef(ANIMATE)) {
@@ -344,6 +366,17 @@ setdefaults()			/* set default values */
 		vval(DISKSPACE) = "100";
 		vdef(DISKSPACE)++;
 	}
+	if (!vdef(RSH)) {
+		vval(RSH) = REMSH;
+		vdef(RSH)++;
+	}
+				/* locate remote shell program */
+	atos(buf, sizeof(buf), vval(RSH));
+	if ((remsh = getpath(buf, getenv("PATH"), X_OK)) != NULL)
+		remsh = savqstr(remsh);
+	else
+		remsh = vval(RSH);	/* will generate error if used */
+
 				/* append rendering options */
 	if (vdef(RENDER))
 		sprintf(rendopt+strlen(rendopt), " %s", vval(RENDER));
@@ -406,8 +439,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];
@@ -417,7 +450,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++)
@@ -429,8 +462,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 */
@@ -479,7 +512,7 @@ animate()			/* run animation */
 					/* figure # frames per batch */
 	d1 = mult*xres*mult*yres*4;		/* space for orig. picture */
 	if ((i=vint(INTERP)) || atoi(vval(MBLUR)))
-		d1 += mult*xres*mult*yres*4;	/* space for z-buffer */
+		d1 += mult*xres*mult*yres*sizeof(float);	/* Z-buffer */
 	d2 = xres*yres*4;			/* space for final picture */
 	frames_batch = (i+1)*(vflt(DISKSPACE)*1048576.-d1)/(d1+i*d2);
 	if (frames_batch < i+2) {
@@ -487,6 +520,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);
@@ -581,7 +619,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();
 }
@@ -662,7 +700,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);
@@ -740,53 +780,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
 }
 
@@ -802,11 +816,15 @@ int	rvr;
 	static int	iter = 0;
 	char	fnbefore[128], fnafter[128];
 	char	combuf[1024], fname0[128], fname1[128];
-	int	usepinterp, usepfilt;
+	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;
@@ -815,11 +833,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 */
@@ -908,7 +940,7 @@ 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(fname0, vval(BASENAME), frame);
@@ -944,6 +976,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);
@@ -953,7 +987,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++;
 	}
@@ -986,10 +1020,12 @@ int	n;
 	if (n == 0) {				/* signal to close file */
 		if (expfp != NULL) {
 			fclose(expfp);
+			free((char *)exppos);
 			expfp = NULL;
 		}
 		return(NULL);
-	}
+	} else if (n > vint(END))		/* request past end (error?) */
+		return(NULL);
 	if (!vdef(EXPOSURE))			/* no setting (auto) */
 		return(NULL);
 	if (isflt(vval(EXPOSURE)))		/* always the same */
@@ -1027,13 +1063,15 @@ int	n;
 		}
 		curfrm++;
 		cp = fskip(expval);			/* check format */
-		if (cp == NULL || *cp != '\n') {
+		if (cp != NULL)
+			while (isspace(*cp))
+				*cp++ = '\0';
+		if (cp == NULL || *cp) {
 			fprintf(stderr,
 				"%s: exposure format error on line %d\n",
 					vval(EXPOSURE), curfrm);
 			quit(1);
 		}
-		*cp = '\0';
 	}
 	return(expval);				/* return value */
 }