--- ray/src/util/ranimove.c 2003/03/10 17:26:26 3.3 +++ ray/src/util/ranimove.c 2004/09/28 17:54:19 3.12 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id"; +static const char RCSid[] = "$Id: ranimove.c,v 3.12 2004/09/28 17:54:19 greg Exp $"; #endif /* * Radiance object animation program @@ -11,11 +11,18 @@ static const char RCSid[] = "$Id"; #include "copyright.h" -#include "ranimove.h" #include -#include +#ifdef _WIN32 + #include /* struct timeval. XXX find a replacement? */ +#else + #include +#endif #include +#include +#include "paths.h" +#include "ranimove.h" + int NVARS = NV_INIT; /* total number of variables */ VARIABLE vv[] = VV_INIT; /* variable-value pairs */ @@ -55,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; @@ -92,7 +109,7 @@ char *argv[]; case 'f': /* frame range */ switch (sscanf(argv[++i], "%d,%d", &fbeg, &fend)) { case 2: - if ((fbeg <= 0 | fend < fbeg)) + if ((fbeg <= 0) | (fend < fbeg)) goto userr; break; case 1: @@ -136,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); @@ -146,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; @@ -169,8 +188,8 @@ register char *s; } -void -setdefaults() /* set default values */ +static void +setdefaults(void) /* set default values */ { int nviews; int decades; @@ -242,14 +261,15 @@ setdefaults() /* set default values */ setrendparams(lorendoptf, vval(LOWQ)); ray_save(&lorendparams); curparams = &lorendparams; - twolevels = bcmp(&lorendparams, &hirendparams, sizeof(RAYPARAMS)); + twolevels = memcmp(&lorendparams, &hirendparams, sizeof(RAYPARAMS)); } -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; @@ -294,7 +314,7 @@ char *ms; if (isflt(om->prio_file)) { om->prio = atof(om->prio_file); om->prio_file[0] = '\0'; - haveprio |= (om->prio < 0.95 | om->prio > 1.05); + haveprio |= ((om->prio < 0.95) | (om->prio > 1.05)); } else haveprio = 1; } else @@ -306,10 +326,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; @@ -329,8 +350,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) @@ -344,25 +365,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, @@ -383,7 +404,7 @@ char *rfargs; pippt = NULL; } if (pippt != NULL) - strcpy(pippt, "> /dev/null"); /* nothing to match */ + strcpy(pippt, "> " NULL_DEVICE); /* nothing to match */ else { strcpy(cp, ")[ \t]*=' > ranimove.var"); cp += 11; /* point to file name */ @@ -405,8 +426,8 @@ char *rfargs; } -void -animate() /* run through animation */ +static void +animate(void) /* run through animation */ { int rpass; @@ -437,9 +458,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 */ @@ -451,7 +473,7 @@ int n; fclose(viewfp); viewfp = NULL; viewnum = 0; - copystruct(&curview, &stdview); + curview = stdview; } return(NULL); } @@ -467,7 +489,7 @@ int n; perror(vval(VIEWFILE)); quit(1); } - copystruct(&curview, &stdview); + curview = stdview; viewnum = 0; } if (n < 0) { /* get next view */ @@ -487,8 +509,8 @@ int n; } -int -countviews() /* count views in view file */ +static int +countviews(void) /* count views in view file */ { int n; @@ -500,9 +522,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]; @@ -554,12 +577,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; @@ -567,15 +592,16 @@ char *s; return(1.0); expval = atof(s); - if ((s[0] == '+' | s[0] == '-')) + if ((s[0] == '+') | (s[0] == '-')) return(pow(2.0, expval)); return(expval); } -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; @@ -627,9 +653,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; @@ -645,10 +672,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; @@ -756,19 +784,21 @@ int n; om->cprio = om->prio; } /* XXX bxfm relies on call order */ - if (framestep) + if (framestep) { if (invmat4(om->bxfm, om->cxfm)) multmat4(om->bxfm, om->bxfm, oxf.xfm); else setident4(om->bxfm); + } /* all done */ return(xfp); } -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; @@ -786,7 +816,7 @@ OBJECT obj; objnm = obj_move[i].name; len = strlen(objnm); if (!strncmp(onm, objnm, len)) { - if ((obj_move[i].parent < 0 & onm[len] == '.')) + if ((obj_move[i].parent < 0) & (onm[len] == '.')) break; objnm = getobjname(&obj_move[i]) + len; len2 = strlen(objnm); @@ -799,9 +829,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; @@ -811,8 +842,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 */