--- ray/src/util/ranimate.c 1996/01/19 17:24:19 2.3 +++ ray/src/util/ranimate.c 2006/02/28 03:44:54 2.51 @@ -1,76 +1,101 @@ -/* Copyright (c) 1995 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: ranimate.c,v 2.51 2006/02/28 03:44:54 greg Exp $"; #endif - /* * Radiance animation control program + * + * The main difference between this program and ranimove is that + * we have many optimizations here for camera motion in static + * environments, calling rpict and pinterp on multiple processors, + * where ranimove puts its emphasis on object motion, and does + * not use any external programs for image generation. + * + * See the ranimate(1) man page for further details. */ -#include "standard.h" +#include "copyright.h" + +#include #include -#include #include +#include +#include + +#include "platform.h" +#include "rtprocess.h" +#include "paths.h" +#include "standard.h" #include "view.h" #include "vars.h" #include "netproc.h" - /* input variables */ -#define HOST 0 /* rendering host machine */ -#define RENDER 1 /* rendering options */ -#define PFILT 2 /* pfilt options */ -#define PINTERP 3 /* pinterp options */ -#define OCTREE 4 /* octree file name */ -#define DIRECTORY 5 /* working (sub)directory */ -#define BASENAME 6 /* output image base name */ -#define VIEWFILE 7 /* animation frame views */ -#define START 8 /* starting frame number */ -#define END 9 /* ending frame number */ -#define RIF 10 /* rad input file */ + /* default blur samples */ +#ifndef DEF_NBLUR +#define DEF_NBLUR 5 +#endif + /* default remote shell */ +#ifndef REMSH +#define REMSH "ssh" +#endif + /* input variables (alphabetical by name) */ +#define ANIMATE 0 /* animation command */ +#define ARCHIVE 1 /* archiving command */ +#define BASENAME 2 /* output image base name */ +#define DBLUR 3 /* depth of field blur */ +#define DIRECTORY 4 /* working (sub)directory */ +#define DISKSPACE 5 /* how much disk space to use */ +#define END 6 /* ending frame number */ +#define EXPOSURE 7 /* how to compute exposure */ +#define HOST 8 /* rendering host machine */ +#define INTERP 9 /* # frames to interpolate */ +#define MBLUR 10 /* motion blur parameters */ #define NEXTANIM 11 /* next animation file */ -#define ANIMATE 12 /* animation command */ -#define TRANSFER 13 /* frame transfer command */ -#define ARCHIVE 14 /* archiving command */ -#define INTERP 15 /* # frames to interpolate */ -#define OVERSAMP 16 /* # times to oversample image */ -#define MBLUR 17 /* samples for motion blur */ -#define RTRACE 18 /* use rtrace with pinterp? */ -#define DISKSPACE 19 /* how much disk space to use */ -#define RESOLUTION 20 /* desired final resolution */ -#define EXPOSURE 21 /* how to compute exposure */ +#define OCTREE 12 /* octree file name */ +#define OVERSAMP 13 /* # times to oversample image */ +#define PFILT 14 /* pfilt options */ +#define PINTERP 15 /* pinterp options */ +#define RENDER 16 /* rendering options */ +#define RESOLUTION 17 /* desired final resolution */ +#define RIF 18 /* rad input file */ +#define RSH 19 /* remote shell script or program */ +#define RTRACE 20 /* use rtrace with pinterp? */ +#define START 21 /* starting frame number */ +#define TRANSFER 22 /* frame transfer command */ +#define VIEWFILE 23 /* animation frame views */ -int NVARS = 22; /* total number of variables */ +int NVARS = 24; /* total number of variables */ VARIABLE vv[] = { /* variable-value pairs */ + {"ANIMATE", 2, 0, NULL, onevalue}, + {"ARCHIVE", 2, 0, NULL, onevalue}, + {"BASENAME", 3, 0, NULL, onevalue}, + {"DBLUR", 2, 0, NULL, onevalue}, + {"DIRECTORY", 3, 0, NULL, onevalue}, + {"DISKSPACE", 3, 0, NULL, fltvalue}, + {"END", 2, 0, NULL, intvalue}, + {"EXPOSURE", 3, 0, NULL, onevalue}, {"host", 4, 0, NULL, NULL}, - {"render", 3, 0, NULL, catvalues}, + {"INTERPOLATE", 3, 0, NULL, intvalue}, + {"MBLUR", 2, 0, NULL, onevalue}, + {"NEXTANIM", 3, 0, NULL, onevalue}, + {"OCTREE", 3, 0, NULL, onevalue}, + {"OVERSAMPLE", 2, 0, NULL, fltvalue}, {"pfilt", 2, 0, NULL, catvalues}, {"pinterp", 2, 0, NULL, catvalues}, - {"OCTREE", 3, 0, NULL, onevalue}, - {"DIRECTORY", 3, 0, NULL, onevalue}, - {"BASENAME", 3, 0, NULL, onevalue}, - {"VIEWFILE", 2, 0, NULL, onevalue}, - {"START", 2, 0, NULL, intvalue}, - {"END", 2, 0, NULL, intvalue}, + {"render", 3, 0, NULL, catvalues}, + {"RESOLUTION", 3, 0, NULL, onevalue}, {"RIF", 3, 0, NULL, onevalue}, - {"NEXTANIM", 3, 0, NULL, onevalue}, - {"ANIMATE", 2, 0, NULL, onevalue}, - {"TRANSFER", 2, 0, NULL, onevalue}, - {"ARCHIVE", 2, 0, NULL, onevalue}, - {"INTERP", 3, 0, NULL, intvalue}, - {"OVERSAMP", 2, 0, NULL, fltvalue}, - {"MBLUR", 2, 0, NULL, onevalue}, + {"RSH", 3, 0, NULL, onevalue}, {"RTRACE", 2, 0, NULL, boolvalue}, - {"DISKSPACE", 3, 0, NULL, fltvalue}, - {"RESOLUTION", 3, 0, NULL, onevalue}, - {"EXPOSURE", 3, 0, NULL, onevalue}, + {"START", 2, 0, NULL, intvalue}, + {"TRANSFER", 2, 0, NULL, onevalue}, + {"VIEWFILE", 2, 0, NULL, onevalue}, }; #define SFNAME "STATUS" /* status file name */ struct { char host[64]; /* control host name */ - int pid; /* control process id */ + RT_PID pid; /* control process id */ char cfname[128]; /* control file name */ int rnext; /* next frame to render */ int fnext; /* next frame to filter */ @@ -84,30 +109,63 @@ int nowarn = 0; /* turn warnings off? */ int silent = 0; /* silent mode? */ int noaction = 0; /* take no action? */ -char rendopt[2048] = ""; /* rendering options */ +char *remsh; /* remote shell program/script */ +char rendopt[2048]; /* rendering options */ char rresopt[32]; /* rendering resolution options */ char fresopt[32]; /* filter resolution options */ int pfiltalways; /* always use pfilt? */ +char arcargs[10240]; /* files to archive */ +char *arcfirst, *arcnext; /* pointers to first and next argument */ + struct pslot { - int pid; /* process ID (0 if empty) */ + RT_PID pid; /* process ID (0 if empty) */ int fout; /* output frame number */ int (*rcvf)(); /* recover function */ } *pslot; /* process slots */ int npslots; /* number of process slots */ -int lastpid; /* ID of last completed background process */ -PSERVER *lastpserver; /* last process server used */ +#define phostname(ps) ((ps)->hostname[0] ? (ps)->hostname : astat.host) +PSERVER *lastpserver; /* last process server with error */ -struct pslot *findpslot(); +static struct pslot * findpslot(RT_PID pid); +static void checkdir(void); +static VIEW * getview(int n); -VIEW *getview(); -char *getexp(); +static char * dirfile(char *df, register char *path); +static char * getexp(int n); +static int getblur(double *mbf, double *dbf); +static int getastat(void); +static void getradfile(char *rfargs); +static void badvalue(int vc); +static int rmfile(char *fn); +static int runcom(char *cs); +static int pruncom(char *com, char *ppins, int maxcopies); +static void bwait(int ncoms); +static RT_PID bruncom(char *com, int fout, int (*rf)()); +static int serverdown(void); +static pscompfunc donecom; +static int countviews(void); +static int dofilt(int frame, int rvr); +static void archive(void); +static int frecover(int frame); +static int recover(int frame); +static void sethosts(void); +static void walkwait(int first, int last, char *vfn); +static void animrend(int frame, VIEW *vp); +static void transferframes(void); +static void filterframes(void); +static void renderframes(int nframes); +static void animate(void); +static void setdefaults(void); +static void putastat(void); -main(argc, argv) -int argc; -char *argv[]; +int +main( + int argc, + char *argv[] +) { int explicate = 0; int i; @@ -135,6 +193,8 @@ char *argv[]; cfname = argv[i]; /* load variables */ loadvars(cfname); + /* check variables */ + checkvalues(); /* did we get DIRECTORY? */ checkdir(); /* check status */ @@ -158,28 +218,36 @@ char *argv[]; animate(); /* all done */ if (vdef(NEXTANIM)) { + char *fullp; argv[i] = vval(NEXTANIM); /* just change input file */ if (!silent) printargs(argc, argv, stdout); - execvp(progname, argv); /* pass to next */ - quit(1); /* shouldn't return */ + fflush(stdout); + if ((fullp = getpath(argv[0],getenv("PATH"),X_OK)) == NULL) + fprintf(stderr, "%s: command not found\n", argv[0]); + else + execv(fullp, argv); + quit(1); } quit(0); + return(0); /* pro forma return */ userr: fprintf(stderr, "Usage: %s [-s][-n][-w][-e] anim_file\n", progname); quit(1); + return 1; /* pro forma return */ } -getastat() /* check/set animation status */ +static int +getastat(void) /* check/set animation status */ { - char buf[256]; + char sfname[256]; FILE *fp; - sprintf(buf, "%s/%s", vval(DIRECTORY), SFNAME); - if ((fp = fopen(buf, "r")) == NULL) { + sprintf(sfname, "%s/%s", vval(DIRECTORY), SFNAME); + if ((fp = fopen(sfname, "r")) == NULL) { if (errno != ENOENT) { - perror(buf); + perror(sfname); return(-1); } astat.rnext = astat.fnext = astat.tnext = 0; @@ -199,8 +267,7 @@ getastat() /* check/set animation status */ goto fmterr; fclose(fp); if (astat.pid != 0) { /* thinks it's still running */ - gethostname(buf, sizeof(buf)); - if (strcmp(buf, astat.host)) { + if (strcmp(myhostname(), astat.host)) { fprintf(stderr, "%s: process %d may still be running on host %s\n", progname, astat.pid, astat.host); @@ -213,25 +280,31 @@ getastat() /* check/set animation status */ } /* assume it is dead */ } - if (strcmp(cfname, astat.cfname) && astat.tnext != 0) { /* other's */ + if (strcmp(cfname, astat.cfname) && astat.pid != 0) { /* other's */ fprintf(stderr, "%s: unfinished job \"%s\"\n", progname, astat.cfname); return(-1); } + /* check control file mods. */ + if (!nowarn && fdate(cfname) > fdate(sfname)) + fprintf(stderr, + "%s: warning - control file modified since last run\n", + progname); setours: /* set our values */ - gethostname(astat.host, sizeof(astat.host)); + strcpy(astat.host, myhostname()); astat.pid = getpid(); strcpy(astat.cfname, cfname); return(0); fmterr: fprintf(stderr, "%s: format error in status file \"%s\"\n", - progname, buf); + progname, sfname); fclose(fp); return(-1); } -putastat() /* put out current status */ +static void +putastat(void) /* put out current status */ { char buf[256]; FILE *fp; @@ -253,7 +326,8 @@ putastat() /* put out current status */ } -checkdir() /* make sure we have our directory */ +static void +checkdir(void) /* make sure we have our directory */ { struct stat stb; @@ -275,8 +349,11 @@ checkdir() /* make sure we have our directory */ } -setdefaults() /* set default values */ +static void +setdefaults(void) /* set default values */ { + extern char *atos(); + int decades; char buf[256]; if (vdef(ANIMATE)) { @@ -300,12 +377,19 @@ setdefaults() /* set default values */ vdef(START)++; } if (!vdef(END)) { - sprintf(buf, "%d", countviews()); + sprintf(buf, "%d", countviews()+vint(START)-1); vval(END) = savqstr(buf); vdef(END)++; } + if (vint(END) < vint(START)) { + fprintf(stderr, "%s: ending frame less than starting frame\n", + progname); + quit(1); + } if (!vdef(BASENAME)) { - sprintf(buf, "%s/frame%%03d", vval(DIRECTORY)); + decades = (int)log10((double)vint(END)) + 1; + if (decades < 3) decades = 3; + sprintf(buf, "%s/frame%%0%dd", vval(DIRECTORY), decades); vval(BASENAME) = savqstr(buf); vdef(BASENAME)++; } @@ -337,13 +421,25 @@ setdefaults() /* set default values */ vval(DISKSPACE) = "100"; vdef(DISKSPACE)++; } + if (!vdef(RSH)) { + vval(RSH) = REMSH; + vdef(RSH)++; + } + /* locate remote shell program */ + atos(buf, sizeof(buf), vval(RSH)); + if ((remsh = getpath(buf, getenv("PATH"), X_OK)) != NULL) + remsh = savqstr(remsh); + else + remsh = vval(RSH); /* will generate error if used */ + /* append rendering options */ if (vdef(RENDER)) sprintf(rendopt+strlen(rendopt), " %s", vval(RENDER)); } -sethosts() /* set up process servers */ +static void +sethosts(void) /* set up process servers */ { extern char *iskip(); char buf[256], *dir, *uname; @@ -398,40 +494,47 @@ sethosts() /* set up process servers */ } } - -getradfile(rfname) /* run rad and get needed variables */ -char *rfname; +static void +getradfile(char *rfargs) /* run rad and get needed variables */ { static short mvar[] = {OCTREE,PFILT,RESOLUTION,EXPOSURE,-1}; char combuf[256]; register int i; register char *cp; + char *pippt = NULL; /* create rad command */ sprintf(rendopt, " @%s/render.opt", vval(DIRECTORY)); sprintf(combuf, "rad -v 0 -s -e -w %s OPTFILE=%s | egrep '^[ \t]*(NOMATCH", - rfname, rendopt+2); + rfargs, rendopt+2); cp = combuf; - while (*cp) cp++; /* match unset variables */ + while (*cp) { + if (*cp == '|') pippt = cp; + cp++; + } /* match unset variables */ for (i = 0; mvar[i] >= 0; i++) if (!vdef(mvar[i])) { *cp++ = '|'; strcpy(cp, vnam(mvar[i])); while (*cp) cp++; + pippt = NULL; } - sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY)); - cp += 11; /* point to file name */ - if (system(combuf)) { - fprintf(stderr, "%s: bad rad input file \"%s\"\n", - progname, rfname); - quit(1); + if (pippt != NULL) + strcpy(pippt, "> " NULL_DEVICE); /* nothing to match */ + else { + sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY)); + cp += 11; /* point to file name */ } - loadvars(cp); /* load variables and remove file */ - unlink(cp); + system(combuf); /* ignore exit code */ + if (pippt == NULL) { /* load variables and remove file */ + loadvars(cp); + unlink(cp); + } } -animate() /* run animation */ +static void +animate(void) /* run animation */ { int xres, yres; float pa, mult; @@ -442,9 +545,9 @@ animate() /* run animation */ i = sscanf(vval(RESOLUTION), "%d %d %f", &xres, &yres, &pa); mult = vflt(OVERSAMP); if (i == 3) { - sprintf(rresopt, "-x %d -y %d -pa %f", (int)(mult*xres), + sprintf(rresopt, "-x %d -y %d -pa %.3f", (int)(mult*xres), (int)(mult*yres), pa); - sprintf(fresopt, "-x %d -y %d -pa %f", xres, yres, pa); + sprintf(fresopt, "-x %d -y %d -pa %.3f", xres, yres, pa); } else if (i) { if (i == 1) yres = xres; sprintf(rresopt, "-x %d -y %d", (int)(mult*xres), @@ -461,7 +564,7 @@ animate() /* run animation */ progname, vnam(INTERP)); vval(INTERP) = "0"; } - if (atoi(vval(MBLUR))) { /* can't handle this yet */ + if (strcmp(vval(MBLUR),"0")) { /* can't handle this */ if (!nowarn) fprintf(stderr, "%s: resetting %s=0 for animation\n", @@ -471,8 +574,8 @@ animate() /* run animation */ } /* figure # frames per batch */ d1 = mult*xres*mult*yres*4; /* space for orig. picture */ - if ((i=vint(INTERP)) || atoi(vval(MBLUR))) - d1 += mult*xres*mult*yres*4; /* space for z-buffer */ + if ((i=vint(INTERP)) || getblur(NULL, NULL) > 1) + d1 += mult*xres*mult*yres*sizeof(float); /* Z-buffer */ d2 = xres*yres*4; /* space for final picture */ frames_batch = (i+1)*(vflt(DISKSPACE)*1048576.-d1)/(d1+i*d2); if (frames_batch < i+2) { @@ -480,6 +583,9 @@ animate() /* run animation */ progname); quit(1); } + /* initialize archive argument list */ + i = vdef(ARCHIVE) ? strlen(vval(ARCHIVE))+132 : 132; + arcnext = arcfirst = arcargs + i; /* initialize status file */ if (astat.rnext == 0) astat.rnext = astat.fnext = astat.tnext = vint(START); @@ -499,8 +605,8 @@ animate() /* run animation */ } -renderframes(nframes) /* render next nframes frames */ -int nframes; +static void +renderframes(int nframes) /* render next nframes frames */ { static char vendbuf[16]; VIEW *vp; @@ -556,33 +662,28 @@ int nframes; } -filterframes() /* catch up with filtering */ +static void +filterframes(void) /* catch up with filtering */ { - VIEW *vp; register int i; if (astat.tnext < astat.fnext) /* other work to do first */ return; /* filter each view */ - for (i = astat.fnext; i < astat.rnext; i++) { - if ((vp = getview(i)) == NULL) { /* get view i */ - fprintf(stderr, - "%s: unexpected error reading view for frame %d\n", - progname, i); - quit(1); - } - dofilt(i, vp, getexp(i), 0); /* filter frame */ - } + for (i = astat.fnext; i < astat.rnext; i++) + dofilt(i, 0); + bwait(0); /* wait for filter processes */ - archive(astat.fnext, i-1); /* archive originals */ + archive(); /* archive originals */ astat.fnext = i; /* update status */ putastat(); } -transferframes() /* catch up with picture transfers */ +static void +transferframes(void) /* catch up with picture transfers */ { - char combuf[10240]; + char combuf[10240], *fbase; register char *cp; register int i; @@ -593,12 +694,19 @@ transferframes() /* catch up with picture transfers putastat(); /* update status */ return; } - strcpy(combuf, vval(TRANSFER)); /* start transfer command */ - cp = combuf + strlen(combuf); + strcpy(combuf, "cd "); /* start transfer command */ + fbase = dirfile(cp = combuf+3, vval(BASENAME)); + if (*cp) { + while (*++cp) ; + *cp++ = ';'; *cp++ = ' '; + } else + cp = combuf; + strcpy(cp, vval(TRANSFER)); + while (*cp) cp++; /* make argument list */ for (i = astat.tnext; i < astat.fnext; i++) { *cp++ = ' '; - sprintf(cp, vval(BASENAME), i); + sprintf(cp, fbase, i); while (*cp) cp++; strcpy(cp, ".pic"); cp += 4; @@ -613,11 +721,12 @@ transferframes() /* catch up with picture transfers } -animrend(frame, vp) /* start animation frame */ -int frame; -VIEW *vp; +static void +animrend( /* start animation frame */ +int frame, +VIEW *vp +) { - extern int recover(); char combuf[2048]; char fname[128]; @@ -631,11 +740,17 @@ VIEW *vp; } -walkwait(first, last, vfn) /* walk-through frames */ -int first, last; -char *vfn; +static void +walkwait( /* walk-through frames */ +int first, +int last, +char *vfn +) { + double mblurf, dblurf; + int nblur = getblur(&mblurf, &dblurf); char combuf[2048]; + register char *inspoint; register int i; if (!noaction && vint(INTERP)) /* create dummy frames */ @@ -646,13 +761,28 @@ char *vfn; close(open(combuf, O_RDONLY|O_CREAT, 0666)); } /* create command */ - sprintf(combuf, "rpict%s -w0 ", rendopt); - if (vint(INTERP) || atoi(vval(MBLUR))) - sprintf(combuf+strlen(combuf), "-z %s.zbf ", vval(BASENAME)); - sprintf(combuf+strlen(combuf), "-o %s.unf %s -S %d %s < %s", - vval(BASENAME), rresopt, first, vval(OCTREE), vfn); + sprintf(combuf, "rpict%s%s -w0", rendopt, + viewopt(getview(first>1 ? first-1 : 1))); + inspoint = combuf; + while (*inspoint) inspoint++; + if (nblur) { + sprintf(inspoint, " -pm %.3f", mblurf/nblur); + while (*inspoint) inspoint++; + sprintf(inspoint, " -pd %.3f", dblurf/nblur); + while (*inspoint) inspoint++; + } + if (nblur > 1 || vint(INTERP)) { + sprintf(inspoint, " -z %s.zbf", vval(BASENAME)); + while (*inspoint) inspoint++; + } + sprintf(inspoint, " -o %s.unf %s -S %d", + vval(BASENAME), rresopt, first); + while (*inspoint) inspoint++; + sprintf(inspoint, " %s < %s", vval(OCTREE), vfn); /* run in parallel */ - if (pruncom(combuf, (last-first+1)/(vint(INTERP)+1))) { + i = (last-first+1)/(vint(INTERP)+1); + if (i < 1) i = 1; + if (pruncom(combuf, inspoint, i)) { fprintf(stderr, "%s: error rendering frames %d through %d\n", progname, first, last); quit(1); @@ -667,12 +797,13 @@ char *vfn; } -int -recover(frame) /* recover the specified frame */ -int frame; +static int +recover(int frame) /* recover the specified frame */ { static int *rfrm; /* list of recovered frames */ static int nrfrms = 0; + double mblurf, dblurf; + int nblur = getblur(&mblurf, &dblurf); char combuf[2048]; char fname[128]; register char *cp; @@ -688,8 +819,15 @@ int frame; vval(ANIMATE), frame, rendopt); else sprintf(combuf, "rpict%s -w0", rendopt); - cp = combuf + strlen(combuf); - if (vint(INTERP) || atoi(vval(MBLUR))) { + cp = combuf; + while (*cp) cp++; + if (nblur) { + sprintf(cp, " -pm %.3f", mblurf/nblur); + while (*cp) cp++; + sprintf(cp, " -pd %.3f", dblurf/nblur); + while (*cp) cp++; + } + if (nblur > 1 || vint(INTERP)) { sprintf(cp, " -z %s.zbf", fname); while (*cp) cp++; } @@ -703,7 +841,7 @@ int frame; return(1); /* add frame to recovered list */ if (nrfrms) - rfrm = (int *)realloc((char *)rfrm, (nrfrms+1)*sizeof(int)); + rfrm = (int *)realloc((void *)rfrm, (nrfrms+1)*sizeof(int)); else rfrm = (int *)malloc(sizeof(int)); if (rfrm == NULL) { @@ -715,100 +853,114 @@ int frame; } -int -frecover(frame) /* recover filtered frame */ -int frame; +static int +frecover(int frame) /* recover filtered frame */ { - VIEW *vp; - char *ex; - - vp = getview(frame); - ex = getexp(frame); - if (dofilt(frame, vp, ex, 2) && dofilt(frame, vp, ex, 1)) + if (dofilt(frame, 2) && dofilt(frame, 1)) return(1); return(0); } -archive(first, last) /* archive and remove renderings */ -int first, last; +static void +archive(void) /* archive and remove renderings */ { #define RMCOML (sizeof(rmcom)-1) static char rmcom[] = "rm -f"; - int offset = RMCOML; - char combuf[10240]; - struct stat stb; - register char *cp; - register int i; + char basedir[128]; + int dlen, alen; + register int j; - if (noaction) - return; - if (vdef(ARCHIVE) && strlen(vval(ARCHIVE)) > offset) - offset = strlen(vval(ARCHIVE)); - cp = combuf + offset; - *cp++ = ' '; /* make argument list */ - for (i = first; i <= last; i++) { - sprintf(cp, vval(BASENAME), i); - strcat(cp, ".unf"); - if (stat(cp, &stb) == 0 && stb.st_size > 0) { /* non-zero? */ - while (*cp) cp++; - *cp++ = ' '; - sprintf(cp, vval(BASENAME), i); - strcat(cp, ".zbf"); - if (access(cp, F_OK) == 0) { /* exists? */ - while (*cp) cp++; - *cp++ = ' '; - } - } - } - *--cp = '\0'; - if (cp <= combuf + offset) /* no files? */ - return; + if (arcnext == arcfirst) + return; /* nothing to do */ + dirfile(basedir, vval(BASENAME)); + dlen = strlen(basedir); if (vdef(ARCHIVE)) { /* run archive command */ - i = strlen(vval(ARCHIVE)); - strncpy(combuf+offset-i, vval(ARCHIVE), i); - if (runcom(combuf+offset-i)) { - fprintf(stderr, - "%s: error running archive command on frames %d through %d\n", - progname, first, last); + alen = strlen(vval(ARCHIVE)); + if (dlen) { + j = alen + dlen + 5; + strncpy(arcfirst-j, "cd ", 3); + strncpy(arcfirst-j+3, basedir, dlen); + (arcfirst-j)[dlen+3] = ';'; (arcfirst-j)[dlen+4] = ' '; + } else + j = alen; + strncpy(arcfirst-alen, vval(ARCHIVE), alen); + if (runcom(arcfirst-j)) { + fprintf(stderr, "%s: error running archive command\n", + progname); quit(1); } } + if (dlen) { + j = RMCOML + dlen + 5; + strncpy(arcfirst-j, "cd ", 3); + strncpy(arcfirst-j+3, basedir, dlen); + (arcfirst-j)[dlen+3] = ';'; (arcfirst-j)[dlen+4] = ' '; + } else + j = RMCOML; /* run remove command */ - strncpy(combuf+offset-RMCOML, rmcom, RMCOML); - runcom(combuf+offset-RMCOML); + strncpy(arcfirst-RMCOML, rmcom, RMCOML); + runcom(arcfirst-j); + arcnext = arcfirst; /* reset argument list */ #undef RMCOML } -int -dofilt(frame, vp, ep, rvr) /* filter frame */ -int frame; -VIEW *vp; -char *ep; -int rvr; +static int +dofilt( /* filter frame */ +int frame, +int rvr +) { - extern int frecover(); - char fnbefore[128], fnafter[128]; - char combuf[1024], fname[128]; - int usepinterp, usepfilt; + static int iter = 0; + double mblurf, dblurf; + int nblur = getblur(&mblurf, &dblurf); + VIEW *vp = getview(frame); + char *ep = getexp(frame); + char fnbefore[128], fnafter[128], *fbase; + char combuf[1024], fname0[128], fname1[128]; + int usepinterp, usepfilt, nora_rgbe; int frseq[2]; /* check what is needed */ - usepinterp = atoi(vval(MBLUR)); - usepfilt = pfiltalways | ep==NULL; + if (vp == NULL) { + fprintf(stderr, + "%s: unexpected error reading view for frame %d\n", + progname, frame); + quit(1); + } + usepinterp = (nblur > 1); + usepfilt = pfiltalways | (ep==NULL); + if (ep != NULL && !strcmp(ep, "1")) + ep = "+0"; + nora_rgbe = strcmp(vval(OVERSAMP),"1") || ep==NULL || + *ep != '+' || *ep != '-' || !isint(ep); /* compute rendered views */ frseq[0] = frame - ((frame-1) % (vint(INTERP)+1)); frseq[1] = frseq[0] + vint(INTERP) + 1; + fbase = dirfile(NULL, vval(BASENAME)); if (frseq[1] > vint(END)) frseq[1] = vint(END); if (frseq[1] == frame) { /* pfilt only */ frseq[0] = frseq[1]; usepinterp = 0; /* update what's needed */ - usepfilt |= vflt(OVERSAMP)>1.01 || strcmp(ep,"1"); - } else if (frseq[0] == frame) { /* no interpolation */ - /* update what's needed */ - if (!usepinterp) - usepfilt |= vflt(OVERSAMP)>1.01 || strcmp(ep,"1"); + usepfilt |= nora_rgbe; + } else if (frseq[0] == frame) { /* no interpolation needed */ + if (!rvr && frame > 1+vint(INTERP)) { /* archive previous */ + *arcnext++ = ' '; + sprintf(arcnext, fbase, frame-vint(INTERP)-1); + while (*arcnext) arcnext++; + strcpy(arcnext, ".unf"); + arcnext += 4; + if (usepinterp || vint(INTERP)) { /* and Z-buf */ + *arcnext++ = ' '; + sprintf(arcnext, fbase, frame-vint(INTERP)-1); + while (*arcnext) arcnext++; + strcpy(arcnext, ".zbf"); + arcnext += 4; + } + } + if (!usepinterp) /* update what's needed */ + usepfilt |= nora_rgbe; } else /* interpolation needed */ usepinterp++; if (frseq[1] >= astat.rnext) /* next batch unavailable */ @@ -821,46 +973,49 @@ int rvr; if (usepinterp) { /* using pinterp */ if (rvr == 2 && recover(frseq[1])) /* recover after? */ return(1); - if (atoi(vval(MBLUR))) { - FILE *fp; /* motion blurring */ - sprintf(fname, "%s/vw0", vval(DIRECTORY)); - if ((fp = fopen(fname, "w")) == NULL) { - perror(fname); quit(1); - } - fputs(VIEWSTR, fp); - fprintview(vp, fp); - putc('\n', fp); fclose(fp); - if ((vp = getview(frame+1)) == NULL) { - fprintf(stderr, + if (nblur > 1) { /* with pdmblur */ + sprintf(fname0, "%s/vw0%c", vval(DIRECTORY), + 'a'+(iter%26)); + sprintf(fname1, "%s/vw1%c", vval(DIRECTORY), + 'a'+(iter%26)); + if (!noaction) { + FILE *fp; /* motion blurring */ + if ((fp = fopen(fname0, "w")) == NULL) { + perror(fname0); quit(1); + } + fputs(VIEWSTR, fp); + fprintview(vp, fp); + putc('\n', fp); fclose(fp); + if ((vp = getview(frame+1)) == NULL) { + fprintf(stderr, "%s: unexpected error reading view for frame %d\n", - progname, frame+1); - quit(1); + progname, frame+1); + quit(1); + } + if ((fp = fopen(fname1, "w")) == NULL) { + perror(fname1); quit(1); + } + fputs(VIEWSTR, fp); + fprintview(vp, fp); + putc('\n', fp); fclose(fp); } - sprintf(fname, "%s/vw1", vval(DIRECTORY)); - if ((fp = fopen(fname, "w")) == NULL) { - perror(fname); quit(1); - } - fputs(VIEWSTR, fp); - fprintview(vp, fp); - putc('\n', fp); fclose(fp); sprintf(combuf, - "(pmblur %s %d %s/vw0 %s/vw1; rm -f %s/vw0 %s/vw1) | pinterp -B", - *sskip(vval(MBLUR)) ? sskip2(vval(MBLUR),1) : "1", - atoi(vval(MBLUR)), vval(DIRECTORY), - vval(DIRECTORY), vval(DIRECTORY), - vval(DIRECTORY), vval(DIRECTORY)); + "(pmdblur %.3f %.3f %d %s %s; rm -f %s %s) | pinterp -B -a", + mblurf, dblurf, nblur, + fname0, fname1, fname0, fname1); + iter++; } else /* no blurring */ strcpy(combuf, "pinterp"); strcat(combuf, viewopt(vp)); if (vbool(RTRACE)) sprintf(combuf+strlen(combuf), " -ff -fr '%s -w0 %s'", - rendopt, vval(OCTREE)); + rendopt+1, vval(OCTREE)); if (vdef(PINTERP)) sprintf(combuf+strlen(combuf), " %s", vval(PINTERP)); if (usepfilt) sprintf(combuf+strlen(combuf), " %s", rresopt); else - sprintf(combuf+strlen(combuf), " %s -e %s", + sprintf(combuf+strlen(combuf), " -a %s -e %s", fresopt, ep); sprintf(combuf+strlen(combuf), " %s.unf %s.zbf", fnbefore, fnbefore); @@ -895,11 +1050,11 @@ int rvr; } else { /* else just check it */ if (rvr == 2) return(1); - sprintf(combuf, "ra_rgbe -r %s.unf", fnbefore); + sprintf(combuf, "ra_rgbe -e %s -r %s.unf", ep, fnbefore); } /* output file name */ - sprintf(fname, vval(BASENAME), frame); - sprintf(combuf+strlen(combuf), " > %s.pic", fname); + sprintf(fname0, vval(BASENAME), frame); + sprintf(combuf+strlen(combuf), " > %s.pic", fname0); if (rvr) /* in recovery */ return(runcom(combuf)); bruncom(combuf, frame, frecover); /* else run in background */ @@ -907,9 +1062,8 @@ int rvr; } -VIEW * -getview(n) /* get view number n */ -int n; +static VIEW * +getview(int n) /* get view number n */ { static FILE *viewfp = NULL; /* view file pointer */ static int viewnum = 0; /* current view number */ @@ -921,26 +1075,35 @@ int n; fclose(viewfp); viewfp = NULL; viewnum = 0; - copystruct(&curview, &stdview); + curview = stdview; } return(NULL); } - if (viewfp == NULL) { /* open file */ + if (viewfp == NULL) { /* open file */ if ((viewfp = fopen(vval(VIEWFILE), "r")) == NULL) { perror(vval(VIEWFILE)); quit(1); } - } else if (n < viewnum) { /* rewind file */ + } else if (n > 0 && n < viewnum) { /* rewind file */ + if (viewnum == 1 && feof(viewfp)) + return(&curview); /* just one view */ if (fseek(viewfp, 0L, 0) == EOF) { perror(vval(VIEWFILE)); quit(1); } - copystruct(&curview, &stdview); + curview = stdview; viewnum = 0; } + if (n < 0) { /* get next view */ + register int c = getc(viewfp); + if (c == EOF) + return((VIEW *)NULL); /* that's it */ + ungetc(c, viewfp); + n = viewnum + 1; + } while (n > viewnum) { /* scan to desired view */ if (fgets(linebuf, sizeof(linebuf), viewfp) == NULL) - return(NULL); + return(viewnum==1 ? &curview : (VIEW *)NULL); if (isview(linebuf) && sscanview(&curview, linebuf) > 0) viewnum++; } @@ -948,20 +1111,21 @@ int n; } -int -countviews() /* count views in view file */ +static int +countviews(void) /* count views in view file */ { - register int n = 0; + int n; - while (getview(n+1) != NULL) + if (getview(n=1) == NULL) + return(0); + while (getview(-1) != NULL) n++; return(n); } -char * -getexp(n) /* get exposure for nth frame */ -int n; +static char * +getexp(int n) /* get exposure for nth frame */ { extern char *fskip(); static char expval[32]; @@ -973,10 +1137,12 @@ int n; if (n == 0) { /* signal to close file */ if (expfp != NULL) { fclose(expfp); + free((void *)exppos); expfp = NULL; } return(NULL); - } + } else if (n > vint(END)) /* request past end (error?) */ + return(NULL); if (!vdef(EXPOSURE)) /* no setting (auto) */ return(NULL); if (isflt(vval(EXPOSURE))) /* always the same */ @@ -1014,21 +1180,22 @@ int n; } curfrm++; cp = fskip(expval); /* check format */ - if (cp == NULL || *cp != '\n') { + if (cp != NULL) + while (isspace(*cp)) + *cp++ = '\0'; + if (cp == NULL || *cp) { fprintf(stderr, "%s: exposure format error on line %d\n", vval(EXPOSURE), curfrm); quit(1); } - *cp = '\0'; } return(expval); /* return value */ } -struct pslot * -findpslot(pid) /* find or allocate a process slot */ -int pid; +static struct pslot * +findpslot(RT_PID pid) /* find or allocate a process slot */ { register struct pslot *psempty = NULL; register int i; @@ -1043,13 +1210,15 @@ int pid; } -int -donecom(ps, pn, status) /* clean up after finished process */ -PSERVER *ps; -int pn; -int status; +static int +donecom( /* clean up after finished process */ + PSERVER *ps, + int pn, + int status +) { - register PROC *pp; + register NETPROC *pp; + register struct pslot *psl; pp = ps->proc + pn; if (pp->elen) { /* pass errors */ @@ -1061,16 +1230,33 @@ int status; if (ps->hostname[0]) status = 1; /* because rsh doesn't return status */ } + lastpserver = NULL; + psl = findpslot(pp->pid); /* check for bruncom() slot */ + if (psl->pid) { + if (status) { + if (psl->rcvf != NULL) /* attempt recovery */ + status = (*psl->rcvf)(psl->fout); + if (status) { + fprintf(stderr, + "%s: error rendering frame %d\n", + progname, psl->fout); + quit(1); + } + lastpserver = ps; + } + psl->pid = 0; /* free process slot */ + } else if (status) + lastpserver = ps; freestr(pp->com); /* free command string */ - lastpid = pp->pid; /* record PID for bwait() */ - lastpserver = ps; /* record server for serverdown() */ return(status); } -int -serverdown() /* check status of last process server */ +static int +serverdown(void) /* check status of last process server */ { + if (lastpserver == NULL || !lastpserver->hostname[0]) + return(0); if (pserverOK(lastpserver)) /* server still up? */ return(0); delpserver(lastpserver); /* else delete it */ @@ -1083,29 +1269,30 @@ serverdown() /* check status of last process server } -int -bruncom(com, fout, rf) /* run a command in the background */ -char *com; -int fout; -int (*rf)(); +static RT_PID +bruncom( /* run a command in the background */ +char *com, +int fout, +int (*rf)() +) { - int pid; + RT_PID pid; register struct pslot *psl; - if (!silent) - printf("\t%s &\n", com); /* echo command */ - if (noaction) + if (noaction) { + if (!silent) + printf("\t%s\n", com); /* echo command */ return(0); - fflush(stdout); - /* else start it when we can */ - while ((pid = startjob(NULL, savestr(com), donecom)) == -1) + } + com = savestr(com); /* else start it when we can */ + while ((pid = startjob(NULL, com, donecom)) == -1) bwait(1); - if (!silent) { + if (!silent) { /* echo command */ PSERVER *ps; - int psn = pid; - ps = findpjob(&psn); - printf("\tProcess started on %s\n", - ps->hostname[0] ? ps->hostname : LHOSTNAME); + RT_PID psn = pid; + ps = findjob(&psn); + printf("\t%s\n", com); + printf("\tProcess started on %s\n", phostname(ps)); fflush(stdout); } psl = findpslot(pid); /* record info. in appropriate slot */ @@ -1116,76 +1303,95 @@ int (*rf)(); } -bwait(ncoms) /* wait for batch job(s) to finish */ -int ncoms; +static void +bwait(int ncoms) /* wait for batch job(s) to finish */ { int status; - register struct pslot *psl; if (noaction) return; while ((status = wait4job(NULL, -1)) != -1) { - psl = findpslot(lastpid); - if (status) { /* attempt recovery */ - serverdown(); /* check server */ - if (psl->rcvf == NULL || (*psl->rcvf)(psl->fout)) { - fprintf(stderr, - "%s: error rendering frame %d\n", - progname, psl->fout); - quit(1); - } - } - psl->pid = 0; /* free process slot */ - if (!--ncoms) - return; /* done enough */ + serverdown(); /* update server status */ + if (--ncoms == 0) + break; /* done enough */ } } -int -pruncom(com, maxcopies) /* run a command in parallel over network */ -char *com; -int maxcopies; +static int +pruncom( /* run a command in parallel over network */ +char *com, +char *ppins, +int maxcopies +) { int retstatus = 0; int hostcopies; + char buf[10240], *com1, *s; int status; + int pfd; + register int n; register PSERVER *ps; if (!silent) - printf("\t%s &\n", com); /* echo command */ + printf("\t%s\n", com); /* echo command */ if (noaction) return(0); fflush(stdout); /* start jobs on each server */ for (ps = pslist; ps != NULL; ps = ps->next) { hostcopies = 0; - while (maxcopies > 0 && - startjob(ps, savestr(com), donecom) != -1) { - sleep(10); - hostcopies++; - maxcopies--; + if (maxcopies > 1 && ps->nprocs > 1 && ppins != NULL) { + strcpy(com1=buf, com); /* build -PP command */ + sprintf(com1+(ppins-com), " -PP %s/%s.persist", + vval(DIRECTORY), phostname(ps)); + unlink(com1+(ppins-com)+5); + strcat(com1, ppins); + } else + com1 = com; + while (maxcopies > 0) { + s = savestr(com1); + if (startjob(ps, s, donecom) != -1) { + sleep(20); + hostcopies++; + maxcopies--; + } else { + freestr(s); + break; + } } if (!silent && hostcopies) { if (hostcopies > 1) printf("\t%d duplicate processes", hostcopies); else printf("\tProcess"); - printf(" started on %s\n", - ps->hostname[0] ? ps->hostname : LHOSTNAME); + printf(" started on %s\n", phostname(ps)); fflush(stdout); } } /* wait for jobs to finish */ while ((status = wait4job(NULL, -1)) != -1) - if (status) - retstatus += !serverdown(); /* check server */ + retstatus += status && !serverdown(); + /* terminate parallel rpict's */ + for (ps = pslist; ps != NULL; ps = ps->next) { + sprintf(buf, "%s/%s.persist", vval(DIRECTORY), phostname(ps)); + if ((pfd = open(buf, O_RDONLY)) >= 0) { + n = read(pfd, buf, sizeof(buf)-1); /* get PID */ + buf[n] = '\0'; + close(pfd); + for (n = 0; buf[n] && !isspace(buf[n]); n++) + ; + /* terminate */ + sprintf(buf, "kill -ALRM %d", atoi(buf+n)); + wait4job(ps, startjob(ps, buf, NULL)); + } + } return(retstatus); } -runcom(cs) /* run a command locally and wait for it */ -char *cs; +static int +runcom(char *cs) /* run a command locally and wait for it */ { if (!silent) /* echo it */ printf("\t%s\n", cs); @@ -1196,11 +1402,11 @@ char *cs; } -rmfile(fn) /* remove a file */ -char *fn; +static int +rmfile(char *fn) /* remove a file */ { if (!silent) -#ifdef MSDOS +#ifdef _WIN32 printf("\tdel %s\n", fn); #else printf("\trm -f %s\n", fn); @@ -1211,10 +1417,71 @@ char *fn; } -badvalue(vc) /* report bad variable value and exit */ -int vc; +static void +badvalue(int vc) /* report bad variable value and exit */ { fprintf(stderr, "%s: bad value for variable '%s'\n", progname, vnam(vc)); quit(1); +} + + +static char * +dirfile( /* separate path into directory and file */ +char *df, +register char *path +) +{ + register int i; + int psep; + + for (i = 0, psep = -1; path[i]; i++) + if (path[i] == '/') + psep = i; + if (df != NULL) { + if (psep == 0) { + df[0] = '/'; + df[1] = '\0'; + } else if (psep > 0) { + strncpy(df, path, psep); + df[psep] = '\0'; + } else + df[0] = '\0'; + } + return(path+psep+1); +} + + +static int +getblur(double *mbf, double *dbf) /* get # blur samples (and fraction) */ +{ + double mblurf, dblurf; + int nmblur, ndblur; + char *s; + /* get motion blur */ + if (!vdef(MBLUR) || (mblurf = atof(vval(MBLUR))) < 0.0) + mblurf = 0.0; + if (mbf != NULL) + *mbf = mblurf; + if (mblurf <= FTINY) + nmblur = 0; + else if (!*(s = sskip(vval(MBLUR)))) + nmblur = DEF_NBLUR; + else if ((nmblur = atoi(s)) <= 0) + nmblur = 1; + /* get depth-of-field blur */ + if (!vdef(DBLUR) || (dblurf = atof(vval(DBLUR))) < 0.0) + dblurf = 0.0; + if (dbf != NULL) + *dbf = dblurf; + if (dblurf <= FTINY) + ndblur = 0; + else if (!*(s = sskip(vval(DBLUR)))) + ndblur = DEF_NBLUR; + else if ((ndblur = atoi(s)) <= 0) + ndblur = 1; + if ((nmblur == 1) & (ndblur == 1)) + return(1); + /* return combined samples */ + return(nmblur + ndblur); }