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

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.7 by greg, Wed Jan 24 12:22:15 1996 UTC vs.
Revision 2.48 by greg, Tue Jan 18 03:59:41 2005 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 <stdio.h>
19		#include <ctype.h>
13	–	#include <sys/types.h>
20		#include <sys/stat.h>
21	+	#include <time.h>
22	+	#include <signal.h>
23	+
24	+	#include "platform.h"
25	+	#include "paths.h"
26	+	#include "standard.h"
27		#include "view.h"
28		#include "vars.h"
29		#include "netproc.h"
30	<	/* input variables */
31	<	#define HOST 0 /* rendering host machine */
32	<	#define RENDER 1 /* rendering options */
33	<	#define PFILT 2 /* pfilt options */
34	<	#define PINTERP 3 /* pinterp options */
35	<	#define OCTREE 4 /* octree file name */
36	<	#define DIRECTORY 5 /* working (sub)directory */
37	<	#define BASENAME 6 /* output image base name */
38	<	#define VIEWFILE 7 /* animation frame views */
39	<	#define START 8 /* starting frame number */
40	<	#define END 9 /* ending frame number */
41	<	#define RIF 10 /* rad input file */
30	>	/* default blur samples */
31	>	#ifndef DEF_NBLUR
32	>	#define DEF_NBLUR 5
33	>	#endif
34	>	/* default remote shell */
35	>	#define REMSH "rsh"
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 DBLUR 3 /* depth of field blur */
41	>	#define DIRECTORY 4 /* working (sub)directory */
42	>	#define DISKSPACE 5 /* how much disk space to use */
43	>	#define END 6 /* ending frame number */
44	>	#define EXPOSURE 7 /* how to compute exposure */
45	>	#define HOST 8 /* rendering host machine */
46	>	#define INTERP 9 /* # frames to interpolate */
47	>	#define MBLUR 10 /* motion blur parameters */
48		#define NEXTANIM 11 /* next animation file */
49	<	#define ANIMATE 12 /* animation command */
50	<	#define TRANSFER 13 /* frame transfer command */
51	<	#define ARCHIVE 14 /* archiving command */
52	<	#define INTERP 15 /* # frames to interpolate */
53	<	#define OVERSAMP 16 /* # times to oversample image */
54	<	#define MBLUR 17 /* samples for motion blur */
55	<	#define RTRACE 18 /* use rtrace with pinterp? */
56	<	#define DISKSPACE 19 /* how much disk space to use */
57	<	#define RESOLUTION 20 /* desired final resolution */
58	<	#define EXPOSURE 21 /* how to compute exposure */
49	>	#define OCTREE 12 /* octree file name */
50	>	#define OVERSAMP 13 /* # times to oversample image */
51	>	#define PFILT 14 /* pfilt options */
52	>	#define PINTERP 15 /* pinterp options */
53	>	#define RENDER 16 /* rendering options */
54	>	#define RESOLUTION 17 /* desired final resolution */
55	>	#define RIF 18 /* rad input file */
56	>	#define RSH 19 /* remote shell script or program */
57	>	#define RTRACE 20 /* use rtrace with pinterp? */
58	>	#define START 21 /* starting frame number */
59	>	#define TRANSFER 22 /* frame transfer command */
60	>	#define VIEWFILE 23 /* animation frame views */
61
62	<	int NVARS = 22; /* total number of variables */
62	>	int NVARS = 24; /* total number of variables */
63
64		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},
65		{"ANIMATE", 2, 0, NULL, onevalue},
58	–	{"TRANSFER", 2, 0, NULL, onevalue},
66		{"ARCHIVE", 2, 0, NULL, onevalue},
67	+	{"BASENAME", 3, 0, NULL, onevalue},
68	+	{"DBLUR", 2, 0, NULL, onevalue},
69	+	{"DIRECTORY", 3, 0, NULL, onevalue},
70	+	{"DISKSPACE", 3, 0, NULL, fltvalue},
71	+	{"END", 2, 0, NULL, intvalue},
72	+	{"EXPOSURE", 3, 0, NULL, onevalue},
73	+	{"host", 4, 0, NULL, NULL},
74		{"INTERPOLATE", 3, 0, NULL, intvalue},
61	–	{"OVERSAMPLE", 2, 0, NULL, fltvalue},
75		{"MBLUR", 2, 0, NULL, onevalue},
76	<	{"RTRACE", 2, 0, NULL, boolvalue},
77	<	{"DISKSPACE", 3, 0, NULL, fltvalue},
76	>	{"NEXTANIM", 3, 0, NULL, onevalue},
77	>	{"OCTREE", 3, 0, NULL, onevalue},
78	>	{"OVERSAMPLE", 2, 0, NULL, fltvalue},
79	>	{"pfilt", 2, 0, NULL, catvalues},
80	>	{"pinterp", 2, 0, NULL, catvalues},
81	>	{"render", 3, 0, NULL, catvalues},
82		{"RESOLUTION", 3, 0, NULL, onevalue},
83	<	{"EXPOSURE", 3, 0, NULL, onevalue},
83	>	{"RIF", 3, 0, NULL, onevalue},
84	>	{"RSH", 3, 0, NULL, onevalue},
85	>	{"RTRACE", 2, 0, NULL, boolvalue},
86	>	{"START", 2, 0, NULL, intvalue},
87	>	{"TRANSFER", 2, 0, NULL, onevalue},
88	>	{"VIEWFILE", 2, 0, NULL, onevalue},
89		};
90
91		#define SFNAME "STATUS" /* status file name */
#	Line 84 \| Line 106 \| *int nowarn = 0; / turn warnings off? /*
106		int silent = 0; /* silent mode? */
107		int noaction = 0; /* take no action? */
108
109	<	char rendopt[2048] = ""; /* rendering options */
109	>	char remsh; / remote shell program/script */
110	>	char rendopt[2048]; /* rendering options */
111		char rresopt[32]; /* rendering resolution options */
112		char fresopt[32]; /* filter resolution options */
113		int pfiltalways; /* always use pfilt? */
#	Line 99 \| Line 122 \| struct pslot {
122		} pslot; / process slots */
123		int npslots; /* number of process slots */
124
102	–	int lastpid; /* ID of last completed background process */
103	–	PSERVER lastpserver; / last process server used */
104	–
125		#define phostname(ps) ((ps)->hostname[0] ? (ps)->hostname : astat.host)
126	+	PSERVER lastpserver; / last process server with error */
127
128	<	struct pslot *findpslot();
128	>	static struct pslot * findpslot(int pid);
129	>	static void checkdir(void);
130	>	static VIEW * getview(int n);
131
132	<	VIEW *getview();
133	<	char *getexp();
132	>	static char * dirfile(char df, register char path);
133	>	static char * getexp(int n);
134	>	static int getblur(double mbf, double dbf);
135	>	static int getastat(void);
136	>	static void getradfile(char *rfargs);
137	>	static void badvalue(int vc);
138	>	static int rmfile(char *fn);
139	>	static int runcom(char *cs);
140	>	static int pruncom(char com, char ppins, int maxcopies);
141	>	static void bwait(int ncoms);
142	>	static int bruncom(char com, int fout, int (rf)());
143	>	static int serverdown(void);
144	>	static pscompfunc donecom;
145	>	static int countviews(void);
146	>	static int dofilt(int frame, int rvr);
147	>	static void archive(void);
148	>	static int frecover(int frame);
149	>	static int recover(int frame);
150	>	static void sethosts(void);
151	>	static void walkwait(int first, int last, char *vfn);
152	>	static void animrend(int frame, VIEW *vp);
153	>	static void transferframes(void);
154	>	static void filterframes(void);
155	>	static void renderframes(int nframes);
156	>	static void animate(void);
157	>	static void setdefaults(void);
158	>	static void putastat(void);
159
160
161	<	main(argc, argv)
162	<	int argc;
163	<	char *argv[];
161	>	int
162	>	main(
163	>	int argc,
164	>	char *argv[]
165	>	)
166		{
167		int explicate = 0;
168		int i;
#	Line 140 \| Line 190 \| *char argv[];**
190		cfname = argv[i];
191		/* load variables */
192		loadvars(cfname);
193	+	/* check variables */
194	+	checkvalues();
195		/* did we get DIRECTORY? */
196		checkdir();
197		/* check status */
#	Line 166 \| Line 218 \| *char argv[];**
218		argv[i] = vval(NEXTANIM); /* just change input file */
219		if (!silent)
220		printargs(argc, argv, stdout);
221	<	execvp(progname, argv); /* pass to next */
222	<	quit(1); /* shouldn't return */
221	>	if ((argv[0] = getpath(progname,getenv("PATH"),X_OK)) == NULL)
222	>	fprintf(stderr, "%s: command not found\n", progname);
223	>	else
224	>	execv(progname, argv);
225	>	quit(1);
226		}
227		quit(0);
228	+	return 0; /* pro forma return */
229		userr:
230		fprintf(stderr, "Usage: %s [-s][-n][-w][-e] anim_file\n", progname);
231		quit(1);
232	+	return 1; /* pro forma return */
233		}
234
235
236	<	getastat() /* check/set animation status */
236	>	static int
237	>	getastat(void) /* check/set animation status */
238		{
239	<	char buf[256];
239	>	char sfname[256];
240		FILE *fp;
241
242	<	sprintf(buf, "%s/%s", vval(DIRECTORY), SFNAME);
243	<	if ((fp = fopen(buf, "r")) == NULL) {
242	>	sprintf(sfname, "%s/%s", vval(DIRECTORY), SFNAME);
243	>	if ((fp = fopen(sfname, "r")) == NULL) {
244		if (errno != ENOENT) {
245	<	perror(buf);
245	>	perror(sfname);
246		return(-1);
247		}
248		astat.rnext = astat.fnext = astat.tnext = 0;
#	Line 204 \| Line 262 \| *getastat() / check/set animation status /*
262		goto fmterr;
263		fclose(fp);
264		if (astat.pid != 0) { /* thinks it's still running */
265	<	gethostname(buf, sizeof(buf));
208	<	if (strcmp(buf, astat.host)) {
265	>	if (strcmp(myhostname(), astat.host)) {
266		fprintf(stderr,
267		"%s: process %d may still be running on host %s\n",
268		progname, astat.pid, astat.host);
#	Line 218 \| Line 275 \| *getastat() / check/set animation status /*
275		}
276		/* assume it is dead */
277		}
278	<	if (strcmp(cfname, astat.cfname) && astat.tnext != 0) { /* other's */
278	>	if (strcmp(cfname, astat.cfname) && astat.pid != 0) { /* other's */
279		fprintf(stderr, "%s: unfinished job \"%s\"\n",
280		progname, astat.cfname);
281		return(-1);
282		}
283	+	/* check control file mods. */
284	+	if (!nowarn && fdate(cfname) > fdate(sfname))
285	+	fprintf(stderr,
286	+	"%s: warning - control file modified since last run\n",
287	+	progname);
288		setours: /* set our values */
289	<	gethostname(astat.host, sizeof(astat.host));
289	>	strcpy(astat.host, myhostname());
290		astat.pid = getpid();
291		strcpy(astat.cfname, cfname);
292		return(0);
293		fmterr:
294		fprintf(stderr, "%s: format error in status file \"%s\"\n",
295	<	progname, buf);
295	>	progname, sfname);
296		fclose(fp);
297		return(-1);
298		}
299
300
301	<	putastat() /* put out current status */
301	>	static void
302	>	putastat(void) /* put out current status */
303		{
304		char buf[256];
305		FILE *fp;
#	Line 258 \| Line 321 \| *putastat() / put out current status /*
321		}
322
323
324	<	checkdir() /* make sure we have our directory */
324	>	static void
325	>	checkdir(void) /* make sure we have our directory */
326		{
327		struct stat stb;
328
#	Line 280 \| Line 344 \| *checkdir() / make sure we have our directory /*
344		}
345
346
347	<	setdefaults() /* set default values */
347	>	static void
348	>	setdefaults(void) /* set default values */
349		{
350	+	extern char *atos();
351	+	int decades;
352		char buf[256];
353
354		if (vdef(ANIMATE)) {
#	Line 315 \| Line 382 \| *setdefaults() / set default values /*
382		quit(1);
383		}
384		if (!vdef(BASENAME)) {
385	<	sprintf(buf, "%s/frame%%03d", vval(DIRECTORY));
385	>	decades = (int)log10((double)vint(END)) + 1;
386	>	if (decades < 3) decades = 3;
387	>	sprintf(buf, "%s/frame%%0%dd", vval(DIRECTORY), decades);
388		vval(BASENAME) = savqstr(buf);
389		vdef(BASENAME)++;
390		}
#	Line 347 \| Line 416 \| *setdefaults() / set default values /*
416		vval(DISKSPACE) = "100";
417		vdef(DISKSPACE)++;
418		}
419	+	if (!vdef(RSH)) {
420	+	vval(RSH) = REMSH;
421	+	vdef(RSH)++;
422	+	}
423	+	/* locate remote shell program */
424	+	atos(buf, sizeof(buf), vval(RSH));
425	+	if ((remsh = getpath(buf, getenv("PATH"), X_OK)) != NULL)
426	+	remsh = savqstr(remsh);
427	+	else
428	+	remsh = vval(RSH); /* will generate error if used */
429	+
430		/* append rendering options */
431		if (vdef(RENDER))
432		sprintf(rendopt+strlen(rendopt), " %s", vval(RENDER));
433		}
434
435
436	<	sethosts() /* set up process servers */
436	>	static void
437	>	sethosts(void) /* set up process servers */
438		{
439		extern char *iskip();
440		char buf[256], dir, uname;
#	Line 408 \| Line 489 \| *sethosts() / set up process servers /*
489		}
490		}
491
492	<
493	<	getradfile(rfargs) /* run rad and get needed variables */
413	<	char *rfargs;
492	>	static void
493	>	getradfile(char rfargs) / run rad and get needed variables */
494		{
495		static short mvar[] = {OCTREE,PFILT,RESOLUTION,EXPOSURE,-1};
496		char combuf[256];
497		register int i;
498		register char *cp;
499	+	char *pippt = NULL;
500		/* create rad command */
501		sprintf(rendopt, " @%s/render.opt", vval(DIRECTORY));
502		sprintf(combuf,
503		"rad -v 0 -s -e -w %s OPTFILE=%s \| egrep '^[ \t]*(NOMATCH",
504		rfargs, rendopt+2);
505		cp = combuf;
506	<	while (cp) cp++; / match unset variables */
506	>	while (*cp) {
507	>	if (*cp == '\|') pippt = cp;
508	>	cp++;
509	>	} /* match unset variables */
510		for (i = 0; mvar[i] >= 0; i++)
511		if (!vdef(mvar[i])) {
512		*cp++ = '\|';
513		strcpy(cp, vnam(mvar[i]));
514		while (*cp) cp++;
515	+	pippt = NULL;
516		}
517	<	sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
518	<	cp += 11; /* point to file name */
519	<	if (system(combuf)) {
520	<	fprintf(stderr, "%s: error executing rad command:\n\t%s\n",
521	<	progname, combuf);
437	<	quit(1);
517	>	if (pippt != NULL)
518	>	strcpy(pippt, "> " NULL_DEVICE); /* nothing to match */
519	>	else {
520	>	sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
521	>	cp += 11; /* point to file name */
522		}
523	<	loadvars(cp); /* load variables and remove file */
524	<	unlink(cp);
523	>	system(combuf); /* ignore exit code */
524	>	if (pippt == NULL) { /* load variables and remove file */
525	>	loadvars(cp);
526	>	unlink(cp);
527	>	}
528		}
529
530
531	<	animate() /* run animation */
531	>	static void
532	>	animate(void) /* run animation */
533		{
534		int xres, yres;
535		float pa, mult;
#	Line 452 \| Line 540 \| *animate() / run animation /*
540		i = sscanf(vval(RESOLUTION), "%d %d %f", &xres, &yres, &pa);
541		mult = vflt(OVERSAMP);
542		if (i == 3) {
543	<	sprintf(rresopt, "-x %d -y %d -pa %f", (int)(mult*xres),
543	>	sprintf(rresopt, "-x %d -y %d -pa %.3f", (int)(mult*xres),
544		(int)(mult*yres), pa);
545	<	sprintf(fresopt, "-x %d -y %d -pa %f", xres, yres, pa);
545	>	sprintf(fresopt, "-x %d -y %d -pa %.3f", xres, yres, pa);
546		} else if (i) {
547		if (i == 1) yres = xres;
548		sprintf(rresopt, "-x %d -y %d", (int)(mult*xres),
#	Line 471 \| Line 559 \| *animate() / run animation /*
559		progname, vnam(INTERP));
560		vval(INTERP) = "0";
561		}
562	<	if (atoi(vval(MBLUR))) { /* can't handle this yet */
562	>	if (strcmp(vval(MBLUR),"0")) { /* can't handle this */
563		if (!nowarn)
564		fprintf(stderr,
565		"%s: resetting %s=0 for animation\n",
#	Line 481 \| Line 569 \| *animate() / run animation /*
569		}
570		/* figure # frames per batch */
571		d1 = multxresmultyres4; /* space for orig. picture */
572	<	if ((i=vint(INTERP)) \|\| atoi(vval(MBLUR)))
573	<	d1 += multxresmultyres4; /* space for z-buffer */
572	>	if ((i=vint(INTERP)) \|\| getblur(NULL, NULL) > 1)
573	>	d1 += multxresmultyressizeof(float); /* Z-buffer */
574		d2 = xresyres4; /* space for final picture */
575		frames_batch = (i+1)(vflt(DISKSPACE)1048576.-d1)/(d1+i*d2);
576		if (frames_batch < i+2) {
#	Line 491 \| Line 579 \| *animate() / run animation /*
579		quit(1);
580		}
581		/* initialize archive argument list */
582	<	i = 16;
495	<	if (vdef(ARCHIVE) && strlen(vval(ARCHIVE)) > i)
496	<	i = strlen(vval(ARCHIVE));
582	>	i = vdef(ARCHIVE) ? strlen(vval(ARCHIVE))+132 : 132;
583		arcnext = arcfirst = arcargs + i;
584		/* initialize status file */
585		if (astat.rnext == 0)
#	Line 514 \| Line 600 \| *animate() / run animation /*
600		}
601
602
603	<	renderframes(nframes) /* render next nframes frames */
604	<	int nframes;
603	>	static void
604	>	renderframes(int nframes) /* render next nframes frames */
605		{
606		static char vendbuf[16];
607		VIEW *vp;
#	Line 571 \| Line 657 \| int nframes;
657		}
658
659
660	<	filterframes() /* catch up with filtering */
660	>	static void
661	>	filterframes(void) /* catch up with filtering */
662		{
576	–	VIEW *vp;
663		register int i;
664
665		if (astat.tnext < astat.fnext) /* other work to do first */
666		return;
667		/* filter each view */
668	<	for (i = astat.fnext; i < astat.rnext; i++) {
669	<	if ((vp = getview(i)) == NULL) { /* get view i */
670	<	fprintf(stderr,
585	<	"%s: unexpected error reading view for frame %d\n",
586	<	progname, i);
587	<	quit(1);
588	<	}
589	<	dofilt(i, vp, getexp(i), 0); /* filter frame */
590	<	}
668	>	for (i = astat.fnext; i < astat.rnext; i++)
669	>	dofilt(i, 0);
670	>
671		bwait(0); /* wait for filter processes */
672		archive(); /* archive originals */
673		astat.fnext = i; /* update status */
#	Line 595 \| Line 675 \| *filterframes() / catch up with filtering /*
675		}
676
677
678	<	transferframes() /* catch up with picture transfers */
678	>	static void
679	>	transferframes(void) /* catch up with picture transfers */
680		{
681	<	char combuf[10240];
681	>	char combuf[10240], *fbase;
682		register char *cp;
683		register int i;
684
#	Line 608 \| Line 689 \| *transferframes() / catch up with picture transfers**
689		putastat(); /* update status */
690		return;
691		}
692	<	strcpy(combuf, vval(TRANSFER)); /* start transfer command */
693	<	cp = combuf + strlen(combuf);
692	>	strcpy(combuf, "cd "); /* start transfer command */
693	>	fbase = dirfile(cp = combuf+3, vval(BASENAME));
694	>	if (*cp) {
695	>	while (*++cp) ;
696	>	cp++ = ';'; cp++ = ' ';
697	>	} else
698	>	cp = combuf;
699	>	strcpy(cp, vval(TRANSFER));
700	>	while (*cp) cp++;
701		/* make argument list */
702		for (i = astat.tnext; i < astat.fnext; i++) {
703		*cp++ = ' ';
704	<	sprintf(cp, vval(BASENAME), i);
704	>	sprintf(cp, fbase, i);
705		while (*cp) cp++;
706		strcpy(cp, ".pic");
707		cp += 4;
#	Line 628 \| Line 716 \| *transferframes() / catch up with picture transfers**
716		}
717
718
719	<	animrend(frame, vp) /* start animation frame */
720	<	int frame;
721	<	VIEW *vp;
719	>	static void
720	>	animrend( /* start animation frame */
721	>	int frame,
722	>	VIEW *vp
723	>	)
724		{
635	–	extern int recover();
725		char combuf[2048];
726		char fname[128];
727
#	Line 646 \| Line 735 \| *VIEW vp;**
735		}
736
737
738	<	walkwait(first, last, vfn) /* walk-through frames */
739	<	int first, last;
740	<	char *vfn;
738	>	static void
739	>	walkwait( /* walk-through frames */
740	>	int first,
741	>	int last,
742	>	char *vfn
743	>	)
744		{
745	+	double mblurf, dblurf;
746	+	int nblur = getblur(&mblurf, &dblurf);
747		char combuf[2048];
748	<	char *inspoint;
748	>	register char *inspoint;
749		register int i;
750
751		if (!noaction && vint(INTERP)) /* create dummy frames */
#	Line 662 \| Line 756 \| *char vfn;**
756		close(open(combuf, O_RDONLY\|O_CREAT, 0666));
757		}
758		/* create command */
759	<	sprintf(combuf, "rpict%s -w0", rendopt);
760	<	if (vint(INTERP) \|\| atoi(vval(MBLUR)))
761	<	sprintf(combuf+strlen(combuf), " -z %s.zbf", vval(BASENAME));
762	<	sprintf(combuf+strlen(combuf), " -o %s.unf %s -S %d",
759	>	sprintf(combuf, "rpict%s%s -w0", rendopt,
760	>	viewopt(getview(first>1 ? first-1 : 1)));
761	>	inspoint = combuf;
762	>	while (*inspoint) inspoint++;
763	>	if (nblur) {
764	>	sprintf(inspoint, " -pm %.3f", mblurf/nblur);
765	>	while (*inspoint) inspoint++;
766	>	sprintf(inspoint, " -pd %.3f", dblurf/nblur);
767	>	while (*inspoint) inspoint++;
768	>	}
769	>	if (nblur > 1 \|\| vint(INTERP)) {
770	>	sprintf(inspoint, " -z %s.zbf", vval(BASENAME));
771	>	while (*inspoint) inspoint++;
772	>	}
773	>	sprintf(inspoint, " -o %s.unf %s -S %d",
774		vval(BASENAME), rresopt, first);
775	<	inspoint = combuf + strlen(combuf);
775	>	while (*inspoint) inspoint++;
776		sprintf(inspoint, " %s < %s", vval(OCTREE), vfn);
777		/* run in parallel */
778		i = (last-first+1)/(vint(INTERP)+1);
#	Line 687 \| Line 792 \| *char vfn;**
792		}
793
794
795	<	int
796	<	recover(frame) /* recover the specified frame */
692	<	int frame;
795	>	static int
796	>	recover(int frame) /* recover the specified frame */
797		{
798		static int rfrm; / list of recovered frames */
799		static int nrfrms = 0;
800	+	double mblurf, dblurf;
801	+	int nblur = getblur(&mblurf, &dblurf);
802		char combuf[2048];
803		char fname[128];
804		register char *cp;
#	Line 708 \| Line 814 \| int frame;
814		vval(ANIMATE), frame, rendopt);
815		else
816		sprintf(combuf, "rpict%s -w0", rendopt);
817	<	cp = combuf + strlen(combuf);
818	<	if (vint(INTERP) \|\| atoi(vval(MBLUR))) {
817	>	cp = combuf;
818	>	while (*cp) cp++;
819	>	if (nblur) {
820	>	sprintf(cp, " -pm %.3f", mblurf/nblur);
821	>	while (*cp) cp++;
822	>	sprintf(cp, " -pd %.3f", dblurf/nblur);
823	>	while (*cp) cp++;
824	>	}
825	>	if (nblur > 1 \|\| vint(INTERP)) {
826		sprintf(cp, " -z %s.zbf", fname);
827		while (*cp) cp++;
828		}
#	Line 723 \| Line 836 \| int frame;
836		return(1);
837		/* add frame to recovered list */
838		if (nrfrms)
839	<	rfrm = (int )realloc((char )rfrm, (nrfrms+1)*sizeof(int));
839	>	rfrm = (int )realloc((void )rfrm, (nrfrms+1)*sizeof(int));
840		else
841		rfrm = (int *)malloc(sizeof(int));
842		if (rfrm == NULL) {
#	Line 735 \| Line 848 \| int frame;
848		}
849
850
851	<	int
852	<	frecover(frame) /* recover filtered frame */
740	<	int frame;
851	>	static int
852	>	frecover(int frame) /* recover filtered frame */
853		{
854	<	VIEW *vp;
743	<	char *ex;
744	<
745	<	vp = getview(frame);
746	<	ex = getexp(frame);
747	<	if (dofilt(frame, vp, ex, 2) && dofilt(frame, vp, ex, 1))
854	>	if (dofilt(frame, 2) && dofilt(frame, 1))
855		return(1);
856		return(0);
857		}
858
859
860	<	archive() /* archive and remove renderings */
860	>	static void
861	>	archive(void) /* archive and remove renderings */
862		{
863		#define RMCOML (sizeof(rmcom)-1)
864		static char rmcom[] = "rm -f";
865	<	register int i;
865	>	char basedir[128];
866	>	int dlen, alen;
867	>	register int j;
868
869		if (arcnext == arcfirst)
870		return; /* nothing to do */
871	+	dirfile(basedir, vval(BASENAME));
872	+	dlen = strlen(basedir);
873		if (vdef(ARCHIVE)) { /* run archive command */
874	<	i = strlen(vval(ARCHIVE));
875	<	strncpy(arcfirst-i, vval(ARCHIVE), i);
876	<	if (runcom(arcfirst-i)) {
874	>	alen = strlen(vval(ARCHIVE));
875	>	if (dlen) {
876	>	j = alen + dlen + 5;
877	>	strncpy(arcfirst-j, "cd ", 3);
878	>	strncpy(arcfirst-j+3, basedir, dlen);
879	>	(arcfirst-j)[dlen+3] = ';'; (arcfirst-j)[dlen+4] = ' ';
880	>	} else
881	>	j = alen;
882	>	strncpy(arcfirst-alen, vval(ARCHIVE), alen);
883	>	if (runcom(arcfirst-j)) {
884		fprintf(stderr, "%s: error running archive command\n",
885		progname);
886		quit(1);
887		}
888		}
889	+	if (dlen) {
890	+	j = RMCOML + dlen + 5;
891	+	strncpy(arcfirst-j, "cd ", 3);
892	+	strncpy(arcfirst-j+3, basedir, dlen);
893	+	(arcfirst-j)[dlen+3] = ';'; (arcfirst-j)[dlen+4] = ' ';
894	+	} else
895	+	j = RMCOML;
896		/* run remove command */
897		strncpy(arcfirst-RMCOML, rmcom, RMCOML);
898	<	runcom(arcfirst-RMCOML);
898	>	runcom(arcfirst-j);
899		arcnext = arcfirst; /* reset argument list */
900		#undef RMCOML
901		}
902
903
904	<	int
905	<	dofilt(frame, vp, ep, rvr) /* filter frame */
906	<	int frame;
907	<	VIEW *vp;
908	<	char *ep;
783	<	int rvr;
904	>	static int
905	>	dofilt( /* filter frame */
906	>	int frame,
907	>	int rvr
908	>	)
909		{
785	–	extern int frecover();
910		static int iter = 0;
911	<	char fnbefore[128], fnafter[128];
911	>	double mblurf, dblurf;
912	>	int nblur = getblur(&mblurf, &dblurf);
913	>	VIEW *vp = getview(frame);
914	>	char *ep = getexp(frame);
915	>	char fnbefore[128], fnafter[128], *fbase;
916		char combuf[1024], fname0[128], fname1[128];
917		int usepinterp, usepfilt, nora_rgbe;
918		int frseq[2];
919		/* check what is needed */
920	<	usepinterp = atoi(vval(MBLUR));
921	<	usepfilt = pfiltalways \| ep==NULL;
920	>	if (vp == NULL) {
921	>	fprintf(stderr,
922	>	"%s: unexpected error reading view for frame %d\n",
923	>	progname, frame);
924	>	quit(1);
925	>	}
926	>	usepinterp = (nblur > 1);
927	>	usepfilt = pfiltalways \| (ep==NULL);
928		if (ep != NULL && !strcmp(ep, "1"))
929		ep = "+0";
930		nora_rgbe = strcmp(vval(OVERSAMP),"1") \|\| ep==NULL \|\|
#	Line 798 \| Line 932 \| int rvr;
932		/* compute rendered views */
933		frseq[0] = frame - ((frame-1) % (vint(INTERP)+1));
934		frseq[1] = frseq[0] + vint(INTERP) + 1;
935	+	fbase = dirfile(NULL, vval(BASENAME));
936		if (frseq[1] > vint(END))
937		frseq[1] = vint(END);
938		if (frseq[1] == frame) { /* pfilt only */
#	Line 807 \| Line 942 \| int rvr;
942		} else if (frseq[0] == frame) { /* no interpolation needed */
943		if (!rvr && frame > 1+vint(INTERP)) { /* archive previous */
944		*arcnext++ = ' ';
945	<	sprintf(arcnext, vval(BASENAME), frame-vint(INTERP)-1);
945	>	sprintf(arcnext, fbase, frame-vint(INTERP)-1);
946		while (*arcnext) arcnext++;
947		strcpy(arcnext, ".unf");
948		arcnext += 4;
949	<	if (usepinterp \|\| vint(INTERP)) { /* and z-buf */
949	>	if (usepinterp \|\| vint(INTERP)) { /* and Z-buf */
950		*arcnext++ = ' ';
951	<	sprintf(arcnext, vval(BASENAME),
817	<	frame-vint(INTERP)-1);
951	>	sprintf(arcnext, fbase, frame-vint(INTERP)-1);
952		while (*arcnext) arcnext++;
953		strcpy(arcnext, ".zbf");
954		arcnext += 4;
#	Line 834 \| Line 968 \| int rvr;
968		if (usepinterp) { /* using pinterp */
969		if (rvr == 2 && recover(frseq[1])) /* recover after? */
970		return(1);
971	<	if (atoi(vval(MBLUR))) {
838	<	FILE fp; / motion blurring */
971	>	if (nblur > 1) { /* with pdmblur */
972		sprintf(fname0, "%s/vw0%c", vval(DIRECTORY),
973		'a'+(iter%26));
841	–	if ((fp = fopen(fname0, "w")) == NULL) {
842	–	perror(fname0); quit(1);
843	–	}
844	–	fputs(VIEWSTR, fp);
845	–	fprintview(vp, fp);
846	–	putc('\n', fp); fclose(fp);
847	–	if ((vp = getview(frame+1)) == NULL) {
848	–	fprintf(stderr,
849	–	"%s: unexpected error reading view for frame %d\n",
850	–	progname, frame+1);
851	–	quit(1);
852	–	}
974		sprintf(fname1, "%s/vw1%c", vval(DIRECTORY),
975		'a'+(iter%26));
976	<	if ((fp = fopen(fname1, "w")) == NULL) {
977	<	perror(fname1); quit(1);
976	>	if (!noaction) {
977	>	FILE fp; / motion blurring */
978	>	if ((fp = fopen(fname0, "w")) == NULL) {
979	>	perror(fname0); quit(1);
980	>	}
981	>	fputs(VIEWSTR, fp);
982	>	fprintview(vp, fp);
983	>	putc('\n', fp); fclose(fp);
984	>	if ((vp = getview(frame+1)) == NULL) {
985	>	fprintf(stderr,
986	>	"%s: unexpected error reading view for frame %d\n",
987	>	progname, frame+1);
988	>	quit(1);
989	>	}
990	>	if ((fp = fopen(fname1, "w")) == NULL) {
991	>	perror(fname1); quit(1);
992	>	}
993	>	fputs(VIEWSTR, fp);
994	>	fprintview(vp, fp);
995	>	putc('\n', fp); fclose(fp);
996		}
858	–	fputs(VIEWSTR, fp);
859	–	fprintview(vp, fp);
860	–	putc('\n', fp); fclose(fp);
997		sprintf(combuf,
998	<	"(pmblur %s %d %s %s; rm -f %s %s) \| pinterp -B",
999	<	*sskip(vval(MBLUR)) ? sskip2(vval(MBLUR),1) : "1",
864	<	atoi(vval(MBLUR)),
998	>	"(pmdblur %.3f %.3f %d %s %s; rm -f %s %s) \| pinterp -B -a",
999	>	mblurf, dblurf, nblur,
1000		fname0, fname1, fname0, fname1);
1001		iter++;
1002		} else /* no blurring */
#	Line 869 \| Line 1004 \| int rvr;
1004		strcat(combuf, viewopt(vp));
1005		if (vbool(RTRACE))
1006		sprintf(combuf+strlen(combuf), " -ff -fr '%s -w0 %s'",
1007	<	rendopt, vval(OCTREE));
1007	>	rendopt+1, vval(OCTREE));
1008		if (vdef(PINTERP))
1009		sprintf(combuf+strlen(combuf), " %s", vval(PINTERP));
1010		if (usepfilt)
1011		sprintf(combuf+strlen(combuf), " %s", rresopt);
1012		else
1013	<	sprintf(combuf+strlen(combuf), " %s -e %s",
1013	>	sprintf(combuf+strlen(combuf), " -a %s -e %s",
1014		fresopt, ep);
1015		sprintf(combuf+strlen(combuf), " %s.unf %s.zbf",
1016		fnbefore, fnbefore);
#	Line 922 \| Line 1057 \| int rvr;
1057		}
1058
1059
1060	<	VIEW *
1061	<	getview(n) /* get view number n */
927	<	int n;
1060	>	static VIEW *
1061	>	getview(int n) /* get view number n */
1062		{
1063		static FILE viewfp = NULL; / view file pointer */
1064		static int viewnum = 0; /* current view number */
#	Line 936 \| Line 1070 \| int n;
1070		fclose(viewfp);
1071		viewfp = NULL;
1072		viewnum = 0;
1073	<	copystruct(&curview, &stdview);
1073	>	curview = stdview;
1074		}
1075		return(NULL);
1076		}
1077	<	if (viewfp == NULL) { /* open file */
1077	>	if (viewfp == NULL) { /* open file */
1078		if ((viewfp = fopen(vval(VIEWFILE), "r")) == NULL) {
1079		perror(vval(VIEWFILE));
1080		quit(1);
1081		}
1082	<	} else if (n < viewnum) { /* rewind file */
1082	>	} else if (n > 0 && n < viewnum) { /* rewind file */
1083	>	if (viewnum == 1 && feof(viewfp))
1084	>	return(&curview); /* just one view */
1085		if (fseek(viewfp, 0L, 0) == EOF) {
1086		perror(vval(VIEWFILE));
1087		quit(1);
1088		}
1089	<	copystruct(&curview, &stdview);
1089	>	curview = stdview;
1090		viewnum = 0;
1091		}
1092	+	if (n < 0) { /* get next view */
1093	+	register int c = getc(viewfp);
1094	+	if (c == EOF)
1095	+	return((VIEW )NULL); / that's it */
1096	+	ungetc(c, viewfp);
1097	+	n = viewnum + 1;
1098	+	}
1099		while (n > viewnum) { /* scan to desired view */
1100		if (fgets(linebuf, sizeof(linebuf), viewfp) == NULL)
1101	<	return(NULL);
1101	>	return(viewnum==1 ? &curview : (VIEW *)NULL);
1102		if (isview(linebuf) && sscanview(&curview, linebuf) > 0)
1103		viewnum++;
1104		}
#	Line 963 \| Line 1106 \| int n;
1106		}
1107
1108
1109	<	int
1110	<	countviews() /* count views in view file */
1109	>	static int
1110	>	countviews(void) /* count views in view file */
1111		{
1112	<	register int n = 0;
1112	>	int n;
1113
1114	<	while (getview(n+1) != NULL)
1114	>	if (getview(n=1) == NULL)
1115	>	return(0);
1116	>	while (getview(-1) != NULL)
1117		n++;
1118		return(n);
1119		}
1120
1121
1122	<	char *
1123	<	getexp(n) /* get exposure for nth frame */
979	<	int n;
1122	>	static char *
1123	>	getexp(int n) /* get exposure for nth frame */
1124		{
1125		extern char *fskip();
1126		static char expval[32];
#	Line 988 \| Line 1132 \| int n;
1132		if (n == 0) { /* signal to close file */
1133		if (expfp != NULL) {
1134		fclose(expfp);
1135	+	free((void *)exppos);
1136		expfp = NULL;
1137		}
1138		return(NULL);
1139	<	}
1139	>	} else if (n > vint(END)) /* request past end (error?) */
1140	>	return(NULL);
1141		if (!vdef(EXPOSURE)) /* no setting (auto) */
1142		return(NULL);
1143		if (isflt(vval(EXPOSURE))) /* always the same */
#	Line 1029 \| Line 1175 \| int n;
1175		}
1176		curfrm++;
1177		cp = fskip(expval); /* check format */
1178	<	if (cp == NULL \|\| *cp != '\n') {
1178	>	if (cp != NULL)
1179	>	while (isspace(*cp))
1180	>	*cp++ = '\0';
1181	>	if (cp == NULL \|\| *cp) {
1182		fprintf(stderr,
1183		"%s: exposure format error on line %d\n",
1184		vval(EXPOSURE), curfrm);
1185		quit(1);
1186		}
1038	–	*cp = '\0';
1187		}
1188		return(expval); /* return value */
1189		}
1190
1191
1192	<	struct pslot *
1193	<	findpslot(pid) /* find or allocate a process slot */
1046	<	int pid;
1192	>	static struct pslot *
1193	>	findpslot(int pid) /* find or allocate a process slot */
1194		{
1195		register struct pslot *psempty = NULL;
1196		register int i;
#	Line 1058 \| Line 1205 \| int pid;
1205		}
1206
1207
1208	<	int
1209	<	donecom(ps, pn, status) /* clean up after finished process */
1210	<	PSERVER *ps;
1211	<	int pn;
1212	<	int status;
1208	>	static int
1209	>	donecom( /* clean up after finished process */
1210	>	PSERVER *ps,
1211	>	int pn,
1212	>	int status
1213	>	)
1214		{
1215	<	register PROC *pp;
1215	>	register NETPROC *pp;
1216	>	register struct pslot *psl;
1217
1218		pp = ps->proc + pn;
1219		if (pp->elen) { /* pass errors */
#	Line 1076 \| Line 1225 \| int status;
1225		if (ps->hostname[0])
1226		status = 1; /* because rsh doesn't return status */
1227		}
1228	+	lastpserver = NULL;
1229	+	psl = findpslot(pp->pid); /* check for bruncom() slot */
1230	+	if (psl->pid) {
1231	+	if (status) {
1232	+	if (psl->rcvf != NULL) /* attempt recovery */
1233	+	status = (*psl->rcvf)(psl->fout);
1234	+	if (status) {
1235	+	fprintf(stderr,
1236	+	"%s: error rendering frame %d\n",
1237	+	progname, psl->fout);
1238	+	quit(1);
1239	+	}
1240	+	lastpserver = ps;
1241	+	}
1242	+	psl->pid = 0; /* free process slot */
1243	+	} else if (status)
1244	+	lastpserver = ps;
1245		freestr(pp->com); /* free command string */
1080	–	lastpid = pp->pid; /* record PID for bwait() */
1081	–	lastpserver = ps; /* record server for serverdown() */
1246		return(status);
1247		}
1248
1249
1250	<	int
1251	<	serverdown() /* check status of last process server */
1250	>	static int
1251	>	serverdown(void) /* check status of last process server */
1252		{
1253	+	if (lastpserver == NULL \|\| !lastpserver->hostname[0])
1254	+	return(0);
1255		if (pserverOK(lastpserver)) /* server still up? */
1256		return(0);
1257		delpserver(lastpserver); /* else delete it */
#	Line 1098 \| Line 1264 \| *serverdown() / check status of last process server**
1264		}
1265
1266
1267	<	int
1268	<	bruncom(com, fout, rf) /* run a command in the background */
1269	<	char *com;
1270	<	int fout;
1271	<	int (*rf)();
1267	>	static int
1268	>	bruncom( /* run a command in the background */
1269	>	char *com,
1270	>	int fout,
1271	>	int (*rf)()
1272	>	)
1273		{
1274		int pid;
1275		register struct pslot *psl;
#	Line 1112 \| Line 1279 \| *int (rf)();**
1279		printf("\t%s\n", com); /* echo command */
1280		return(0);
1281		}
1282	<	/* else start it when we can */
1283	<	while ((pid = startjob(NULL, savestr(com), donecom)) == -1)
1282	>	com = savestr(com); /* else start it when we can */
1283	>	while ((pid = startjob(NULL, com, donecom)) == -1)
1284		bwait(1);
1285		if (!silent) { /* echo command */
1286		PSERVER *ps;
#	Line 1131 \| Line 1298 \| *int (rf)();**
1298		}
1299
1300
1301	<	bwait(ncoms) /* wait for batch job(s) to finish */
1302	<	int ncoms;
1301	>	static void
1302	>	bwait(int ncoms) /* wait for batch job(s) to finish */
1303		{
1304		int status;
1138	–	register struct pslot *psl;
1305
1306		if (noaction)
1307		return;
1308		while ((status = wait4job(NULL, -1)) != -1) {
1309	<	psl = findpslot(lastpid);
1310	<	if (status) { /* attempt recovery */
1311	<	serverdown(); /* check server */
1146	<	if (psl->rcvf == NULL \|\| (*psl->rcvf)(psl->fout)) {
1147	<	fprintf(stderr,
1148	<	"%s: error rendering frame %d\n",
1149	<	progname, psl->fout);
1150	<	quit(1);
1151	<	}
1152	<	}
1153	<	psl->pid = 0; /* free process slot */
1154	<	if (!--ncoms)
1155	<	return; /* done enough */
1309	>	serverdown(); /* update server status */
1310	>	if (--ncoms == 0)
1311	>	break; /* done enough */
1312		}
1313		}
1314
1315
1316	<	int
1317	<	pruncom(com, ppins, maxcopies) /* run a command in parallel over network */
1318	<	char com, ppins;
1319	<	int maxcopies;
1316	>	static int
1317	>	pruncom( /* run a command in parallel over network */
1318	>	char *com,
1319	>	char *ppins,
1320	>	int maxcopies
1321	>	)
1322		{
1323		int retstatus = 0;
1324		int hostcopies;
1325	<	char com1buf[10240], com1, endcom1;
1325	>	char buf[10240], com1, s;
1326		int status;
1327	+	int pfd;
1328	+	register int n;
1329		register PSERVER *ps;
1330
1331		if (!silent)
#	Line 1177 \| Line 1337 \| int maxcopies;
1337		for (ps = pslist; ps != NULL; ps = ps->next) {
1338		hostcopies = 0;
1339		if (maxcopies > 1 && ps->nprocs > 1 && ppins != NULL) {
1340	<	strcpy(com1=com1buf, com); /* build -PP command */
1340	>	strcpy(com1=buf, com); /* build -PP command */
1341		sprintf(com1+(ppins-com), " -PP %s/%s.persist",
1342		vval(DIRECTORY), phostname(ps));
1343	+	unlink(com1+(ppins-com)+5);
1344		strcat(com1, ppins);
1345	<	endcom1 = com1 + strlen(com1);
1185	<	sprintf(endcom1, "; kill `sed -n '1s/^[^ ]* //p' %s/%s.persist`",
1186	<	vval(DIRECTORY), phostname(ps));
1187	<	} else {
1345	>	} else
1346		com1 = com;
1347	<	endcom1 = NULL;
1347	>	while (maxcopies > 0) {
1348	>	s = savestr(com1);
1349	>	if (startjob(ps, s, donecom) != -1) {
1350	>	sleep(20);
1351	>	hostcopies++;
1352	>	maxcopies--;
1353	>	} else {
1354	>	freestr(s);
1355	>	break;
1356	>	}
1357		}
1191	–	while (maxcopies > 0 &&
1192	–	startjob(ps, savestr(com1), donecom) != -1) {
1193	–	sleep(10);
1194	–	hostcopies++;
1195	–	maxcopies--;
1196	–	if (endcom1 != NULL)
1197	–	*endcom1 = '\0';
1198	–	}
1358		if (!silent && hostcopies) {
1359		if (hostcopies > 1)
1360		printf("\t%d duplicate processes", hostcopies);
#	Line 1207 \| Line 1366 \| int maxcopies;
1366		}
1367		/* wait for jobs to finish */
1368		while ((status = wait4job(NULL, -1)) != -1)
1369	<	if (status)
1370	<	retstatus += !serverdown(); /* check server */
1369	>	retstatus += status && !serverdown();
1370	>	/* terminate parallel rpict's */
1371	>	for (ps = pslist; ps != NULL; ps = ps->next) {
1372	>	sprintf(buf, "%s/%s.persist", vval(DIRECTORY), phostname(ps));
1373	>	if ((pfd = open(buf, O_RDONLY)) >= 0) {
1374	>	n = read(pfd, buf, sizeof(buf)-1); /* get PID */
1375	>	buf[n] = '\0';
1376	>	close(pfd);
1377	>	for (n = 0; buf[n] && !isspace(buf[n]); n++)
1378	>	;
1379	>	/* terminate */
1380	>	sprintf(buf, "kill -ALRM %d", atoi(buf+n));
1381	>	wait4job(ps, startjob(ps, buf, NULL));
1382	>	}
1383	>	}
1384		return(retstatus);
1385		}
1386
1387
1388	<	runcom(cs) /* run a command locally and wait for it */
1389	<	char *cs;
1388	>	static int
1389	>	runcom(char cs) / run a command locally and wait for it */
1390		{
1391		if (!silent) /* echo it */
1392		printf("\t%s\n", cs);
#	Line 1225 \| Line 1397 \| *char cs;**
1397		}
1398
1399
1400	<	rmfile(fn) /* remove a file */
1401	<	char *fn;
1400	>	static int
1401	>	rmfile(char fn) / remove a file */
1402		{
1403		if (!silent)
1404	<	#ifdef MSDOS
1404	>	#ifdef _WIN32
1405		printf("\tdel %s\n", fn);
1406		#else
1407		printf("\trm -f %s\n", fn);
#	Line 1240 \| Line 1412 \| *char fn;**
1412		}
1413
1414
1415	<	badvalue(vc) /* report bad variable value and exit */
1416	<	int vc;
1415	>	static void
1416	>	badvalue(int vc) /* report bad variable value and exit */
1417		{
1418		fprintf(stderr, "%s: bad value for variable '%s'\n",
1419		progname, vnam(vc));
1420		quit(1);
1421	+	}
1422	+
1423	+
1424	+	static char *
1425	+	dirfile( /* separate path into directory and file */
1426	+	char *df,
1427	+	register char *path
1428	+	)
1429	+	{
1430	+	register int i;
1431	+	int psep;
1432	+
1433	+	for (i = 0, psep = -1; path[i]; i++)
1434	+	if (path[i] == '/')
1435	+	psep = i;
1436	+	if (df != NULL) {
1437	+	if (psep == 0) {
1438	+	df[0] = '/';
1439	+	df[1] = '\0';
1440	+	} else if (psep > 0) {
1441	+	strncpy(df, path, psep);
1442	+	df[psep] = '\0';
1443	+	} else
1444	+	df[0] = '\0';
1445	+	}
1446	+	return(path+psep+1);
1447	+	}
1448	+
1449	+
1450	+	static int
1451	+	getblur(double mbf, double dbf) /* get # blur samples (and fraction) */
1452	+	{
1453	+	double mblurf, dblurf;
1454	+	int nmblur, ndblur;
1455	+	char *s;
1456	+	/* get motion blur */
1457	+	if (!vdef(MBLUR) \|\| (mblurf = atof(vval(MBLUR))) < 0.0)
1458	+	mblurf = 0.0;
1459	+	if (mbf != NULL)
1460	+	*mbf = mblurf;
1461	+	if (mblurf <= FTINY)
1462	+	nmblur = 0;
1463	+	else if (!*(s = sskip(vval(MBLUR))))
1464	+	nmblur = DEF_NBLUR;
1465	+	else if ((nmblur = atoi(s)) <= 0)
1466	+	nmblur = 1;
1467	+	/* get depth-of-field blur */
1468	+	if (!vdef(DBLUR) \|\| (dblurf = atof(vval(DBLUR))) < 0.0)
1469	+	dblurf = 0.0;
1470	+	if (dbf != NULL)
1471	+	*dbf = dblurf;
1472	+	if (dblurf <= FTINY)
1473	+	ndblur = 0;
1474	+	else if (!*(s = sskip(vval(DBLUR))))
1475	+	ndblur = DEF_NBLUR;
1476	+	else if ((ndblur = atoi(s)) <= 0)
1477	+	ndblur = 1;
1478	+	if ((nmblur == 1) & (ndblur == 1))
1479	+	return(1);
1480	+	/* return combined samples */
1481	+	return(nmblur + ndblur);
1482		}

Diff Legend

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

Comparing ray/src/util/ranimate.c (file contents): Revision 2.7 by greg, Wed Jan 24 12:22:15 1996 UTC vs. Revision 2.48 by greg, Tue Jan 18 03:59:41 2005 UTC

Diff Legend

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.7 by greg, Wed Jan 24 12:22:15 1996 UTC vs.
Revision 2.48 by greg, Tue Jan 18 03:59:41 2005 UTC