ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/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.6 by greg, Tue Jan 23 17:01:33 1996 UTC

#	Line 799 | Line 799 | char   *ep;
799		int     rvr;
800		{
801		extern int      frecover();
802	+	static int      iter = 0;
803		char    fnbefore[128], fnafter[128];
804	<	char    combuf[1024], fname[128];
804	>	char    combuf[1024], fname0[128], fname1[128];
805		int     usepinterp, usepfilt;
806		int     frseq[2];
807		/* check what is needed */
#	Line 833 | Line 834 | int    rvr;
834		return(1);
835		if (atoi(vval(MBLUR))) {
836		FILE    *fp;            /* motion blurring */
837	<	sprintf(fname, "%s/vw0", vval(DIRECTORY));
838	<	if (access(fname, F_OK) == 0)
839	<	sleep(10);
840	<	if ((fp = fopen(fname, "w")) == NULL) {
840	<	perror(fname); quit(1);
837	>	sprintf(fname0, "%s/vw0%c", vval(DIRECTORY),
838	>	'a'+(iter%26));
839	>	if ((fp = fopen(fname0, "w")) == NULL) {
840	>	perror(fname0); quit(1);
841		}
842		fputs(VIEWSTR, fp);
843		fprintview(vp, fp);
#	Line 848 | Line 848 | int    rvr;
848		progname, frame+1);
849		quit(1);
850		}
851	<	sprintf(fname, "%s/vw1", vval(DIRECTORY));
852	<	if ((fp = fopen(fname, "w")) == NULL) {
853	<	perror(fname); quit(1);
851	>	sprintf(fname1, "%s/vw1%c", vval(DIRECTORY),
852	>	'a'+(iter%26));
853	>	if ((fp = fopen(fname1, "w")) == NULL) {
854	>	perror(fname1); quit(1);
855		}
856		fputs(VIEWSTR, fp);
857		fprintview(vp, fp);
858		putc('\n', fp); fclose(fp);
859		sprintf(combuf,
860	<	"(pmblur %s %d %s/vw0 %s/vw1; rm -f %s/vw0 %s/vw1) | pinterp -B",
860	>	"(pmblur %s %d %s %s; rm -f %s %s) | pinterp -B",
861		*sskip(vval(MBLUR)) ? sskip2(vval(MBLUR),1) : "1",
862	<	atoi(vval(MBLUR)), vval(DIRECTORY),
863	<	vval(DIRECTORY), vval(DIRECTORY),
864	<	vval(DIRECTORY), vval(DIRECTORY));
862	>	atoi(vval(MBLUR)),
863	>	fname0, fname1, fname0, fname1);
864	>	iter++;
865		} else                          /* no blurring */
866		strcpy(combuf, "pinterp");
867		strcat(combuf, viewopt(vp));
#	Line 910 | Line 911 | int    rvr;
911		sprintf(combuf, "ra_rgbe -r %s.unf", fnbefore);
912		}
913		/* output file name */
914	<	sprintf(fname, vval(BASENAME), frame);
915	<	sprintf(combuf+strlen(combuf), " > %s.pic", fname);
914	>	sprintf(fname0, vval(BASENAME), frame);
915	>	sprintf(combuf+strlen(combuf), " > %s.pic", fname0);
916		if (rvr)                                /* in recovery */
917		return(runcom(combuf));
918		bruncom(combuf, frame, frecover);       /* else run in background */
#	Line 1166 | Line 1167 | int    maxcopies;
1167		register PSERVER        *ps;
1168
1169		if (!silent)
1170	<	printf("\t%s &\n", com);        /* echo command */
1170	>	printf("\t%s\n", com);  /* echo command */
1171		if (noaction)
1172		return(0);
1173		fflush(stdout);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)