[ViewVC] Diff of: radiance/ray/src/util/ranimate.c

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.5 by greg, Tue Jan 23 16:14:28 1996 UTC vs.
Revision 2.31 by greg, Tue Feb 25 02:47:24 2003 UTC

#	Line 1 \| Line 1
1	–	/* Copyright (c) 1995 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		* Radiance animation control program
6	+	*
7	+	* The main difference between this program and ranimove is that
8	+	* we have many optimizations here for camera motion in static
9	+	* environments, calling rpict and pinterp on multiple processors,
10	+	* where ranimove puts its emphasis on object motion, and does
11	+	* not use any external programs for image generation.
12	+	*
13	+	* See the ranimate(1) man page for further details.
14		*/
15
16	+	#include "copyright.h"
17	+
18		#include "standard.h"
19		#include <ctype.h>
13	–	#include <sys/types.h>
20		#include <sys/stat.h>
21		#include "view.h"
22		#include "vars.h"
23		#include "netproc.h"
24	<	/* input variables */
25	<	#define HOST 0 /* rendering host machine */
26	<	#define RENDER 1 /* rendering options */
27	<	#define PFILT 2 /* pfilt options */
28	<	#define PINTERP 3 /* pinterp options */
29	<	#define OCTREE 4 /* octree file name */
30	<	#define DIRECTORY 5 /* working (sub)directory */
31	<	#define BASENAME 6 /* output image base name */
32	<	#define VIEWFILE 7 /* animation frame views */
33	<	#define START 8 /* starting frame number */
34	<	#define END 9 /* ending frame number */
35	<	#define RIF 10 /* rad input file */
36	<	#define NEXTANIM 11 /* next animation file */
37	<	#define ANIMATE 12 /* animation command */
38	<	#define TRANSFER 13 /* frame transfer command */
39	<	#define ARCHIVE 14 /* archiving command */
40	<	#define INTERP 15 /* # frames to interpolate */
41	<	#define OVERSAMP 16 /* # times to oversample image */
42	<	#define MBLUR 17 /* samples for motion blur */
43	<	#define RTRACE 18 /* use rtrace with pinterp? */
44	<	#define DISKSPACE 19 /* how much disk space to use */
45	<	#define RESOLUTION 20 /* desired final resolution */
46	<	#define EXPOSURE 21 /* how to compute exposure */
24	>	/* default blur samples */
25	>	#ifndef DEF_NBLUR
26	>	#define DEF_NBLUR 5
27	>	#endif
28	>	/* default remote shell */
29	>	#ifdef _AUX_SOURCE
30	>	#define REMSH "remsh"
31	>	#else
32	>	#define REMSH "rsh"
33	>	#endif
34	>	/* input variables (alphabetical by name) */
35	>	#define ANIMATE 0 /* animation command */
36	>	#define ARCHIVE 1 /* archiving command */
37	>	#define BASENAME 2 /* output image base name */
38	>	#define DIRECTORY 3 /* working (sub)directory */
39	>	#define DISKSPACE 4 /* how much disk space to use */
40	>	#define END 5 /* ending frame number */
41	>	#define EXPOSURE 6 /* how to compute exposure */
42	>	#define HOST 7 /* rendering host machine */
43	>	#define INTERP 8 /* # frames to interpolate */
44	>	#define MBLUR 9 /* motion blur parameters */
45	>	#define NEXTANIM 10 /* next animation file */
46	>	#define OCTREE 11 /* octree file name */
47	>	#define OVERSAMP 12 /* # times to oversample image */
48	>	#define PFILT 13 /* pfilt options */
49	>	#define PINTERP 14 /* pinterp options */
50	>	#define RENDER 15 /* rendering options */
51	>	#define RESOLUTION 16 /* desired final resolution */
52	>	#define RIF 17 /* rad input file */
53	>	#define RSH 18 /* remote shell script or program */
54	>	#define RTRACE 19 /* use rtrace with pinterp? */
55	>	#define START 20 /* starting frame number */
56	>	#define TRANSFER 21 /* frame transfer command */
57	>	#define VIEWFILE 22 /* animation frame views */
58
59	<	int NVARS = 22; /* total number of variables */
59	>	int NVARS = 23; /* total number of variables */
60
61		VARIABLE vv[] = { /* variable-value pairs */
45	–	{"host", 4, 0, NULL, NULL},
46	–	{"render", 3, 0, NULL, catvalues},
47	–	{"pfilt", 2, 0, NULL, catvalues},
48	–	{"pinterp", 2, 0, NULL, catvalues},
49	–	{"OCTREE", 3, 0, NULL, onevalue},
50	–	{"DIRECTORY", 3, 0, NULL, onevalue},
51	–	{"BASENAME", 3, 0, NULL, onevalue},
52	–	{"VIEWFILE", 2, 0, NULL, onevalue},
53	–	{"START", 2, 0, NULL, intvalue},
54	–	{"END", 2, 0, NULL, intvalue},
55	–	{"RIF", 3, 0, NULL, onevalue},
56	–	{"NEXTANIM", 3, 0, NULL, onevalue},
62		{"ANIMATE", 2, 0, NULL, onevalue},
58	–	{"TRANSFER", 2, 0, NULL, onevalue},
63		{"ARCHIVE", 2, 0, NULL, onevalue},
64	+	{"BASENAME", 3, 0, NULL, onevalue},
65	+	{"DIRECTORY", 3, 0, NULL, onevalue},
66	+	{"DISKSPACE", 3, 0, NULL, fltvalue},
67	+	{"END", 2, 0, NULL, intvalue},
68	+	{"EXPOSURE", 3, 0, NULL, onevalue},
69	+	{"host", 4, 0, NULL, NULL},
70		{"INTERPOLATE", 3, 0, NULL, intvalue},
61	–	{"OVERSAMPLE", 2, 0, NULL, fltvalue},
71		{"MBLUR", 2, 0, NULL, onevalue},
72	<	{"RTRACE", 2, 0, NULL, boolvalue},
73	<	{"DISKSPACE", 3, 0, NULL, fltvalue},
72	>	{"NEXTANIM", 3, 0, NULL, onevalue},
73	>	{"OCTREE", 3, 0, NULL, onevalue},
74	>	{"OVERSAMPLE", 2, 0, NULL, fltvalue},
75	>	{"pfilt", 2, 0, NULL, catvalues},
76	>	{"pinterp", 2, 0, NULL, catvalues},
77	>	{"render", 3, 0, NULL, catvalues},
78		{"RESOLUTION", 3, 0, NULL, onevalue},
79	<	{"EXPOSURE", 3, 0, NULL, onevalue},
79	>	{"RIF", 3, 0, NULL, onevalue},
80	>	{"RSH", 3, 0, NULL, onevalue},
81	>	{"RTRACE", 2, 0, NULL, boolvalue},
82	>	{"START", 2, 0, NULL, intvalue},
83	>	{"TRANSFER", 2, 0, NULL, onevalue},
84	>	{"VIEWFILE", 2, 0, NULL, onevalue},
85		};
86
87		#define SFNAME "STATUS" /* status file name */
#	Line 84 \| Line 102 \| *int nowarn = 0; / turn warnings off? /*
102		int silent = 0; /* silent mode? */
103		int noaction = 0; /* take no action? */
104
105	<	char rendopt[2048] = ""; /* rendering options */
105	>	char remsh; / remote shell program/script */
106	>	char rendopt[2048]; /* rendering options */
107		char rresopt[32]; /* rendering resolution options */
108		char fresopt[32]; /* filter resolution options */
109		int pfiltalways; /* always use pfilt? */
110
111	+	char arcargs[10240]; /* files to archive */
112	+	char arcfirst, arcnext; /* pointers to first and next argument */
113	+
114		struct pslot {
115		int pid; /* process ID (0 if empty) */
116		int fout; /* output frame number */
#	Line 96 \| Line 118 \| struct pslot {
118		} pslot; / process slots */
119		int npslots; /* number of process slots */
120
99	–	int lastpid; /* ID of last completed background process */
100	–	PSERVER lastpserver; / last process server used */
101	–
121		#define phostname(ps) ((ps)->hostname[0] ? (ps)->hostname : astat.host)
122
123		struct pslot *findpslot();
124
125	+	PSERVER lastpserver; / last process server with error */
126	+
127		VIEW *getview();
128	<	char *getexp();
128	>	char getexp(), dirfile();
129	>	int getblur();
130
131	+	extern time_t time();
132
133	+
134		main(argc, argv)
135		int argc;
136		char *argv[];
#	Line 137 \| Line 161 \| *char argv[];**
161		cfname = argv[i];
162		/* load variables */
163		loadvars(cfname);
164	+	/* check variables */
165	+	checkvalues();
166		/* did we get DIRECTORY? */
167		checkdir();
168		/* check status */
#	Line 163 \| Line 189 \| *char argv[];**
189		argv[i] = vval(NEXTANIM); /* just change input file */
190		if (!silent)
191		printargs(argc, argv, stdout);
192	<	execvp(progname, argv); /* pass to next */
193	<	quit(1); /* shouldn't return */
192	>	if ((argv[0] = getpath(progname,getenv("PATH"),X_OK)) == NULL)
193	>	fprintf(stderr, "%s: command not found\n", progname);
194	>	else
195	>	execv(progname, argv);
196	>	quit(1);
197		}
198		quit(0);
199		userr:
#	Line 175 \| Line 204 \| userr:
204
205		getastat() /* check/set animation status */
206		{
207	<	char buf[256];
207	>	char sfname[256];
208		FILE *fp;
209
210	<	sprintf(buf, "%s/%s", vval(DIRECTORY), SFNAME);
211	<	if ((fp = fopen(buf, "r")) == NULL) {
210	>	sprintf(sfname, "%s/%s", vval(DIRECTORY), SFNAME);
211	>	if ((fp = fopen(sfname, "r")) == NULL) {
212		if (errno != ENOENT) {
213	<	perror(buf);
213	>	perror(sfname);
214		return(-1);
215		}
216		astat.rnext = astat.fnext = astat.tnext = 0;
#	Line 201 \| Line 230 \| *getastat() / check/set animation status /*
230		goto fmterr;
231		fclose(fp);
232		if (astat.pid != 0) { /* thinks it's still running */
233	<	gethostname(buf, sizeof(buf));
205	<	if (strcmp(buf, astat.host)) {
233	>	if (strcmp(myhostname(), astat.host)) {
234		fprintf(stderr,
235		"%s: process %d may still be running on host %s\n",
236		progname, astat.pid, astat.host);
#	Line 215 \| Line 243 \| *getastat() / check/set animation status /*
243		}
244		/* assume it is dead */
245		}
246	<	if (strcmp(cfname, astat.cfname) && astat.tnext != 0) { /* other's */
246	>	if (strcmp(cfname, astat.cfname) && astat.pid != 0) { /* other's */
247		fprintf(stderr, "%s: unfinished job \"%s\"\n",
248		progname, astat.cfname);
249		return(-1);
250		}
251	+	/* check control file mods. */
252	+	if (!nowarn && fdate(cfname) > fdate(sfname))
253	+	fprintf(stderr,
254	+	"%s: warning - control file modified since last run\n",
255	+	progname);
256		setours: /* set our values */
257	<	gethostname(astat.host, sizeof(astat.host));
257	>	strcpy(astat.host, myhostname());
258		astat.pid = getpid();
259		strcpy(astat.cfname, cfname);
260		return(0);
261		fmterr:
262		fprintf(stderr, "%s: format error in status file \"%s\"\n",
263	<	progname, buf);
263	>	progname, sfname);
264		fclose(fp);
265		return(-1);
266		}
#	Line 279 \| Line 312 \| *checkdir() / make sure we have our directory /*
312
313		setdefaults() /* set default values */
314		{
315	+	extern char *atos();
316	+	int decades;
317		char buf[256];
318
319		if (vdef(ANIMATE)) {
#	Line 312 \| Line 347 \| *setdefaults() / set default values /*
347		quit(1);
348		}
349		if (!vdef(BASENAME)) {
350	<	sprintf(buf, "%s/frame%%03d", vval(DIRECTORY));
350	>	decades = (int)log10((double)vint(END)) + 1;
351	>	if (decades < 3) decades = 3;
352	>	sprintf(buf, "%s/frame%%0%dd", vval(DIRECTORY), decades);
353		vval(BASENAME) = savqstr(buf);
354		vdef(BASENAME)++;
355		}
#	Line 344 \| Line 381 \| *setdefaults() / set default values /*
381		vval(DISKSPACE) = "100";
382		vdef(DISKSPACE)++;
383		}
384	+	if (!vdef(RSH)) {
385	+	vval(RSH) = REMSH;
386	+	vdef(RSH)++;
387	+	}
388	+	/* locate remote shell program */
389	+	atos(buf, sizeof(buf), vval(RSH));
390	+	if ((remsh = getpath(buf, getenv("PATH"), X_OK)) != NULL)
391	+	remsh = savqstr(remsh);
392	+	else
393	+	remsh = vval(RSH); /* will generate error if used */
394	+
395		/* append rendering options */
396		if (vdef(RENDER))
397		sprintf(rendopt+strlen(rendopt), " %s", vval(RENDER));
#	Line 406 \| Line 454 \| *sethosts() / set up process servers /*
454		}
455
456
457	<	getradfile(rfname) /* run rad and get needed variables */
458	<	char *rfname;
457	>	getradfile(rfargs) /* run rad and get needed variables */
458	>	char *rfargs;
459		{
460		static short mvar[] = {OCTREE,PFILT,RESOLUTION,EXPOSURE,-1};
461		char combuf[256];
462		register int i;
463		register char *cp;
464	+	char *pippt;
465		/* create rad command */
466		sprintf(rendopt, " @%s/render.opt", vval(DIRECTORY));
467		sprintf(combuf,
468		"rad -v 0 -s -e -w %s OPTFILE=%s \| egrep '^[ \t]*(NOMATCH",
469	<	rfname, rendopt+2);
469	>	rfargs, rendopt+2);
470		cp = combuf;
471	<	while (cp) cp++; / match unset variables */
471	>	while (*cp) {
472	>	if (*cp == '\|') pippt = cp;
473	>	cp++;
474	>	} /* match unset variables */
475		for (i = 0; mvar[i] >= 0; i++)
476		if (!vdef(mvar[i])) {
477		*cp++ = '\|';
478		strcpy(cp, vnam(mvar[i]));
479		while (*cp) cp++;
480	+	pippt = NULL;
481		}
482	<	sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
483	<	cp += 11; /* point to file name */
484	<	if (system(combuf)) {
485	<	fprintf(stderr, "%s: bad rad input file \"%s\"\n",
486	<	progname, rfname);
434	<	quit(1);
482	>	if (pippt != NULL)
483	>	strcpy(pippt, "> /dev/null"); /* nothing to match */
484	>	else {
485	>	sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
486	>	cp += 11; /* point to file name */
487		}
488	<	loadvars(cp); /* load variables and remove file */
489	<	unlink(cp);
488	>	system(combuf); /* ignore exit code */
489	>	if (pippt == NULL) { /* load variables and remove file */
490	>	loadvars(cp);
491	>	unlink(cp);
492	>	}
493		}
494
495
#	Line 449 \| Line 504 \| *animate() / run animation /*
504		i = sscanf(vval(RESOLUTION), "%d %d %f", &xres, &yres, &pa);
505		mult = vflt(OVERSAMP);
506		if (i == 3) {
507	<	sprintf(rresopt, "-x %d -y %d -pa %f", (int)(mult*xres),
507	>	sprintf(rresopt, "-x %d -y %d -pa %.3f", (int)(mult*xres),
508		(int)(mult*yres), pa);
509	<	sprintf(fresopt, "-x %d -y %d -pa %f", xres, yres, pa);
509	>	sprintf(fresopt, "-x %d -y %d -pa %.3f", xres, yres, pa);
510		} else if (i) {
511		if (i == 1) yres = xres;
512		sprintf(rresopt, "-x %d -y %d", (int)(mult*xres),
#	Line 468 \| Line 523 \| *animate() / run animation /*
523		progname, vnam(INTERP));
524		vval(INTERP) = "0";
525		}
526	<	if (atoi(vval(MBLUR))) { /* can't handle this yet */
526	>	if (strcmp(vval(MBLUR),"0")) { /* can't handle this */
527		if (!nowarn)
528		fprintf(stderr,
529		"%s: resetting %s=0 for animation\n",
#	Line 478 \| Line 533 \| *animate() / run animation /*
533		}
534		/* figure # frames per batch */
535		d1 = multxresmultyres4; /* space for orig. picture */
536	<	if ((i=vint(INTERP)) \|\| atoi(vval(MBLUR)))
537	<	d1 += multxresmultyres4; /* space for z-buffer */
536	>	if ((i=vint(INTERP)) \|\| getblur(NULL) > 1)
537	>	d1 += multxresmultyressizeof(float); /* Z-buffer */
538		d2 = xresyres4; /* space for final picture */
539		frames_batch = (i+1)(vflt(DISKSPACE)1048576.-d1)/(d1+i*d2);
540		if (frames_batch < i+2) {
#	Line 487 \| Line 542 \| *animate() / run animation /*
542		progname);
543		quit(1);
544		}
545	+	/* initialize archive argument list */
546	+	i = vdef(ARCHIVE) ? strlen(vval(ARCHIVE))+132 : 132;
547	+	arcnext = arcfirst = arcargs + i;
548		/* initialize status file */
549		if (astat.rnext == 0)
550		astat.rnext = astat.fnext = astat.tnext = vint(START);
#	Line 581 \| Line 639 \| *filterframes() / catch up with filtering /*
639		dofilt(i, vp, getexp(i), 0); /* filter frame */
640		}
641		bwait(0); /* wait for filter processes */
642	<	archive(astat.fnext, i-1); /* archive originals */
642	>	archive(); /* archive originals */
643		astat.fnext = i; /* update status */
644		putastat();
645		}
#	Line 589 \| Line 647 \| *filterframes() / catch up with filtering /*
647
648		transferframes() /* catch up with picture transfers */
649		{
650	<	char combuf[10240];
650	>	char combuf[10240], *fbase;
651		register char *cp;
652		register int i;
653
#	Line 600 \| Line 658 \| *transferframes() / catch up with picture transfers**
658		putastat(); /* update status */
659		return;
660		}
661	<	strcpy(combuf, vval(TRANSFER)); /* start transfer command */
662	<	cp = combuf + strlen(combuf);
661	>	strcpy(combuf, "cd "); /* start transfer command */
662	>	fbase = dirfile(cp = combuf+3, vval(BASENAME));
663	>	if (*cp) {
664	>	while (*++cp) ;
665	>	cp++ = ';'; cp++ = ' ';
666	>	} else
667	>	cp = combuf;
668	>	strcpy(cp, vval(TRANSFER));
669	>	while (*cp) cp++;
670		/* make argument list */
671		for (i = astat.tnext; i < astat.fnext; i++) {
672		*cp++ = ' ';
673	<	sprintf(cp, vval(BASENAME), i);
673	>	sprintf(cp, fbase, i);
674		while (*cp) cp++;
675		strcpy(cp, ".pic");
676		cp += 4;
#	Line 642 \| Line 707 \| *walkwait(first, last, vfn) / walk-through frames /*
707		int first, last;
708		char *vfn;
709		{
710	+	double blurf;
711	+	int nblur = getblur(&blurf);
712		char combuf[2048];
713	<	char *inspoint;
713	>	register char *inspoint;
714		register int i;
715
716		if (!noaction && vint(INTERP)) /* create dummy frames */
#	Line 654 \| Line 721 \| *char vfn;**
721		close(open(combuf, O_RDONLY\|O_CREAT, 0666));
722		}
723		/* create command */
724	<	sprintf(combuf, "rpict%s -w0", rendopt);
725	<	if (vint(INTERP) \|\| atoi(vval(MBLUR)))
726	<	sprintf(combuf+strlen(combuf), " -z %s.zbf", vval(BASENAME));
727	<	sprintf(combuf+strlen(combuf), " -o %s.unf %s -S %d",
724	>	sprintf(combuf, "rpict%s%s -w0", rendopt,
725	>	viewopt(getview(first>1 ? first-1 : 1)));
726	>	inspoint = combuf;
727	>	while (*inspoint) inspoint++;
728	>	if (nblur) {
729	>	sprintf(inspoint, " -pm %.3f", blurf/nblur);
730	>	while (*inspoint) inspoint++;
731	>	}
732	>	if (nblur > 1 \|\| vint(INTERP)) {
733	>	sprintf(inspoint, " -z %s.zbf", vval(BASENAME));
734	>	while (*inspoint) inspoint++;
735	>	}
736	>	sprintf(inspoint, " -o %s.unf %s -S %d",
737		vval(BASENAME), rresopt, first);
738	<	inspoint = combuf + strlen(combuf);
738	>	while (*inspoint) inspoint++;
739		sprintf(inspoint, " %s < %s", vval(OCTREE), vfn);
740		/* run in parallel */
741	<	if (pruncom(combuf, inspoint, (last-first+1)/(vint(INTERP)+1))) {
741	>	i = (last-first+1)/(vint(INTERP)+1);
742	>	if (i < 1) i = 1;
743	>	if (pruncom(combuf, inspoint, i)) {
744		fprintf(stderr, "%s: error rendering frames %d through %d\n",
745		progname, first, last);
746		quit(1);
#	Line 683 \| Line 761 \| int frame;
761		{
762		static int rfrm; / list of recovered frames */
763		static int nrfrms = 0;
764	+	double blurf;
765	+	int nblur = getblur(&blurf);
766		char combuf[2048];
767		char fname[128];
768		register char *cp;
#	Line 698 \| Line 778 \| int frame;
778		vval(ANIMATE), frame, rendopt);
779		else
780		sprintf(combuf, "rpict%s -w0", rendopt);
781	<	cp = combuf + strlen(combuf);
782	<	if (vint(INTERP) \|\| atoi(vval(MBLUR))) {
781	>	cp = combuf;
782	>	while (*cp) cp++;
783	>	if (nblur) {
784	>	sprintf(cp, " -pm %.3f", blurf/nblur);
785	>	while (*cp) cp++;
786	>	}
787	>	if (nblur > 1 \|\| vint(INTERP)) {
788		sprintf(cp, " -z %s.zbf", fname);
789		while (*cp) cp++;
790		}
#	Line 740 \| Line 825 \| int frame;
825		}
826
827
828	<	archive(first, last) /* archive and remove renderings */
744	<	int first, last;
828	>	archive() /* archive and remove renderings */
829		{
830		#define RMCOML (sizeof(rmcom)-1)
831		static char rmcom[] = "rm -f";
832	<	int offset = RMCOML;
833	<	char combuf[10240];
834	<	struct stat stb;
751	<	register char *cp;
752	<	register int i;
832	>	char basedir[128];
833	>	int dlen, alen;
834	>	register int j;
835
836	<	if (noaction)
837	<	return;
838	<	if (vdef(ARCHIVE) && strlen(vval(ARCHIVE)) > offset)
839	<	offset = strlen(vval(ARCHIVE));
758	<	cp = combuf + offset;
759	<	cp++ = ' '; / make argument list */
760	<	for (i = first; i <= last; i++) {
761	<	sprintf(cp, vval(BASENAME), i);
762	<	strcat(cp, ".unf");
763	<	if (stat(cp, &stb) == 0 && stb.st_size > 0) { /* non-zero? */
764	<	while (*cp) cp++;
765	<	*cp++ = ' ';
766	<	sprintf(cp, vval(BASENAME), i);
767	<	strcat(cp, ".zbf");
768	<	if (access(cp, F_OK) == 0) { /* exists? */
769	<	while (*cp) cp++;
770	<	*cp++ = ' ';
771	<	}
772	<	}
773	<	}
774	<	*--cp = '\0';
775	<	if (cp <= combuf + offset) /* no files? */
776	<	return;
836	>	if (arcnext == arcfirst)
837	>	return; /* nothing to do */
838	>	dirfile(basedir, vval(BASENAME));
839	>	dlen = strlen(basedir);
840		if (vdef(ARCHIVE)) { /* run archive command */
841	<	i = strlen(vval(ARCHIVE));
842	<	strncpy(combuf+offset-i, vval(ARCHIVE), i);
843	<	if (runcom(combuf+offset-i)) {
844	<	fprintf(stderr,
845	<	"%s: error running archive command on frames %d through %d\n",
846	<	progname, first, last);
841	>	alen = strlen(vval(ARCHIVE));
842	>	if (dlen) {
843	>	j = alen + dlen + 5;
844	>	strncpy(arcfirst-j, "cd ", 3);
845	>	strncpy(arcfirst-j+3, basedir, dlen);
846	>	(arcfirst-j)[dlen+3] = ';'; (arcfirst-j)[dlen+4] = ' ';
847	>	} else
848	>	j = alen;
849	>	strncpy(arcfirst-alen, vval(ARCHIVE), alen);
850	>	if (runcom(arcfirst-j)) {
851	>	fprintf(stderr, "%s: error running archive command\n",
852	>	progname);
853		quit(1);
854		}
855		}
856	+	if (dlen) {
857	+	j = RMCOML + dlen + 5;
858	+	strncpy(arcfirst-j, "cd ", 3);
859	+	strncpy(arcfirst-j+3, basedir, dlen);
860	+	(arcfirst-j)[dlen+3] = ';'; (arcfirst-j)[dlen+4] = ' ';
861	+	} else
862	+	j = RMCOML;
863		/* run remove command */
864	<	strncpy(combuf+offset-RMCOML, rmcom, RMCOML);
865	<	runcom(combuf+offset-RMCOML);
864	>	strncpy(arcfirst-RMCOML, rmcom, RMCOML);
865	>	runcom(arcfirst-j);
866	>	arcnext = arcfirst; /* reset argument list */
867		#undef RMCOML
868		}
869
#	Line 799 \| Line 876 \| *char ep;**
876		int rvr;
877		{
878		extern int frecover();
879	<	char fnbefore[128], fnafter[128];
880	<	char combuf[1024], fname[128];
881	<	int usepinterp, usepfilt;
879	>	static int iter = 0;
880	>	double blurf;
881	>	int nblur = getblur(&blurf);
882	>	char fnbefore[128], fnafter[128], *fbase;
883	>	char combuf[1024], fname0[128], fname1[128];
884	>	int usepinterp, usepfilt, nora_rgbe;
885		int frseq[2];
886		/* check what is needed */
887	<	usepinterp = atoi(vval(MBLUR));
887	>	usepinterp = (nblur > 1);
888		usepfilt = pfiltalways \| ep==NULL;
889	+	if (ep != NULL && !strcmp(ep, "1"))
890	+	ep = "+0";
891	+	nora_rgbe = strcmp(vval(OVERSAMP),"1") \|\| ep==NULL \|\|
892	+	ep != '+' \|\| ep != '-' \|\| !isint(ep);
893		/* compute rendered views */
894		frseq[0] = frame - ((frame-1) % (vint(INTERP)+1));
895		frseq[1] = frseq[0] + vint(INTERP) + 1;
896	+	fbase = dirfile(NULL, vval(BASENAME));
897		if (frseq[1] > vint(END))
898		frseq[1] = vint(END);
899		if (frseq[1] == frame) { /* pfilt only */
900		frseq[0] = frseq[1];
901		usepinterp = 0; /* update what's needed */
902	<	usepfilt \|= vflt(OVERSAMP)>1.01 \|\| strcmp(ep,"1");
903	<	} else if (frseq[0] == frame) { /* no interpolation */
904	<	/* update what's needed */
905	<	if (!usepinterp)
906	<	usepfilt \|= vflt(OVERSAMP)>1.01 \|\| strcmp(ep,"1");
902	>	usepfilt \|= nora_rgbe;
903	>	} else if (frseq[0] == frame) { /* no interpolation needed */
904	>	if (!rvr && frame > 1+vint(INTERP)) { /* archive previous */
905	>	*arcnext++ = ' ';
906	>	sprintf(arcnext, fbase, frame-vint(INTERP)-1);
907	>	while (*arcnext) arcnext++;
908	>	strcpy(arcnext, ".unf");
909	>	arcnext += 4;
910	>	if (usepinterp \|\| vint(INTERP)) { /* and Z-buf */
911	>	*arcnext++ = ' ';
912	>	sprintf(arcnext, fbase, frame-vint(INTERP)-1);
913	>	while (*arcnext) arcnext++;
914	>	strcpy(arcnext, ".zbf");
915	>	arcnext += 4;
916	>	}
917	>	}
918	>	if (!usepinterp) /* update what's needed */
919	>	usepfilt \|= nora_rgbe;
920		} else /* interpolation needed */
921		usepinterp++;
922		if (frseq[1] >= astat.rnext) /* next batch unavailable */
#	Line 831 \| Line 929 \| int rvr;
929		if (usepinterp) { /* using pinterp */
930		if (rvr == 2 && recover(frseq[1])) /* recover after? */
931		return(1);
932	<	if (atoi(vval(MBLUR))) {
933	<	FILE fp; / motion blurring */
934	<	sprintf(fname, "%s/vw0", vval(DIRECTORY));
935	<	if (access(fname, F_OK) == 0)
936	<	sleep(10);
937	<	if ((fp = fopen(fname, "w")) == NULL) {
938	<	perror(fname); quit(1);
939	<	}
940	<	fputs(VIEWSTR, fp);
941	<	fprintview(vp, fp);
942	<	putc('\n', fp); fclose(fp);
943	<	if ((vp = getview(frame+1)) == NULL) {
944	<	fprintf(stderr,
932	>	if (nblur > 1) { /* with pmblur */
933	>	sprintf(fname0, "%s/vw0%c", vval(DIRECTORY),
934	>	'a'+(iter%26));
935	>	sprintf(fname1, "%s/vw1%c", vval(DIRECTORY),
936	>	'a'+(iter%26));
937	>	if (!noaction) {
938	>	FILE fp; / motion blurring */
939	>	if ((fp = fopen(fname0, "w")) == NULL) {
940	>	perror(fname0); quit(1);
941	>	}
942	>	fputs(VIEWSTR, fp);
943	>	fprintview(vp, fp);
944	>	putc('\n', fp); fclose(fp);
945	>	if ((vp = getview(frame+1)) == NULL) {
946	>	fprintf(stderr,
947		"%s: unexpected error reading view for frame %d\n",
948	<	progname, frame+1);
949	<	quit(1);
948	>	progname, frame+1);
949	>	quit(1);
950	>	}
951	>	if ((fp = fopen(fname1, "w")) == NULL) {
952	>	perror(fname1); quit(1);
953	>	}
954	>	fputs(VIEWSTR, fp);
955	>	fprintview(vp, fp);
956	>	putc('\n', fp); fclose(fp);
957		}
851	–	sprintf(fname, "%s/vw1", vval(DIRECTORY));
852	–	if ((fp = fopen(fname, "w")) == NULL) {
853	–	perror(fname); quit(1);
854	–	}
855	–	fputs(VIEWSTR, fp);
856	–	fprintview(vp, fp);
857	–	putc('\n', fp); fclose(fp);
958		sprintf(combuf,
959	<	"(pmblur %s %d %s/vw0 %s/vw1; rm -f %s/vw0 %s/vw1) \| pinterp -B",
960	<	*sskip(vval(MBLUR)) ? sskip2(vval(MBLUR),1) : "1",
961	<	atoi(vval(MBLUR)), vval(DIRECTORY),
962	<	vval(DIRECTORY), vval(DIRECTORY),
863	<	vval(DIRECTORY), vval(DIRECTORY));
959	>	"(pmblur %.3f %d %s %s; rm -f %s %s) \| pinterp -B -a",
960	>	blurf, nblur,
961	>	fname0, fname1, fname0, fname1);
962	>	iter++;
963		} else /* no blurring */
964		strcpy(combuf, "pinterp");
965		strcat(combuf, viewopt(vp));
966		if (vbool(RTRACE))
967		sprintf(combuf+strlen(combuf), " -ff -fr '%s -w0 %s'",
968	<	rendopt, vval(OCTREE));
968	>	rendopt+1, vval(OCTREE));
969		if (vdef(PINTERP))
970		sprintf(combuf+strlen(combuf), " %s", vval(PINTERP));
971		if (usepfilt)
972		sprintf(combuf+strlen(combuf), " %s", rresopt);
973		else
974	<	sprintf(combuf+strlen(combuf), " %s -e %s",
974	>	sprintf(combuf+strlen(combuf), "-a %s -e %s",
975		fresopt, ep);
976		sprintf(combuf+strlen(combuf), " %s.unf %s.zbf",
977		fnbefore, fnbefore);
#	Line 907 \| Line 1006 \| int rvr;
1006		} else { /* else just check it */
1007		if (rvr == 2)
1008		return(1);
1009	<	sprintf(combuf, "ra_rgbe -r %s.unf", fnbefore);
1009	>	sprintf(combuf, "ra_rgbe -e %s -r %s.unf", ep, fnbefore);
1010		}
1011		/* output file name */
1012	<	sprintf(fname, vval(BASENAME), frame);
1013	<	sprintf(combuf+strlen(combuf), " > %s.pic", fname);
1012	>	sprintf(fname0, vval(BASENAME), frame);
1013	>	sprintf(combuf+strlen(combuf), " > %s.pic", fname0);
1014		if (rvr) /* in recovery */
1015		return(runcom(combuf));
1016		bruncom(combuf, frame, frecover); /* else run in background */
#	Line 937 \| Line 1036 \| int n;
1036		}
1037		return(NULL);
1038		}
1039	<	if (viewfp == NULL) { /* open file */
1039	>	if (viewfp == NULL) { /* open file */
1040		if ((viewfp = fopen(vval(VIEWFILE), "r")) == NULL) {
1041		perror(vval(VIEWFILE));
1042		quit(1);
1043		}
1044	<	} else if (n < viewnum) { /* rewind file */
1044	>	} else if (n > 0 && n < viewnum) { /* rewind file */
1045	>	if (viewnum == 1 && feof(viewfp))
1046	>	return(&curview); /* just one view */
1047		if (fseek(viewfp, 0L, 0) == EOF) {
1048		perror(vval(VIEWFILE));
1049		quit(1);
#	Line 950 \| Line 1051 \| int n;
1051		copystruct(&curview, &stdview);
1052		viewnum = 0;
1053		}
1054	+	if (n < 0) { /* get next view */
1055	+	register int c = getc(viewfp);
1056	+	if (c == EOF)
1057	+	return((VIEW )NULL); / that's it */
1058	+	ungetc(c, viewfp);
1059	+	n = viewnum + 1;
1060	+	}
1061		while (n > viewnum) { /* scan to desired view */
1062		if (fgets(linebuf, sizeof(linebuf), viewfp) == NULL)
1063	<	return(NULL);
1063	>	return(viewnum==1 ? &curview : (VIEW *)NULL);
1064		if (isview(linebuf) && sscanview(&curview, linebuf) > 0)
1065		viewnum++;
1066		}
#	Line 963 \| Line 1071 \| int n;
1071		int
1072		countviews() /* count views in view file */
1073		{
1074	<	register int n = 0;
1074	>	int n;
1075
1076	<	while (getview(n+1) != NULL)
1076	>	if (getview(n=1) == NULL)
1077	>	return(0);
1078	>	while (getview(-1) != NULL)
1079		n++;
1080		return(n);
1081		}
#	Line 985 \| Line 1095 \| int n;
1095		if (n == 0) { /* signal to close file */
1096		if (expfp != NULL) {
1097		fclose(expfp);
1098	+	free((void *)exppos);
1099		expfp = NULL;
1100		}
1101		return(NULL);
1102	<	}
1102	>	} else if (n > vint(END)) /* request past end (error?) */
1103	>	return(NULL);
1104		if (!vdef(EXPOSURE)) /* no setting (auto) */
1105		return(NULL);
1106		if (isflt(vval(EXPOSURE))) /* always the same */
#	Line 1026 \| Line 1138 \| int n;
1138		}
1139		curfrm++;
1140		cp = fskip(expval); /* check format */
1141	<	if (cp == NULL \|\| *cp != '\n') {
1141	>	if (cp != NULL)
1142	>	while (isspace(*cp))
1143	>	*cp++ = '\0';
1144	>	if (cp == NULL \|\| *cp) {
1145		fprintf(stderr,
1146		"%s: exposure format error on line %d\n",
1147		vval(EXPOSURE), curfrm);
1148		quit(1);
1149		}
1035	–	*cp = '\0';
1150		}
1151		return(expval); /* return value */
1152		}
#	Line 1062 \| Line 1176 \| int pn;
1176		int status;
1177		{
1178		register PROC *pp;
1179	+	register struct pslot *psl;
1180
1181		pp = ps->proc + pn;
1182		if (pp->elen) { /* pass errors */
#	Line 1073 \| Line 1188 \| int status;
1188		if (ps->hostname[0])
1189		status = 1; /* because rsh doesn't return status */
1190		}
1191	+	lastpserver = NULL;
1192	+	psl = findpslot(pp->pid); /* check for bruncom() slot */
1193	+	if (psl->pid) {
1194	+	if (status) {
1195	+	if (psl->rcvf != NULL) /* attempt recovery */
1196	+	status = (*psl->rcvf)(psl->fout);
1197	+	if (status) {
1198	+	fprintf(stderr,
1199	+	"%s: error rendering frame %d\n",
1200	+	progname, psl->fout);
1201	+	quit(1);
1202	+	}
1203	+	lastpserver = ps;
1204	+	}
1205	+	psl->pid = 0; /* free process slot */
1206	+	} else if (status)
1207	+	lastpserver = ps;
1208		freestr(pp->com); /* free command string */
1077	–	lastpid = pp->pid; /* record PID for bwait() */
1078	–	lastpserver = ps; /* record server for serverdown() */
1209		return(status);
1210		}
1211
#	Line 1083 \| Line 1213 \| int status;
1213		int
1214		serverdown() /* check status of last process server */
1215		{
1216	+	if (lastpserver == NULL \|\| !lastpserver->hostname[0])
1217	+	return(0);
1218		if (pserverOK(lastpserver)) /* server still up? */
1219		return(0);
1220		delpserver(lastpserver); /* else delete it */
#	Line 1109 \| Line 1241 \| *int (rf)();**
1241		printf("\t%s\n", com); /* echo command */
1242		return(0);
1243		}
1244	<	/* else start it when we can */
1245	<	while ((pid = startjob(NULL, savestr(com), donecom)) == -1)
1244	>	com = savestr(com); /* else start it when we can */
1245	>	while ((pid = startjob(NULL, com, donecom)) == -1)
1246		bwait(1);
1247		if (!silent) { /* echo command */
1248		PSERVER *ps;
#	Line 1132 \| Line 1264 \| *bwait(ncoms) / wait for batch job(s) to finish /*
1264		int ncoms;
1265		{
1266		int status;
1135	–	register struct pslot *psl;
1267
1268		if (noaction)
1269		return;
1270		while ((status = wait4job(NULL, -1)) != -1) {
1271	<	psl = findpslot(lastpid);
1272	<	if (status) { /* attempt recovery */
1273	<	serverdown(); /* check server */
1143	<	if (psl->rcvf == NULL \|\| (*psl->rcvf)(psl->fout)) {
1144	<	fprintf(stderr,
1145	<	"%s: error rendering frame %d\n",
1146	<	progname, psl->fout);
1147	<	quit(1);
1148	<	}
1149	<	}
1150	<	psl->pid = 0; /* free process slot */
1151	<	if (!--ncoms)
1152	<	return; /* done enough */
1271	>	serverdown(); /* update server status */
1272	>	if (--ncoms == 0)
1273	>	break; /* done enough */
1274		}
1275		}
1276
#	Line 1161 \| Line 1282 \| int maxcopies;
1282		{
1283		int retstatus = 0;
1284		int hostcopies;
1285	<	char com1buf[10240], com1, endcom1;
1285	>	char buf[10240], com1, s;
1286		int status;
1287	+	int pfd;
1288	+	register int n;
1289		register PSERVER *ps;
1290
1291		if (!silent)
1292	<	printf("\t%s &\n", com); /* echo command */
1292	>	printf("\t%s\n", com); /* echo command */
1293		if (noaction)
1294		return(0);
1295		fflush(stdout);
#	Line 1174 \| Line 1297 \| int maxcopies;
1297		for (ps = pslist; ps != NULL; ps = ps->next) {
1298		hostcopies = 0;
1299		if (maxcopies > 1 && ps->nprocs > 1 && ppins != NULL) {
1300	<	strcpy(com1=com1buf, com); /* build -PP command */
1300	>	strcpy(com1=buf, com); /* build -PP command */
1301		sprintf(com1+(ppins-com), " -PP %s/%s.persist",
1302		vval(DIRECTORY), phostname(ps));
1303		strcat(com1, ppins);
1304	<	endcom1 = com1 + strlen(com1);
1182	<	sprintf(endcom1, "; kill `sed -n '1s/^[^ ]* //p' %s/%s.persist`",
1183	<	vval(DIRECTORY), phostname(ps));
1184	<	} else {
1304	>	} else
1305		com1 = com;
1306	<	endcom1 = NULL;
1306	>	while (maxcopies > 0) {
1307	>	s = savestr(com1);
1308	>	if (startjob(ps, s, donecom) != -1) {
1309	>	sleep(20);
1310	>	hostcopies++;
1311	>	maxcopies--;
1312	>	} else {
1313	>	freestr(s);
1314	>	break;
1315	>	}
1316		}
1188	–	while (maxcopies > 0 &&
1189	–	startjob(ps, savestr(com1), donecom) != -1) {
1190	–	sleep(10);
1191	–	hostcopies++;
1192	–	maxcopies--;
1193	–	if (endcom1 != NULL)
1194	–	*endcom1 = '\0';
1195	–	}
1317		if (!silent && hostcopies) {
1318		if (hostcopies > 1)
1319		printf("\t%d duplicate processes", hostcopies);
#	Line 1204 \| Line 1325 \| int maxcopies;
1325		}
1326		/* wait for jobs to finish */
1327		while ((status = wait4job(NULL, -1)) != -1)
1328	<	if (status)
1329	<	retstatus += !serverdown(); /* check server */
1328	>	retstatus += status && !serverdown();
1329	>	/* terminate parallel rpict's */
1330	>	for (ps = pslist; ps != NULL; ps = ps->next) {
1331	>	sprintf(buf, "%s/%s.persist", vval(DIRECTORY), phostname(ps));
1332	>	if ((pfd = open(buf, O_RDONLY)) >= 0) {
1333	>	n = read(pfd, buf, sizeof(buf)-1); /* get PID */
1334	>	buf[n] = '\0';
1335	>	close(pfd);
1336	>	for (n = 0; buf[n] && !isspace(buf[n]); n++)
1337	>	;
1338	>	/* terminate */
1339	>	sprintf(buf, "kill -ALRM %d", atoi(buf+n));
1340	>	wait4job(ps, startjob(ps, buf, NULL));
1341	>	}
1342	>	}
1343		return(retstatus);
1344		}
1345
#	Line 1243 \| Line 1377 \| int vc;
1377		fprintf(stderr, "%s: bad value for variable '%s'\n",
1378		progname, vnam(vc));
1379		quit(1);
1380	+	}
1381	+
1382	+
1383	+	char *
1384	+	dirfile(df, path) /* separate path into directory and file */
1385	+	char *df;
1386	+	register char *path;
1387	+	{
1388	+	register int i;
1389	+	int psep;
1390	+
1391	+	for (i = 0, psep = -1; path[i]; i++)
1392	+	if (path[i] == '/')
1393	+	psep = i;
1394	+	if (df != NULL)
1395	+	if (psep == 0) {
1396	+	df[0] = '/';
1397	+	df[1] = '\0';
1398	+	} else if (psep > 0) {
1399	+	strncpy(df, path, psep);
1400	+	df[psep] = '\0';
1401	+	} else
1402	+	df[0] = '\0';
1403	+	return(path+psep+1);
1404	+	}
1405	+
1406	+
1407	+	int
1408	+	getblur(double bf) / get # blur samples (and fraction) */
1409	+	{
1410	+	double blurf;
1411	+	int nblur;
1412	+	char *s;
1413	+
1414	+	if (!vdef(MBLUR)) {
1415	+	if (bf != NULL)
1416	+	*bf = 0.0;
1417	+	return(0);
1418	+	}
1419	+	blurf = atof(vval(MBLUR));
1420	+	if (blurf < 0.0)
1421	+	blurf = 0.0;
1422	+	if (bf != NULL)
1423	+	*bf = blurf;
1424	+	if (blurf <= FTINY)
1425	+	return(0);
1426	+	s = sskip(vval(MBLUR));
1427	+	if (!*s)
1428	+	return(DEF_NBLUR);
1429	+	nblur = atoi(s);
1430	+	if (nblur <= 0)
1431	+	return(1);
1432	+	return(nblur);
1433		}

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing ray/src/util/ranimate.c (file contents): Revision 2.5 by greg, Tue Jan 23 16:14:28 1996 UTC vs. Revision 2.31 by greg, Tue Feb 25 02:47:24 2003 UTC

Diff Legend

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.5 by greg, Tue Jan 23 16:14:28 1996 UTC vs.
Revision 2.31 by greg, Tue Feb 25 02:47:24 2003 UTC