--- ray/src/util/ranimate.c 2003/07/27 22:12:03 2.41 +++ ray/src/util/ranimate.c 2005/01/18 03:59:41 2.48 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: ranimate.c,v 2.41 2003/07/27 22:12:03 schorsch Exp $"; +static const char RCSid[] = "$Id: ranimate.c,v 2.48 2005/01/18 03:59:41 greg Exp $"; #endif /* * Radiance animation control program @@ -15,11 +15,15 @@ static const char RCSid[] = "$Id: ranimate.c,v 2.41 20 #include "copyright.h" +#include #include #include +#include +#include -#include "standard.h" +#include "platform.h" #include "paths.h" +#include "standard.h" #include "view.h" #include "vars.h" #include "netproc.h" @@ -28,42 +32,40 @@ static const char RCSid[] = "$Id: ranimate.c,v 2.41 20 #define DEF_NBLUR 5 #endif /* default remote shell */ -#ifdef _AUX_SOURCE -#define REMSH "remsh" -#else #define REMSH "rsh" -#endif /* input variables (alphabetical by name) */ #define ANIMATE 0 /* animation command */ #define ARCHIVE 1 /* archiving command */ #define BASENAME 2 /* output image base name */ -#define DIRECTORY 3 /* working (sub)directory */ -#define DISKSPACE 4 /* how much disk space to use */ -#define END 5 /* ending frame number */ -#define EXPOSURE 6 /* how to compute exposure */ -#define HOST 7 /* rendering host machine */ -#define INTERP 8 /* # frames to interpolate */ -#define MBLUR 9 /* motion blur parameters */ -#define NEXTANIM 10 /* next animation file */ -#define OCTREE 11 /* octree file name */ -#define OVERSAMP 12 /* # times to oversample image */ -#define PFILT 13 /* pfilt options */ -#define PINTERP 14 /* pinterp options */ -#define RENDER 15 /* rendering options */ -#define RESOLUTION 16 /* desired final resolution */ -#define RIF 17 /* rad input file */ -#define RSH 18 /* remote shell script or program */ -#define RTRACE 19 /* use rtrace with pinterp? */ -#define START 20 /* starting frame number */ -#define TRANSFER 21 /* frame transfer command */ -#define VIEWFILE 22 /* animation frame views */ +#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 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 = 23; /* 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}, @@ -121,21 +123,46 @@ struct pslot { int npslots; /* number of process slots */ #define phostname(ps) ((ps)->hostname[0] ? (ps)->hostname : astat.host) - -struct pslot *findpslot(); - PSERVER *lastpserver; /* last process server with error */ -VIEW *getview(); -char *getexp(), *dirfile(); -int getblur(); +static struct pslot * findpslot(int pid); +static void checkdir(void); +static VIEW * getview(int n); -extern time_t time(); +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 int 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; @@ -198,13 +225,16 @@ char *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 sfname[256]; FILE *fp; @@ -268,7 +298,8 @@ fmterr: } -putastat() /* put out current status */ +static void +putastat(void) /* put out current status */ { char buf[256]; FILE *fp; @@ -290,7 +321,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; @@ -312,7 +344,8 @@ checkdir() /* make sure we have our directory */ } -setdefaults() /* set default values */ +static void +setdefaults(void) /* set default values */ { extern char *atos(); int decades; @@ -400,7 +433,8 @@ setdefaults() /* set default values */ } -sethosts() /* set up process servers */ +static void +sethosts(void) /* set up process servers */ { extern char *iskip(); char buf[256], *dir, *uname; @@ -455,15 +489,14 @@ sethosts() /* set up process servers */ } } - -getradfile(rfargs) /* run rad and get needed variables */ -char *rfargs; +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; + char *pippt = NULL; /* create rad command */ sprintf(rendopt, " @%s/render.opt", vval(DIRECTORY)); sprintf(combuf, @@ -495,7 +528,8 @@ char *rfargs; } -animate() /* run animation */ +static void +animate(void) /* run animation */ { int xres, yres; float pa, mult; @@ -535,7 +569,7 @@ animate() /* run animation */ } /* figure # frames per batch */ d1 = mult*xres*mult*yres*4; /* space for orig. picture */ - if ((i=vint(INTERP)) || getblur(NULL) > 1) + 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); @@ -566,8 +600,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; @@ -623,9 +657,9 @@ 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 */ @@ -641,7 +675,8 @@ filterframes() /* catch up with filtering */ } -transferframes() /* catch up with picture transfers */ +static void +transferframes(void) /* catch up with picture transfers */ { char combuf[10240], *fbase; register char *cp; @@ -681,11 +716,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]; @@ -699,12 +735,15 @@ 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 blurf; - int nblur = getblur(&blurf); + double mblurf, dblurf; + int nblur = getblur(&mblurf, &dblurf); char combuf[2048]; register char *inspoint; register int i; @@ -722,8 +761,10 @@ char *vfn; inspoint = combuf; while (*inspoint) inspoint++; if (nblur) { - sprintf(inspoint, " -pm %.3f", blurf/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)); @@ -751,14 +792,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 blurf; - int nblur = getblur(&blurf); + double mblurf, dblurf; + int nblur = getblur(&mblurf, &dblurf); char combuf[2048]; char fname[128]; register char *cp; @@ -777,8 +817,10 @@ int frame; cp = combuf; while (*cp) cp++; if (nblur) { - sprintf(cp, " -pm %.3f", blurf/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); @@ -806,9 +848,8 @@ int frame; } -int -frecover(frame) /* recover filtered frame */ -int frame; +static int +frecover(int frame) /* recover filtered frame */ { if (dofilt(frame, 2) && dofilt(frame, 1)) return(1); @@ -816,7 +857,8 @@ int frame; } -archive() /* archive and remove renderings */ +static void +archive(void) /* archive and remove renderings */ { #define RMCOML (sizeof(rmcom)-1) static char rmcom[] = "rm -f"; @@ -859,15 +901,15 @@ archive() /* archive and remove renderings */ } -int -dofilt(frame, rvr) /* filter frame */ -int frame; -int rvr; +static int +dofilt( /* filter frame */ +int frame, +int rvr +) { - extern int frecover(); static int iter = 0; - double blurf; - int nblur = getblur(&blurf); + double mblurf, dblurf; + int nblur = getblur(&mblurf, &dblurf); VIEW *vp = getview(frame); char *ep = getexp(frame); char fnbefore[128], fnafter[128], *fbase; @@ -881,12 +923,6 @@ int rvr; progname, frame); quit(1); } - if (ep == NULL) { - fprintf(stderr, - "%s: unexpected error reading exposure for frame %d\n", - progname, frame); - quit(1); - } usepinterp = (nblur > 1); usepfilt = pfiltalways | (ep==NULL); if (ep != NULL && !strcmp(ep, "1")) @@ -932,7 +968,7 @@ int rvr; if (usepinterp) { /* using pinterp */ if (rvr == 2 && recover(frseq[1])) /* recover after? */ return(1); - if (nblur > 1) { /* with pmblur */ + if (nblur > 1) { /* with pdmblur */ sprintf(fname0, "%s/vw0%c", vval(DIRECTORY), 'a'+(iter%26)); sprintf(fname1, "%s/vw1%c", vval(DIRECTORY), @@ -959,8 +995,8 @@ int rvr; putc('\n', fp); fclose(fp); } sprintf(combuf, - "(pmblur %.3f %d %s %s; rm -f %s %s) | pinterp -B -a", - blurf, nblur, + "(pmdblur %.3f %.3f %d %s %s; rm -f %s %s) | pinterp -B -a", + mblurf, dblurf, nblur, fname0, fname1, fname0, fname1); iter++; } else /* no blurring */ @@ -1021,9 +1057,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 */ @@ -1071,8 +1106,8 @@ int n; } -int -countviews() /* count views in view file */ +static int +countviews(void) /* count views in view file */ { int n; @@ -1084,9 +1119,8 @@ countviews() /* count views in view file */ } -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]; @@ -1155,9 +1189,8 @@ int n; } -struct pslot * -findpslot(pid) /* find or allocate a process slot */ -int pid; +static struct pslot * +findpslot(int pid) /* find or allocate a process slot */ { register struct pslot *psempty = NULL; register int i; @@ -1172,13 +1205,14 @@ 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; @@ -1213,8 +1247,8 @@ int 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); @@ -1230,11 +1264,12 @@ 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 int +bruncom( /* run a command in the background */ +char *com, +int fout, +int (*rf)() +) { int pid; register struct pslot *psl; @@ -1263,8 +1298,8 @@ 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; @@ -1278,10 +1313,12 @@ int ncoms; } -int -pruncom(com, ppins, maxcopies) /* run a command in parallel over network */ -char *com, *ppins; -int maxcopies; +static int +pruncom( /* run a command in parallel over network */ +char *com, +char *ppins, +int maxcopies +) { int retstatus = 0; int hostcopies; @@ -1348,8 +1385,8 @@ int maxcopies; } -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); @@ -1360,8 +1397,8 @@ char *cs; } -rmfile(fn) /* remove a file */ -char *fn; +static int +rmfile(char *fn) /* remove a file */ { if (!silent) #ifdef _WIN32 @@ -1375,8 +1412,8 @@ 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)); @@ -1384,10 +1421,11 @@ int vc; } -char * -dirfile(df, path) /* separate path into directory and file */ -char *df; -register char *path; +static char * +dirfile( /* separate path into directory and file */ +char *df, +register char *path +) { register int i; int psep; @@ -1409,30 +1447,36 @@ register char *path; } -int -getblur(double *bf) /* get # blur samples (and fraction) */ +static int +getblur(double *mbf, double *dbf) /* get # blur samples (and fraction) */ { - double blurf; - int nblur; + double mblurf, dblurf; + int nmblur, ndblur; char *s; - - if (!vdef(MBLUR)) { - if (bf != NULL) - *bf = 0.0; - return(0); - } - blurf = atof(vval(MBLUR)); - if (blurf < 0.0) - blurf = 0.0; - if (bf != NULL) - *bf = blurf; - if (blurf <= FTINY) - return(0); - s = sskip(vval(MBLUR)); - if (!*s) - return(DEF_NBLUR); - nblur = atoi(s); - if (nblur <= 0) + /* 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(nblur); + /* return combined samples */ + return(nmblur + ndblur); }