--- ray/src/util/ranimove.c 2003/07/27 22:12:03 3.7 +++ ray/src/util/ranimove.c 2009/12/12 19:01:00 3.13 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id"; +static const char RCSid[] = "$Id: ranimove.c,v 3.13 2009/12/12 19:01:00 greg Exp $"; #endif /* * Radiance object animation program @@ -12,7 +12,9 @@ static const char RCSid[] = "$Id"; #include "copyright.h" #include -#ifndef _WIN32 +#ifdef _WIN32 + #include /* struct timeval. XXX find a replacement? */ +#else #include #endif #include @@ -60,11 +62,21 @@ int haveprio = 0; /* high-level saliency specified */ int gargc; /* global argc for printargs */ char **gargv; /* global argv for printargs */ +static void setdefaults(void); +static void setmove(struct ObjMove *om, char *ms); +static void setrendparams(char *optf, char *qval); +static void getradfile(char *rfargs); +static void animate(void); +static int countviews(void); /* XXX duplicated function */ +static char * getobjname(struct ObjMove *om); +static char * getxf(struct ObjMove *om, int n); + int -main(argc, argv) -int argc; -char *argv[]; +main( + int argc, + char *argv[] +) { int explicate = 0; char *cfname; @@ -141,7 +153,7 @@ char *argv[]; /* all done */ if (lorendoptf[0]) unlink(lorendoptf); - if (hirendoptf[0]) + if (hirendoptf[0] && strcmp(hirendoptf, lorendoptf)) unlink(hirendoptf); if (objtmpf[0]) unlink(objtmpf); @@ -151,12 +163,14 @@ userr: "Usage: %s [-n nprocs][-f beg,end][-t sec][-d jnd][-s][-w][-e] anim_file\n", progname); quit(1); + return 1; /* pro forma return */ } void -eputs(s) /* put string to stderr */ -register char *s; +eputs( /* put string to stderr */ + register char *s +) { static int midline = 0; @@ -175,8 +189,18 @@ register char *s; void -setdefaults() /* set default values */ +quit(ec) /* make sure exit is called */ +int ec; { + if (ray_pnprocs > 0) /* close children if any */ + ray_pclose(0); + exit(ec); +} + + +static void +setdefaults(void) /* set default values */ +{ int nviews; int decades; char buf[256]; @@ -251,10 +275,11 @@ setdefaults() /* set default values */ } -void -setmove(om, ms) /* assign a move object from spec. */ -struct ObjMove *om; -char *ms; +static void +setmove( /* assign a move object from spec. */ + struct ObjMove *om, + char *ms +) { char parname[128]; char *cp; @@ -311,10 +336,11 @@ badspec: } -void -setrendparams(optf, qval) /* set global rendering parameters */ -char *optf; -char *qval; +static void +setrendparams( /* set global rendering parameters */ + char *optf, + char *qval +) { char *argv[1024]; char **av = argv; @@ -334,8 +360,8 @@ char *qval; if (qval != NULL && qval[0] == '-') ac += wordstring(av+ac, qval); - /* start with default parameters */ - ray_defaults(NULL); + /* restore default parameters */ + ray_restore(NULL); /* set what we have */ for (i = 0; i < ac; i++) { while ((rval = expandarg(&ac, &av, i)) > 0) @@ -349,25 +375,25 @@ char *qval; continue; } rval = getrenderopt(ac-i, av+i); - if (rval >= 0) { - i += rval; - continue; + if (rval < 0) { + sprintf(errmsg, "bad render option at '%s'", av[i]); + error(USER, errmsg); } - sprintf(errmsg, "bad render option at '%s'", av[i]); - error(USER, errmsg); + i += rval; } } -void -getradfile(rfargs) /* run rad and get needed variables */ -char *rfargs; +static void +getradfile( /* run rad and get needed variables */ + char *rfargs +) { static short mvar[] = {OCONV,OCTREEF,RESOLUTION,EXPOSURE,-1}; char combuf[256]; register int i; register char *cp; - char *pippt; + char *pippt = NULL; /* create rad command */ strcpy(lorendoptf, "ranim0.opt"); sprintf(combuf, @@ -410,8 +436,8 @@ char *rfargs; } -void -animate() /* run through animation */ +static void +animate(void) /* run through animation */ { int rpass; @@ -442,9 +468,10 @@ animate() /* run through animation */ } -VIEW * -getview(n) /* get view number n */ -int n; +extern VIEW * +getview( /* get view number n */ + int n +) { static FILE *viewfp = NULL; /* view file pointer */ static int viewnum = 0; /* current view number */ @@ -492,8 +519,8 @@ int n; } -int -countviews() /* count views in view file */ +static int +countviews(void) /* count views in view file */ { int n; @@ -505,9 +532,10 @@ countviews() /* count views in view file */ } -char * -getexp(n) /* get exposure for nth frame */ -int n; +extern char * +getexp( /* get exposure for nth frame */ + int n +) { extern char *fskip(); static char expval[32]; @@ -559,12 +587,14 @@ formerr: sprintf(errmsg, "%s: exposure format error on line %d", vval(EXPOSURE), curfrm); error(USER, errmsg); + return NULL; /* pro forma return */ } -double -expspec_val(s) /* get exposure value from spec. */ -char *s; +extern double +expspec_val( /* get exposure value from spec. */ + char *s +) { double expval; @@ -578,9 +608,10 @@ char *s; } -char * -getoctspec(n) /* get octree for the given frame */ -int n; +extern char * +getoctspec( /* get octree for the given frame */ + int n +) { static char combuf[1024]; int cfm = 0; @@ -632,9 +663,10 @@ int n; } -char * -getobjname(om) /* get fully qualified object name */ -register struct ObjMove *om; +static char * +getobjname( /* get fully qualified object name */ + register struct ObjMove *om +) { static char objName[512]; register char *cp = objName; @@ -650,10 +682,11 @@ register struct ObjMove *om; } -char * -getxf(om, n) /* get total transform for object */ -register struct ObjMove *om; -int n; +static char * +getxf( /* get total transform for object */ + register struct ObjMove *om, + int n +) { static char xfsbuf[4096]; char *xfp; @@ -772,9 +805,10 @@ int n; } -int -getmove(obj) /* find matching move object */ -OBJECT obj; +extern int +getmove( /* find matching move object */ + OBJECT obj +) { static int lasti; static OBJECT lasto = OVOID; @@ -805,9 +839,10 @@ OBJECT obj; } -double -obj_prio(obj) /* return priority for object */ -OBJECT obj; +extern double +obj_prio( /* return priority for object */ + OBJECT obj +) { int moi; @@ -817,8 +852,8 @@ OBJECT obj; } -double -getTime() /* get current time (CPU or real) */ +extern double +getTime(void) /* get current time (CPU or real) */ { struct timeval time_now; /* return CPU time if one process */