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

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.6 by greg, Tue Jan 23 17:01:33 1996 UTC vs.
Revision 2.40 by schorsch, Mon Jul 21 22:30:19 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 "standard.h"
16	>	#include "copyright.h"
17	>
18		#include <ctype.h>
13	–	#include <sys/types.h>
19		#include <sys/stat.h>
20	+
21	+	#include "standard.h"
22	+	#include "paths.h"
23		#include "view.h"
24		#include "vars.h"
25		#include "netproc.h"
26	<	/* input variables */
27	<	#define HOST 0 /* rendering host machine */
28	<	#define RENDER 1 /* rendering options */
29	<	#define PFILT 2 /* pfilt options */
30	<	#define PINTERP 3 /* pinterp options */
31	<	#define OCTREE 4 /* octree file name */
32	<	#define DIRECTORY 5 /* working (sub)directory */
33	<	#define BASENAME 6 /* output image base name */
34	<	#define VIEWFILE 7 /* animation frame views */
35	<	#define START 8 /* starting frame number */
36	<	#define END 9 /* ending frame number */
37	<	#define RIF 10 /* rad input file */
38	<	#define NEXTANIM 11 /* next animation file */
39	<	#define ANIMATE 12 /* animation command */
40	<	#define TRANSFER 13 /* frame transfer command */
41	<	#define ARCHIVE 14 /* archiving command */
42	<	#define INTERP 15 /* # frames to interpolate */
43	<	#define OVERSAMP 16 /* # times to oversample image */
44	<	#define MBLUR 17 /* samples for motion blur */
45	<	#define RTRACE 18 /* use rtrace with pinterp? */
46	<	#define DISKSPACE 19 /* how much disk space to use */
47	<	#define RESOLUTION 20 /* desired final resolution */
48	<	#define EXPOSURE 21 /* how to compute exposure */
26	>	/* default blur samples */
27	>	#ifndef DEF_NBLUR
28	>	#define DEF_NBLUR 5
29	>	#endif
30	>	/* default remote shell */
31	>	#ifdef _AUX_SOURCE
32	>	#define REMSH "remsh"
33	>	#else
34	>	#define REMSH "rsh"
35	>	#endif
36	>	/* input variables (alphabetical by name) */
37	>	#define ANIMATE 0 /* animation command */
38	>	#define ARCHIVE 1 /* archiving command */
39	>	#define BASENAME 2 /* output image base name */
40	>	#define DIRECTORY 3 /* working (sub)directory */
41	>	#define DISKSPACE 4 /* how much disk space to use */
42	>	#define END 5 /* ending frame number */
43	>	#define EXPOSURE 6 /* how to compute exposure */
44	>	#define HOST 7 /* rendering host machine */
45	>	#define INTERP 8 /* # frames to interpolate */
46	>	#define MBLUR 9 /* motion blur parameters */
47	>	#define NEXTANIM 10 /* next animation file */
48	>	#define OCTREE 11 /* octree file name */
49	>	#define OVERSAMP 12 /* # times to oversample image */
50	>	#define PFILT 13 /* pfilt options */
51	>	#define PINTERP 14 /* pinterp options */
52	>	#define RENDER 15 /* rendering options */
53	>	#define RESOLUTION 16 /* desired final resolution */
54	>	#define RIF 17 /* rad input file */
55	>	#define RSH 18 /* remote shell script or program */
56	>	#define RTRACE 19 /* use rtrace with pinterp? */
57	>	#define START 20 /* starting frame number */
58	>	#define TRANSFER 21 /* frame transfer command */
59	>	#define VIEWFILE 22 /* animation frame views */
60
61	<	int NVARS = 22; /* total number of variables */
61	>	int NVARS = 23; /* total number of variables */
62
63		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},
64		{"ANIMATE", 2, 0, NULL, onevalue},
58	–	{"TRANSFER", 2, 0, NULL, onevalue},
65		{"ARCHIVE", 2, 0, NULL, onevalue},
66	+	{"BASENAME", 3, 0, NULL, onevalue},
67	+	{"DIRECTORY", 3, 0, NULL, onevalue},
68	+	{"DISKSPACE", 3, 0, NULL, fltvalue},
69	+	{"END", 2, 0, NULL, intvalue},
70	+	{"EXPOSURE", 3, 0, NULL, onevalue},
71	+	{"host", 4, 0, NULL, NULL},
72		{"INTERPOLATE", 3, 0, NULL, intvalue},
61	–	{"OVERSAMPLE", 2, 0, NULL, fltvalue},
73		{"MBLUR", 2, 0, NULL, onevalue},
74	<	{"RTRACE", 2, 0, NULL, boolvalue},
75	<	{"DISKSPACE", 3, 0, NULL, fltvalue},
74	>	{"NEXTANIM", 3, 0, NULL, onevalue},
75	>	{"OCTREE", 3, 0, NULL, onevalue},
76	>	{"OVERSAMPLE", 2, 0, NULL, fltvalue},
77	>	{"pfilt", 2, 0, NULL, catvalues},
78	>	{"pinterp", 2, 0, NULL, catvalues},
79	>	{"render", 3, 0, NULL, catvalues},
80		{"RESOLUTION", 3, 0, NULL, onevalue},
81	<	{"EXPOSURE", 3, 0, NULL, onevalue},
81	>	{"RIF", 3, 0, NULL, onevalue},
82	>	{"RSH", 3, 0, NULL, onevalue},
83	>	{"RTRACE", 2, 0, NULL, boolvalue},
84	>	{"START", 2, 0, NULL, intvalue},
85	>	{"TRANSFER", 2, 0, NULL, onevalue},
86	>	{"VIEWFILE", 2, 0, NULL, onevalue},
87		};
88
89		#define SFNAME "STATUS" /* status file name */
#	Line 84 \| Line 104 \| *int nowarn = 0; / turn warnings off? /*
104		int silent = 0; /* silent mode? */
105		int noaction = 0; /* take no action? */
106
107	<	char rendopt[2048] = ""; /* rendering options */
107	>	char remsh; / remote shell program/script */
108	>	char rendopt[2048]; /* rendering options */
109		char rresopt[32]; /* rendering resolution options */
110		char fresopt[32]; /* filter resolution options */
111		int pfiltalways; /* always use pfilt? */
112
113	+	char arcargs[10240]; /* files to archive */
114	+	char arcfirst, arcnext; /* pointers to first and next argument */
115	+
116		struct pslot {
117		int pid; /* process ID (0 if empty) */
118		int fout; /* output frame number */
#	Line 96 \| Line 120 \| struct pslot {
120		} pslot; / process slots */
121		int npslots; /* number of process slots */
122
99	–	int lastpid; /* ID of last completed background process */
100	–	PSERVER lastpserver; / last process server used */
101	–
123		#define phostname(ps) ((ps)->hostname[0] ? (ps)->hostname : astat.host)
124
125		struct pslot *findpslot();
126
127	+	PSERVER lastpserver; / last process server with error */
128	+
129		VIEW *getview();
130	<	char *getexp();
130	>	char getexp(), dirfile();
131	>	int getblur();
132
133	+	extern time_t time();
134
135	+
136		main(argc, argv)
137		int argc;
138		char *argv[];
#	Line 137 \| Line 163 \| *char argv[];**
163		cfname = argv[i];
164		/* load variables */
165		loadvars(cfname);
166	+	/* check variables */
167	+	checkvalues();
168		/* did we get DIRECTORY? */
169		checkdir();
170		/* check status */
#	Line 163 \| Line 191 \| *char argv[];**
191		argv[i] = vval(NEXTANIM); /* just change input file */
192		if (!silent)
193		printargs(argc, argv, stdout);
194	<	execvp(progname, argv); /* pass to next */
195	<	quit(1); /* shouldn't return */
194	>	if ((argv[0] = getpath(progname,getenv("PATH"),X_OK)) == NULL)
195	>	fprintf(stderr, "%s: command not found\n", progname);
196	>	else
197	>	execv(progname, argv);
198	>	quit(1);
199		}
200		quit(0);
201		userr:
#	Line 175 \| Line 206 \| userr:
206
207		getastat() /* check/set animation status */
208		{
209	<	char buf[256];
209	>	char sfname[256];
210		FILE *fp;
211
212	<	sprintf(buf, "%s/%s", vval(DIRECTORY), SFNAME);
213	<	if ((fp = fopen(buf, "r")) == NULL) {
212	>	sprintf(sfname, "%s/%s", vval(DIRECTORY), SFNAME);
213	>	if ((fp = fopen(sfname, "r")) == NULL) {
214		if (errno != ENOENT) {
215	<	perror(buf);
215	>	perror(sfname);
216		return(-1);
217		}
218		astat.rnext = astat.fnext = astat.tnext = 0;
#	Line 201 \| Line 232 \| *getastat() / check/set animation status /*
232		goto fmterr;
233		fclose(fp);
234		if (astat.pid != 0) { /* thinks it's still running */
235	<	gethostname(buf, sizeof(buf));
205	<	if (strcmp(buf, astat.host)) {
235	>	if (strcmp(myhostname(), astat.host)) {
236		fprintf(stderr,
237		"%s: process %d may still be running on host %s\n",
238		progname, astat.pid, astat.host);
#	Line 215 \| Line 245 \| *getastat() / check/set animation status /*
245		}
246		/* assume it is dead */
247		}
248	<	if (strcmp(cfname, astat.cfname) && astat.tnext != 0) { /* other's */
248	>	if (strcmp(cfname, astat.cfname) && astat.pid != 0) { /* other's */
249		fprintf(stderr, "%s: unfinished job \"%s\"\n",
250		progname, astat.cfname);
251		return(-1);
252		}
253	+	/* check control file mods. */
254	+	if (!nowarn && fdate(cfname) > fdate(sfname))
255	+	fprintf(stderr,
256	+	"%s: warning - control file modified since last run\n",
257	+	progname);
258		setours: /* set our values */
259	<	gethostname(astat.host, sizeof(astat.host));
259	>	strcpy(astat.host, myhostname());
260		astat.pid = getpid();
261		strcpy(astat.cfname, cfname);
262		return(0);
263		fmterr:
264		fprintf(stderr, "%s: format error in status file \"%s\"\n",
265	<	progname, buf);
265	>	progname, sfname);
266		fclose(fp);
267		return(-1);
268		}
#	Line 279 \| Line 314 \| *checkdir() / make sure we have our directory /*
314
315		setdefaults() /* set default values */
316		{
317	+	extern char *atos();
318	+	int decades;
319		char buf[256];
320
321		if (vdef(ANIMATE)) {
#	Line 312 \| Line 349 \| *setdefaults() / set default values /*
349		quit(1);
350		}
351		if (!vdef(BASENAME)) {
352	<	sprintf(buf, "%s/frame%%03d", vval(DIRECTORY));
352	>	decades = (int)log10((double)vint(END)) + 1;
353	>	if (decades < 3) decades = 3;
354	>	sprintf(buf, "%s/frame%%0%dd", vval(DIRECTORY), decades);
355		vval(BASENAME) = savqstr(buf);
356		vdef(BASENAME)++;
357		}
#	Line 344 \| Line 383 \| *setdefaults() / set default values /*
383		vval(DISKSPACE) = "100";
384		vdef(DISKSPACE)++;
385		}
386	+	if (!vdef(RSH)) {
387	+	vval(RSH) = REMSH;
388	+	vdef(RSH)++;
389	+	}
390	+	/* locate remote shell program */
391	+	atos(buf, sizeof(buf), vval(RSH));
392	+	if ((remsh = getpath(buf, getenv("PATH"), X_OK)) != NULL)
393	+	remsh = savqstr(remsh);
394	+	else
395	+	remsh = vval(RSH); /* will generate error if used */
396	+
397		/* append rendering options */
398		if (vdef(RENDER))
399		sprintf(rendopt+strlen(rendopt), " %s", vval(RENDER));
#	Line 406 \| Line 456 \| *sethosts() / set up process servers /*
456		}
457
458
459	<	getradfile(rfname) /* run rad and get needed variables */
460	<	char *rfname;
459	>	getradfile(rfargs) /* run rad and get needed variables */
460	>	char *rfargs;
461		{
462		static short mvar[] = {OCTREE,PFILT,RESOLUTION,EXPOSURE,-1};
463		char combuf[256];
464		register int i;
465		register char *cp;
466	+	char *pippt;
467		/* create rad command */
468		sprintf(rendopt, " @%s/render.opt", vval(DIRECTORY));
469		sprintf(combuf,
470		"rad -v 0 -s -e -w %s OPTFILE=%s \| egrep '^[ \t]*(NOMATCH",
471	<	rfname, rendopt+2);
471	>	rfargs, rendopt+2);
472		cp = combuf;
473	<	while (cp) cp++; / match unset variables */
473	>	while (*cp) {
474	>	if (*cp == '\|') pippt = cp;
475	>	cp++;
476	>	} /* match unset variables */
477		for (i = 0; mvar[i] >= 0; i++)
478		if (!vdef(mvar[i])) {
479		*cp++ = '\|';
480		strcpy(cp, vnam(mvar[i]));
481		while (*cp) cp++;
482	+	pippt = NULL;
483		}
484	<	sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
485	<	cp += 11; /* point to file name */
486	<	if (system(combuf)) {
487	<	fprintf(stderr, "%s: bad rad input file \"%s\"\n",
488	<	progname, rfname);
434	<	quit(1);
484	>	if (pippt != NULL)
485	>	strcpy(pippt, "> " NULL_DEVICE); /* nothing to match */
486	>	else {
487	>	sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
488	>	cp += 11; /* point to file name */
489		}
490	<	loadvars(cp); /* load variables and remove file */
491	<	unlink(cp);
490	>	system(combuf); /* ignore exit code */
491	>	if (pippt == NULL) { /* load variables and remove file */
492	>	loadvars(cp);
493	>	unlink(cp);
494	>	}
495		}
496
497
#	Line 449 \| Line 506 \| *animate() / run animation /*
506		i = sscanf(vval(RESOLUTION), "%d %d %f", &xres, &yres, &pa);
507		mult = vflt(OVERSAMP);
508		if (i == 3) {
509	<	sprintf(rresopt, "-x %d -y %d -pa %f", (int)(mult*xres),
509	>	sprintf(rresopt, "-x %d -y %d -pa %.3f", (int)(mult*xres),
510		(int)(mult*yres), pa);
511	<	sprintf(fresopt, "-x %d -y %d -pa %f", xres, yres, pa);
511	>	sprintf(fresopt, "-x %d -y %d -pa %.3f", xres, yres, pa);
512		} else if (i) {
513		if (i == 1) yres = xres;
514		sprintf(rresopt, "-x %d -y %d", (int)(mult*xres),
#	Line 468 \| Line 525 \| *animate() / run animation /*
525		progname, vnam(INTERP));
526		vval(INTERP) = "0";
527		}
528	<	if (atoi(vval(MBLUR))) { /* can't handle this yet */
528	>	if (strcmp(vval(MBLUR),"0")) { /* can't handle this */
529		if (!nowarn)
530		fprintf(stderr,
531		"%s: resetting %s=0 for animation\n",
#	Line 478 \| Line 535 \| *animate() / run animation /*
535		}
536		/* figure # frames per batch */
537		d1 = multxresmultyres4; /* space for orig. picture */
538	<	if ((i=vint(INTERP)) \|\| atoi(vval(MBLUR)))
539	<	d1 += multxresmultyres4; /* space for z-buffer */
538	>	if ((i=vint(INTERP)) \|\| getblur(NULL) > 1)
539	>	d1 += multxresmultyressizeof(float); /* Z-buffer */
540		d2 = xresyres4; /* space for final picture */
541		frames_batch = (i+1)(vflt(DISKSPACE)1048576.-d1)/(d1+i*d2);
542		if (frames_batch < i+2) {
#	Line 487 \| Line 544 \| *animate() / run animation /*
544		progname);
545		quit(1);
546		}
547	+	/* initialize archive argument list */
548	+	i = vdef(ARCHIVE) ? strlen(vval(ARCHIVE))+132 : 132;
549	+	arcnext = arcfirst = arcargs + i;
550		/* initialize status file */
551		if (astat.rnext == 0)
552		astat.rnext = astat.fnext = astat.tnext = vint(START);
#	Line 571 \| Line 631 \| *filterframes() / catch up with filtering /*
631		if (astat.tnext < astat.fnext) /* other work to do first */
632		return;
633		/* filter each view */
634	<	for (i = astat.fnext; i < astat.rnext; i++) {
635	<	if ((vp = getview(i)) == NULL) { /* get view i */
636	<	fprintf(stderr,
577	<	"%s: unexpected error reading view for frame %d\n",
578	<	progname, i);
579	<	quit(1);
580	<	}
581	<	dofilt(i, vp, getexp(i), 0); /* filter frame */
582	<	}
634	>	for (i = astat.fnext; i < astat.rnext; i++)
635	>	dofilt(i, 0);
636	>
637		bwait(0); /* wait for filter processes */
638	<	archive(astat.fnext, i-1); /* archive originals */
638	>	archive(); /* archive originals */
639		astat.fnext = i; /* update status */
640		putastat();
641		}
#	Line 589 \| Line 643 \| *filterframes() / catch up with filtering /*
643
644		transferframes() /* catch up with picture transfers */
645		{
646	<	char combuf[10240];
646	>	char combuf[10240], *fbase;
647		register char *cp;
648		register int i;
649
#	Line 600 \| Line 654 \| *transferframes() / catch up with picture transfers**
654		putastat(); /* update status */
655		return;
656		}
657	<	strcpy(combuf, vval(TRANSFER)); /* start transfer command */
658	<	cp = combuf + strlen(combuf);
657	>	strcpy(combuf, "cd "); /* start transfer command */
658	>	fbase = dirfile(cp = combuf+3, vval(BASENAME));
659	>	if (*cp) {
660	>	while (*++cp) ;
661	>	cp++ = ';'; cp++ = ' ';
662	>	} else
663	>	cp = combuf;
664	>	strcpy(cp, vval(TRANSFER));
665	>	while (*cp) cp++;
666		/* make argument list */
667		for (i = astat.tnext; i < astat.fnext; i++) {
668		*cp++ = ' ';
669	<	sprintf(cp, vval(BASENAME), i);
669	>	sprintf(cp, fbase, i);
670		while (*cp) cp++;
671		strcpy(cp, ".pic");
672		cp += 4;
#	Line 642 \| Line 703 \| *walkwait(first, last, vfn) / walk-through frames /*
703		int first, last;
704		char *vfn;
705		{
706	+	double blurf;
707	+	int nblur = getblur(&blurf);
708		char combuf[2048];
709	<	char *inspoint;
709	>	register char *inspoint;
710		register int i;
711
712		if (!noaction && vint(INTERP)) /* create dummy frames */
#	Line 654 \| Line 717 \| *char vfn;**
717		close(open(combuf, O_RDONLY\|O_CREAT, 0666));
718		}
719		/* create command */
720	<	sprintf(combuf, "rpict%s -w0", rendopt);
721	<	if (vint(INTERP) \|\| atoi(vval(MBLUR)))
722	<	sprintf(combuf+strlen(combuf), " -z %s.zbf", vval(BASENAME));
723	<	sprintf(combuf+strlen(combuf), " -o %s.unf %s -S %d",
720	>	sprintf(combuf, "rpict%s%s -w0", rendopt,
721	>	viewopt(getview(first>1 ? first-1 : 1)));
722	>	inspoint = combuf;
723	>	while (*inspoint) inspoint++;
724	>	if (nblur) {
725	>	sprintf(inspoint, " -pm %.3f", blurf/nblur);
726	>	while (*inspoint) inspoint++;
727	>	}
728	>	if (nblur > 1 \|\| vint(INTERP)) {
729	>	sprintf(inspoint, " -z %s.zbf", vval(BASENAME));
730	>	while (*inspoint) inspoint++;
731	>	}
732	>	sprintf(inspoint, " -o %s.unf %s -S %d",
733		vval(BASENAME), rresopt, first);
734	<	inspoint = combuf + strlen(combuf);
734	>	while (*inspoint) inspoint++;
735		sprintf(inspoint, " %s < %s", vval(OCTREE), vfn);
736		/* run in parallel */
737	<	if (pruncom(combuf, inspoint, (last-first+1)/(vint(INTERP)+1))) {
737	>	i = (last-first+1)/(vint(INTERP)+1);
738	>	if (i < 1) i = 1;
739	>	if (pruncom(combuf, inspoint, i)) {
740		fprintf(stderr, "%s: error rendering frames %d through %d\n",
741		progname, first, last);
742		quit(1);
#	Line 683 \| Line 757 \| int frame;
757		{
758		static int rfrm; / list of recovered frames */
759		static int nrfrms = 0;
760	+	double blurf;
761	+	int nblur = getblur(&blurf);
762		char combuf[2048];
763		char fname[128];
764		register char *cp;
#	Line 698 \| Line 774 \| int frame;
774		vval(ANIMATE), frame, rendopt);
775		else
776		sprintf(combuf, "rpict%s -w0", rendopt);
777	<	cp = combuf + strlen(combuf);
778	<	if (vint(INTERP) \|\| atoi(vval(MBLUR))) {
777	>	cp = combuf;
778	>	while (*cp) cp++;
779	>	if (nblur) {
780	>	sprintf(cp, " -pm %.3f", blurf/nblur);
781	>	while (*cp) cp++;
782	>	}
783	>	if (nblur > 1 \|\| vint(INTERP)) {
784		sprintf(cp, " -z %s.zbf", fname);
785		while (*cp) cp++;
786		}
#	Line 713 \| Line 794 \| int frame;
794		return(1);
795		/* add frame to recovered list */
796		if (nrfrms)
797	<	rfrm = (int )realloc((char )rfrm, (nrfrms+1)*sizeof(int));
797	>	rfrm = (int )realloc((void )rfrm, (nrfrms+1)*sizeof(int));
798		else
799		rfrm = (int *)malloc(sizeof(int));
800		if (rfrm == NULL) {
#	Line 729 \| Line 810 \| int
810		frecover(frame) /* recover filtered frame */
811		int frame;
812		{
813	<	VIEW *vp;
733	<	char *ex;
734	<
735	<	vp = getview(frame);
736	<	ex = getexp(frame);
737	<	if (dofilt(frame, vp, ex, 2) && dofilt(frame, vp, ex, 1))
813	>	if (dofilt(frame, 2) && dofilt(frame, 1))
814		return(1);
815		return(0);
816		}
817
818
819	<	archive(first, last) /* archive and remove renderings */
744	<	int first, last;
819	>	archive() /* archive and remove renderings */
820		{
821		#define RMCOML (sizeof(rmcom)-1)
822		static char rmcom[] = "rm -f";
823	<	int offset = RMCOML;
824	<	char combuf[10240];
825	<	struct stat stb;
751	<	register char *cp;
752	<	register int i;
823	>	char basedir[128];
824	>	int dlen, alen;
825	>	register int j;
826
827	<	if (noaction)
828	<	return;
829	<	if (vdef(ARCHIVE) && strlen(vval(ARCHIVE)) > offset)
830	<	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;
827	>	if (arcnext == arcfirst)
828	>	return; /* nothing to do */
829	>	dirfile(basedir, vval(BASENAME));
830	>	dlen = strlen(basedir);
831		if (vdef(ARCHIVE)) { /* run archive command */
832	<	i = strlen(vval(ARCHIVE));
833	<	strncpy(combuf+offset-i, vval(ARCHIVE), i);
834	<	if (runcom(combuf+offset-i)) {
835	<	fprintf(stderr,
836	<	"%s: error running archive command on frames %d through %d\n",
837	<	progname, first, last);
832	>	alen = strlen(vval(ARCHIVE));
833	>	if (dlen) {
834	>	j = alen + dlen + 5;
835	>	strncpy(arcfirst-j, "cd ", 3);
836	>	strncpy(arcfirst-j+3, basedir, dlen);
837	>	(arcfirst-j)[dlen+3] = ';'; (arcfirst-j)[dlen+4] = ' ';
838	>	} else
839	>	j = alen;
840	>	strncpy(arcfirst-alen, vval(ARCHIVE), alen);
841	>	if (runcom(arcfirst-j)) {
842	>	fprintf(stderr, "%s: error running archive command\n",
843	>	progname);
844		quit(1);
845		}
846		}
847	+	if (dlen) {
848	+	j = RMCOML + dlen + 5;
849	+	strncpy(arcfirst-j, "cd ", 3);
850	+	strncpy(arcfirst-j+3, basedir, dlen);
851	+	(arcfirst-j)[dlen+3] = ';'; (arcfirst-j)[dlen+4] = ' ';
852	+	} else
853	+	j = RMCOML;
854		/* run remove command */
855	<	strncpy(combuf+offset-RMCOML, rmcom, RMCOML);
856	<	runcom(combuf+offset-RMCOML);
855	>	strncpy(arcfirst-RMCOML, rmcom, RMCOML);
856	>	runcom(arcfirst-j);
857	>	arcnext = arcfirst; /* reset argument list */
858		#undef RMCOML
859		}
860
861
862		int
863	<	dofilt(frame, vp, ep, rvr) /* filter frame */
863	>	dofilt(frame, rvr) /* filter frame */
864		int frame;
797	–	VIEW *vp;
798	–	char *ep;
865		int rvr;
866		{
867		extern int frecover();
868		static int iter = 0;
869	<	char fnbefore[128], fnafter[128];
869	>	double blurf;
870	>	int nblur = getblur(&blurf);
871	>	VIEW *vp = getview(frame);
872	>	char *ep = getexp(frame);
873	>	char fnbefore[128], fnafter[128], *fbase;
874		char combuf[1024], fname0[128], fname1[128];
875	<	int usepinterp, usepfilt;
875	>	int usepinterp, usepfilt, nora_rgbe;
876		int frseq[2];
877		/* check what is needed */
878	<	usepinterp = atoi(vval(MBLUR));
878	>	if (vp == NULL) {
879	>	fprintf(stderr,
880	>	"%s: unexpected error reading view for frame %d\n",
881	>	progname, frame);
882	>	quit(1);
883	>	}
884	>	if (ep == NULL) {
885	>	fprintf(stderr,
886	>	"%s: unexpected error reading exposure for frame %d\n",
887	>	progname, frame);
888	>	quit(1);
889	>	}
890	>	usepinterp = (nblur > 1);
891		usepfilt = pfiltalways \| ep==NULL;
892	+	if (ep != NULL && !strcmp(ep, "1"))
893	+	ep = "+0";
894	+	nora_rgbe = strcmp(vval(OVERSAMP),"1") \|\| ep==NULL \|\|
895	+	ep != '+' \|\| ep != '-' \|\| !isint(ep);
896		/* compute rendered views */
897		frseq[0] = frame - ((frame-1) % (vint(INTERP)+1));
898		frseq[1] = frseq[0] + vint(INTERP) + 1;
899	+	fbase = dirfile(NULL, vval(BASENAME));
900		if (frseq[1] > vint(END))
901		frseq[1] = vint(END);
902		if (frseq[1] == frame) { /* pfilt only */
903		frseq[0] = frseq[1];
904		usepinterp = 0; /* update what's needed */
905	<	usepfilt \|= vflt(OVERSAMP)>1.01 \|\| strcmp(ep,"1");
906	<	} else if (frseq[0] == frame) { /* no interpolation */
907	<	/* update what's needed */
908	<	if (!usepinterp)
909	<	usepfilt \|= vflt(OVERSAMP)>1.01 \|\| strcmp(ep,"1");
905	>	usepfilt \|= nora_rgbe;
906	>	} else if (frseq[0] == frame) { /* no interpolation needed */
907	>	if (!rvr && frame > 1+vint(INTERP)) { /* archive previous */
908	>	*arcnext++ = ' ';
909	>	sprintf(arcnext, fbase, frame-vint(INTERP)-1);
910	>	while (*arcnext) arcnext++;
911	>	strcpy(arcnext, ".unf");
912	>	arcnext += 4;
913	>	if (usepinterp \|\| vint(INTERP)) { /* and Z-buf */
914	>	*arcnext++ = ' ';
915	>	sprintf(arcnext, fbase, frame-vint(INTERP)-1);
916	>	while (*arcnext) arcnext++;
917	>	strcpy(arcnext, ".zbf");
918	>	arcnext += 4;
919	>	}
920	>	}
921	>	if (!usepinterp) /* update what's needed */
922	>	usepfilt \|= nora_rgbe;
923		} else /* interpolation needed */
924		usepinterp++;
925		if (frseq[1] >= astat.rnext) /* next batch unavailable */
#	Line 832 \| Line 932 \| int rvr;
932		if (usepinterp) { /* using pinterp */
933		if (rvr == 2 && recover(frseq[1])) /* recover after? */
934		return(1);
935	<	if (atoi(vval(MBLUR))) {
836	<	FILE fp; / motion blurring */
935	>	if (nblur > 1) { /* with pmblur */
936		sprintf(fname0, "%s/vw0%c", vval(DIRECTORY),
937		'a'+(iter%26));
839	–	if ((fp = fopen(fname0, "w")) == NULL) {
840	–	perror(fname0); quit(1);
841	–	}
842	–	fputs(VIEWSTR, fp);
843	–	fprintview(vp, fp);
844	–	putc('\n', fp); fclose(fp);
845	–	if ((vp = getview(frame+1)) == NULL) {
846	–	fprintf(stderr,
847	–	"%s: unexpected error reading view for frame %d\n",
848	–	progname, frame+1);
849	–	quit(1);
850	–	}
938		sprintf(fname1, "%s/vw1%c", vval(DIRECTORY),
939		'a'+(iter%26));
940	<	if ((fp = fopen(fname1, "w")) == NULL) {
941	<	perror(fname1); quit(1);
940	>	if (!noaction) {
941	>	FILE fp; / motion blurring */
942	>	if ((fp = fopen(fname0, "w")) == NULL) {
943	>	perror(fname0); quit(1);
944	>	}
945	>	fputs(VIEWSTR, fp);
946	>	fprintview(vp, fp);
947	>	putc('\n', fp); fclose(fp);
948	>	if ((vp = getview(frame+1)) == NULL) {
949	>	fprintf(stderr,
950	>	"%s: unexpected error reading view for frame %d\n",
951	>	progname, frame+1);
952	>	quit(1);
953	>	}
954	>	if ((fp = fopen(fname1, "w")) == NULL) {
955	>	perror(fname1); quit(1);
956	>	}
957	>	fputs(VIEWSTR, fp);
958	>	fprintview(vp, fp);
959	>	putc('\n', fp); fclose(fp);
960		}
856	–	fputs(VIEWSTR, fp);
857	–	fprintview(vp, fp);
858	–	putc('\n', fp); fclose(fp);
961		sprintf(combuf,
962	<	"(pmblur %s %d %s %s; rm -f %s %s) \| pinterp -B",
963	<	*sskip(vval(MBLUR)) ? sskip2(vval(MBLUR),1) : "1",
862	<	atoi(vval(MBLUR)),
962	>	"(pmblur %.3f %d %s %s; rm -f %s %s) \| pinterp -B -a",
963	>	blurf, nblur,
964		fname0, fname1, fname0, fname1);
965		iter++;
966		} else /* no blurring */
#	Line 867 \| Line 968 \| int rvr;
968		strcat(combuf, viewopt(vp));
969		if (vbool(RTRACE))
970		sprintf(combuf+strlen(combuf), " -ff -fr '%s -w0 %s'",
971	<	rendopt, vval(OCTREE));
971	>	rendopt+1, vval(OCTREE));
972		if (vdef(PINTERP))
973		sprintf(combuf+strlen(combuf), " %s", vval(PINTERP));
974		if (usepfilt)
975		sprintf(combuf+strlen(combuf), " %s", rresopt);
976		else
977	<	sprintf(combuf+strlen(combuf), " %s -e %s",
977	>	sprintf(combuf+strlen(combuf), " -a %s -e %s",
978		fresopt, ep);
979		sprintf(combuf+strlen(combuf), " %s.unf %s.zbf",
980		fnbefore, fnbefore);
#	Line 908 \| Line 1009 \| int rvr;
1009		} else { /* else just check it */
1010		if (rvr == 2)
1011		return(1);
1012	<	sprintf(combuf, "ra_rgbe -r %s.unf", fnbefore);
1012	>	sprintf(combuf, "ra_rgbe -e %s -r %s.unf", ep, fnbefore);
1013		}
1014		/* output file name */
1015		sprintf(fname0, vval(BASENAME), frame);
#	Line 934 \| Line 1035 \| int n;
1035		fclose(viewfp);
1036		viewfp = NULL;
1037		viewnum = 0;
1038	<	copystruct(&curview, &stdview);
1038	>	curview = stdview;
1039		}
1040		return(NULL);
1041		}
1042	<	if (viewfp == NULL) { /* open file */
1042	>	if (viewfp == NULL) { /* open file */
1043		if ((viewfp = fopen(vval(VIEWFILE), "r")) == NULL) {
1044		perror(vval(VIEWFILE));
1045		quit(1);
1046		}
1047	<	} else if (n < viewnum) { /* rewind file */
1047	>	} else if (n > 0 && n < viewnum) { /* rewind file */
1048	>	if (viewnum == 1 && feof(viewfp))
1049	>	return(&curview); /* just one view */
1050		if (fseek(viewfp, 0L, 0) == EOF) {
1051		perror(vval(VIEWFILE));
1052		quit(1);
1053		}
1054	<	copystruct(&curview, &stdview);
1054	>	curview = stdview;
1055		viewnum = 0;
1056		}
1057	+	if (n < 0) { /* get next view */
1058	+	register int c = getc(viewfp);
1059	+	if (c == EOF)
1060	+	return((VIEW )NULL); / that's it */
1061	+	ungetc(c, viewfp);
1062	+	n = viewnum + 1;
1063	+	}
1064		while (n > viewnum) { /* scan to desired view */
1065		if (fgets(linebuf, sizeof(linebuf), viewfp) == NULL)
1066	<	return(NULL);
1066	>	return(viewnum==1 ? &curview : (VIEW *)NULL);
1067		if (isview(linebuf) && sscanview(&curview, linebuf) > 0)
1068		viewnum++;
1069		}
#	Line 964 \| Line 1074 \| int n;
1074		int
1075		countviews() /* count views in view file */
1076		{
1077	<	register int n = 0;
1077	>	int n;
1078
1079	<	while (getview(n+1) != NULL)
1079	>	if (getview(n=1) == NULL)
1080	>	return(0);
1081	>	while (getview(-1) != NULL)
1082		n++;
1083		return(n);
1084		}
#	Line 986 \| Line 1098 \| int n;
1098		if (n == 0) { /* signal to close file */
1099		if (expfp != NULL) {
1100		fclose(expfp);
1101	+	free((void *)exppos);
1102		expfp = NULL;
1103		}
1104		return(NULL);
1105	<	}
1105	>	} else if (n > vint(END)) /* request past end (error?) */
1106	>	return(NULL);
1107		if (!vdef(EXPOSURE)) /* no setting (auto) */
1108		return(NULL);
1109		if (isflt(vval(EXPOSURE))) /* always the same */
#	Line 1027 \| Line 1141 \| int n;
1141		}
1142		curfrm++;
1143		cp = fskip(expval); /* check format */
1144	<	if (cp == NULL \|\| *cp != '\n') {
1144	>	if (cp != NULL)
1145	>	while (isspace(*cp))
1146	>	*cp++ = '\0';
1147	>	if (cp == NULL \|\| *cp) {
1148		fprintf(stderr,
1149		"%s: exposure format error on line %d\n",
1150		vval(EXPOSURE), curfrm);
1151		quit(1);
1152		}
1036	–	*cp = '\0';
1153		}
1154		return(expval); /* return value */
1155		}
#	Line 1063 \| Line 1179 \| int pn;
1179		int status;
1180		{
1181		register PROC *pp;
1182	+	register struct pslot *psl;
1183
1184		pp = ps->proc + pn;
1185		if (pp->elen) { /* pass errors */
#	Line 1074 \| Line 1191 \| int status;
1191		if (ps->hostname[0])
1192		status = 1; /* because rsh doesn't return status */
1193		}
1194	+	lastpserver = NULL;
1195	+	psl = findpslot(pp->pid); /* check for bruncom() slot */
1196	+	if (psl->pid) {
1197	+	if (status) {
1198	+	if (psl->rcvf != NULL) /* attempt recovery */
1199	+	status = (*psl->rcvf)(psl->fout);
1200	+	if (status) {
1201	+	fprintf(stderr,
1202	+	"%s: error rendering frame %d\n",
1203	+	progname, psl->fout);
1204	+	quit(1);
1205	+	}
1206	+	lastpserver = ps;
1207	+	}
1208	+	psl->pid = 0; /* free process slot */
1209	+	} else if (status)
1210	+	lastpserver = ps;
1211		freestr(pp->com); /* free command string */
1078	–	lastpid = pp->pid; /* record PID for bwait() */
1079	–	lastpserver = ps; /* record server for serverdown() */
1212		return(status);
1213		}
1214
#	Line 1084 \| Line 1216 \| int status;
1216		int
1217		serverdown() /* check status of last process server */
1218		{
1219	+	if (lastpserver == NULL \|\| !lastpserver->hostname[0])
1220	+	return(0);
1221		if (pserverOK(lastpserver)) /* server still up? */
1222		return(0);
1223		delpserver(lastpserver); /* else delete it */
#	Line 1110 \| Line 1244 \| *int (rf)();**
1244		printf("\t%s\n", com); /* echo command */
1245		return(0);
1246		}
1247	<	/* else start it when we can */
1248	<	while ((pid = startjob(NULL, savestr(com), donecom)) == -1)
1247	>	com = savestr(com); /* else start it when we can */
1248	>	while ((pid = startjob(NULL, com, donecom)) == -1)
1249		bwait(1);
1250		if (!silent) { /* echo command */
1251		PSERVER *ps;
#	Line 1133 \| Line 1267 \| *bwait(ncoms) / wait for batch job(s) to finish /*
1267		int ncoms;
1268		{
1269		int status;
1136	–	register struct pslot *psl;
1270
1271		if (noaction)
1272		return;
1273		while ((status = wait4job(NULL, -1)) != -1) {
1274	<	psl = findpslot(lastpid);
1275	<	if (status) { /* attempt recovery */
1276	<	serverdown(); /* check server */
1144	<	if (psl->rcvf == NULL \|\| (*psl->rcvf)(psl->fout)) {
1145	<	fprintf(stderr,
1146	<	"%s: error rendering frame %d\n",
1147	<	progname, psl->fout);
1148	<	quit(1);
1149	<	}
1150	<	}
1151	<	psl->pid = 0; /* free process slot */
1152	<	if (!--ncoms)
1153	<	return; /* done enough */
1274	>	serverdown(); /* update server status */
1275	>	if (--ncoms == 0)
1276	>	break; /* done enough */
1277		}
1278		}
1279
#	Line 1162 \| Line 1285 \| int maxcopies;
1285		{
1286		int retstatus = 0;
1287		int hostcopies;
1288	<	char com1buf[10240], com1, endcom1;
1288	>	char buf[10240], com1, s;
1289		int status;
1290	+	int pfd;
1291	+	register int n;
1292		register PSERVER *ps;
1293
1294		if (!silent)
#	Line 1175 \| Line 1300 \| int maxcopies;
1300		for (ps = pslist; ps != NULL; ps = ps->next) {
1301		hostcopies = 0;
1302		if (maxcopies > 1 && ps->nprocs > 1 && ppins != NULL) {
1303	<	strcpy(com1=com1buf, com); /* build -PP command */
1303	>	strcpy(com1=buf, com); /* build -PP command */
1304		sprintf(com1+(ppins-com), " -PP %s/%s.persist",
1305		vval(DIRECTORY), phostname(ps));
1306	+	unlink(com1+(ppins-com)+5);
1307		strcat(com1, ppins);
1308	<	endcom1 = com1 + strlen(com1);
1183	<	sprintf(endcom1, "; kill `sed -n '1s/^[^ ]* //p' %s/%s.persist`",
1184	<	vval(DIRECTORY), phostname(ps));
1185	<	} else {
1308	>	} else
1309		com1 = com;
1310	<	endcom1 = NULL;
1310	>	while (maxcopies > 0) {
1311	>	s = savestr(com1);
1312	>	if (startjob(ps, s, donecom) != -1) {
1313	>	sleep(20);
1314	>	hostcopies++;
1315	>	maxcopies--;
1316	>	} else {
1317	>	freestr(s);
1318	>	break;
1319	>	}
1320		}
1189	–	while (maxcopies > 0 &&
1190	–	startjob(ps, savestr(com1), donecom) != -1) {
1191	–	sleep(10);
1192	–	hostcopies++;
1193	–	maxcopies--;
1194	–	if (endcom1 != NULL)
1195	–	*endcom1 = '\0';
1196	–	}
1321		if (!silent && hostcopies) {
1322		if (hostcopies > 1)
1323		printf("\t%d duplicate processes", hostcopies);
#	Line 1205 \| Line 1329 \| int maxcopies;
1329		}
1330		/* wait for jobs to finish */
1331		while ((status = wait4job(NULL, -1)) != -1)
1332	<	if (status)
1333	<	retstatus += !serverdown(); /* check server */
1332	>	retstatus += status && !serverdown();
1333	>	/* terminate parallel rpict's */
1334	>	for (ps = pslist; ps != NULL; ps = ps->next) {
1335	>	sprintf(buf, "%s/%s.persist", vval(DIRECTORY), phostname(ps));
1336	>	if ((pfd = open(buf, O_RDONLY)) >= 0) {
1337	>	n = read(pfd, buf, sizeof(buf)-1); /* get PID */
1338	>	buf[n] = '\0';
1339	>	close(pfd);
1340	>	for (n = 0; buf[n] && !isspace(buf[n]); n++)
1341	>	;
1342	>	/* terminate */
1343	>	sprintf(buf, "kill -ALRM %d", atoi(buf+n));
1344	>	wait4job(ps, startjob(ps, buf, NULL));
1345	>	}
1346	>	}
1347		return(retstatus);
1348		}
1349
#	Line 1227 \| Line 1364 \| *rmfile(fn) / remove a file /*
1364		char *fn;
1365		{
1366		if (!silent)
1367	<	#ifdef MSDOS
1367	>	#ifdef _WIN32
1368		printf("\tdel %s\n", fn);
1369		#else
1370		printf("\trm -f %s\n", fn);
#	Line 1244 \| Line 1381 \| int vc;
1381		fprintf(stderr, "%s: bad value for variable '%s'\n",
1382		progname, vnam(vc));
1383		quit(1);
1384	+	}
1385	+
1386	+
1387	+	char *
1388	+	dirfile(df, path) /* separate path into directory and file */
1389	+	char *df;
1390	+	register char *path;
1391	+	{
1392	+	register int i;
1393	+	int psep;
1394	+
1395	+	for (i = 0, psep = -1; path[i]; i++)
1396	+	if (path[i] == '/')
1397	+	psep = i;
1398	+	if (df != NULL) {
1399	+	if (psep == 0) {
1400	+	df[0] = '/';
1401	+	df[1] = '\0';
1402	+	} else if (psep > 0) {
1403	+	strncpy(df, path, psep);
1404	+	df[psep] = '\0';
1405	+	} else
1406	+	df[0] = '\0';
1407	+	}
1408	+	return(path+psep+1);
1409	+	}
1410	+
1411	+
1412	+	int
1413	+	getblur(double bf) / get # blur samples (and fraction) */
1414	+	{
1415	+	double blurf;
1416	+	int nblur;
1417	+	char *s;
1418	+
1419	+	if (!vdef(MBLUR)) {
1420	+	if (bf != NULL)
1421	+	*bf = 0.0;
1422	+	return(0);
1423	+	}
1424	+	blurf = atof(vval(MBLUR));
1425	+	if (blurf < 0.0)
1426	+	blurf = 0.0;
1427	+	if (bf != NULL)
1428	+	*bf = blurf;
1429	+	if (blurf <= FTINY)
1430	+	return(0);
1431	+	s = sskip(vval(MBLUR));
1432	+	if (!*s)
1433	+	return(DEF_NBLUR);
1434	+	nblur = atoi(s);
1435	+	if (nblur <= 0)
1436	+	return(1);
1437	+	return(nblur);
1438		}

Diff Legend

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

Comparing ray/src/util/ranimate.c (file contents): Revision 2.6 by greg, Tue Jan 23 17:01:33 1996 UTC vs. Revision 2.40 by schorsch, Mon Jul 21 22:30:19 2003 UTC

Diff Legend

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.6 by greg, Tue Jan 23 17:01:33 1996 UTC vs.
Revision 2.40 by schorsch, Mon Jul 21 22:30:19 2003 UTC