ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/ranimate.c
(Generate patch)

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.29 by greg, Sat Feb 22 02:07:30 2003 UTC vs.
Revision 2.51 by greg, Tue Feb 28 03:44:54 2006 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   * Radiance animation control program
# Line 13 | Line 13 | static const char      RCSid[] = "$Id$";
13   * See the ranimate(1) man page for further details.
14   */
15  
16 < /* ====================================================================
17 < * The Radiance Software License, Version 1.0
18 < *
19 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
20 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
21 < *
22 < * Redistribution and use in source and binary forms, with or without
23 < * modification, are permitted provided that the following conditions
24 < * are met:
25 < *
26 < * 1. Redistributions of source code must retain the above copyright
27 < *         notice, this list of conditions and the following disclaimer.
28 < *
29 < * 2. Redistributions in binary form must reproduce the above copyright
30 < *       notice, this list of conditions and the following disclaimer in
31 < *       the documentation and/or other materials provided with the
32 < *       distribution.
33 < *
34 < * 3. The end-user documentation included with the redistribution,
35 < *           if any, must include the following acknowledgment:
36 < *             "This product includes Radiance software
37 < *                 (http://radsite.lbl.gov/)
38 < *                 developed by the Lawrence Berkeley National Laboratory
39 < *               (http://www.lbl.gov/)."
40 < *       Alternately, this acknowledgment may appear in the software itself,
41 < *       if and wherever such third-party acknowledgments normally appear.
42 < *
43 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
44 < *       and "The Regents of the University of California" must
45 < *       not be used to endorse or promote products derived from this
46 < *       software without prior written permission. For written
47 < *       permission, please contact [email protected].
48 < *
49 < * 5. Products derived from this software may not be called "Radiance",
50 < *       nor may "Radiance" appear in their name, without prior written
51 < *       permission of Lawrence Berkeley National Laboratory.
52 < *
53 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
54 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
55 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
56 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
57 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
58 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
59 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
60 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
61 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
62 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
63 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
64 < * SUCH DAMAGE.
65 < * ====================================================================
66 < *
67 < * This software consists of voluntary contributions made by many
68 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
69 < * information on Lawrence Berkeley National Laboratory, please see
70 < * <http://www.lbl.gov/>.
71 < */
16 > #include "copyright.h"
17  
18 < #include "standard.h"
18 > #include <stdio.h>
19   #include <ctype.h>
20   #include <sys/stat.h>
21 + #include <time.h>
22 + #include <signal.h>
23 +
24 + #include "platform.h"
25 + #include "rtprocess.h"
26 + #include "paths.h"
27 + #include "standard.h"
28   #include "view.h"
29   #include "vars.h"
30   #include "netproc.h"
# Line 81 | Line 33 | static const char      RCSid[] = "$Id$";
33   #define DEF_NBLUR       5
34   #endif
35                                  /* default remote shell */
36 < #ifdef _AUX_SOURCE
37 < #define REMSH           "remsh"
86 < #else
87 < #define REMSH           "rsh"
36 > #ifndef REMSH
37 > #define REMSH           "ssh"
38   #endif
39                                  /* input variables (alphabetical by name) */
40   #define ANIMATE         0               /* animation command */
41   #define ARCHIVE         1               /* archiving command */
42   #define BASENAME        2               /* output image base name */
43 < #define DIRECTORY       3               /* working (sub)directory */
44 < #define DISKSPACE       4               /* how much disk space to use */
45 < #define END             5               /* ending frame number */
46 < #define EXPOSURE        6               /* how to compute exposure */
47 < #define HOST            7               /* rendering host machine */
48 < #define INTERP          8               /* # frames to interpolate */
49 < #define MBLUR           9               /* motion blur parameters */
50 < #define NEXTANIM        10              /* next animation file */
51 < #define OCTREE          11              /* octree file name */
52 < #define OVERSAMP        12              /* # times to oversample image */
53 < #define PFILT           13              /* pfilt options */
54 < #define PINTERP         14              /* pinterp options */
55 < #define RENDER          15              /* rendering options */
56 < #define RESOLUTION      16              /* desired final resolution */
57 < #define RIF             17              /* rad input file */
58 < #define RSH             18              /* remote shell script or program */
59 < #define RTRACE          19              /* use rtrace with pinterp? */
60 < #define START           20              /* starting frame number */
61 < #define TRANSFER        21              /* frame transfer command */
62 < #define VIEWFILE        22              /* animation frame views */
43 > #define DBLUR           3               /* depth of field blur */
44 > #define DIRECTORY       4               /* working (sub)directory */
45 > #define DISKSPACE       5               /* how much disk space to use */
46 > #define END             6               /* ending frame number */
47 > #define EXPOSURE        7               /* how to compute exposure */
48 > #define HOST            8               /* rendering host machine */
49 > #define INTERP          9               /* # frames to interpolate */
50 > #define MBLUR           10              /* motion blur parameters */
51 > #define NEXTANIM        11              /* next animation file */
52 > #define OCTREE          12              /* octree file name */
53 > #define OVERSAMP        13              /* # times to oversample image */
54 > #define PFILT           14              /* pfilt options */
55 > #define PINTERP         15              /* pinterp options */
56 > #define RENDER          16              /* rendering options */
57 > #define RESOLUTION      17              /* desired final resolution */
58 > #define RIF             18              /* rad input file */
59 > #define RSH             19              /* remote shell script or program */
60 > #define RTRACE          20              /* use rtrace with pinterp? */
61 > #define START           21              /* starting frame number */
62 > #define TRANSFER        22              /* frame transfer command */
63 > #define VIEWFILE        23              /* animation frame views */
64  
65 < int     NVARS = 23;             /* total number of variables */
65 > int     NVARS = 24;             /* total number of variables */
66  
67   VARIABLE        vv[] = {                /* variable-value pairs */
68          {"ANIMATE",     2,      0,      NULL,   onevalue},
69          {"ARCHIVE",     2,      0,      NULL,   onevalue},
70          {"BASENAME",    3,      0,      NULL,   onevalue},
71 +        {"DBLUR",       2,      0,      NULL,   onevalue},
72          {"DIRECTORY",   3,      0,      NULL,   onevalue},
73          {"DISKSPACE",   3,      0,      NULL,   fltvalue},
74          {"END",         2,      0,      NULL,   intvalue},
# Line 143 | Line 95 | VARIABLE       vv[] = {                /* variable-value pairs */
95  
96   struct {
97          char    host[64];               /* control host name */
98 <        int     pid;                    /* control process id */
98 >        RT_PID  pid;                    /* control process id */
99          char    cfname[128];            /* control file name */
100          int     rnext;                  /* next frame to render */
101          int     fnext;                  /* next frame to filter */
# Line 167 | Line 119 | char   arcargs[10240];         /* files to archive */
119   char    *arcfirst, *arcnext;    /* pointers to first and next argument */
120  
121   struct pslot {
122 <        int     pid;                    /* process ID (0 if empty) */
122 >        RT_PID  pid;                    /* process ID (0 if empty) */
123          int     fout;                   /* output frame number */
124          int     (*rcvf)();              /* recover function */
125   }       *pslot;                 /* process slots */
126   int     npslots;                /* number of process slots */
127  
128   #define phostname(ps)   ((ps)->hostname[0] ? (ps)->hostname : astat.host)
177 –
178 – struct pslot    *findpslot();
179 –
129   PSERVER *lastpserver;           /* last process server with error */
130  
131 < VIEW    *getview();
132 < char    *getexp(), *dirfile();
133 < int     getblur();
131 > static struct pslot * findpslot(RT_PID pid);
132 > static void checkdir(void);
133 > static VIEW * getview(int n);
134  
135 < extern time_t   time();
135 > static char * dirfile(char *df, register char *path);
136 > static char * getexp(int n);
137 > static int getblur(double *mbf, double *dbf);
138 > static int getastat(void);
139 > static void getradfile(char *rfargs);
140 > static void badvalue(int vc);
141 > static int rmfile(char *fn);
142 > static int runcom(char *cs);
143 > static int pruncom(char *com, char *ppins, int maxcopies);
144 > static void bwait(int ncoms);
145 > static RT_PID bruncom(char *com, int fout, int (*rf)());
146 > static int serverdown(void);
147 > static pscompfunc donecom;
148 > static int countviews(void);
149 > static int dofilt(int frame, int rvr);
150 > static void archive(void);
151 > static int frecover(int frame);
152 > static int recover(int frame);
153 > static void sethosts(void);
154 > static void walkwait(int first, int last, char *vfn);
155 > static void animrend(int frame, VIEW *vp);
156 > static void transferframes(void);
157 > static void filterframes(void);
158 > static void renderframes(int nframes);
159 > static void animate(void);
160 > static void setdefaults(void);
161 > static void putastat(void);
162  
163  
164 < main(argc, argv)
165 < int     argc;
166 < char    *argv[];
164 > int
165 > main(
166 >        int     argc,
167 >        char    *argv[]
168 > )
169   {
170          int     explicate = 0;
171          int     i;
# Line 241 | Line 218 | char   *argv[];
218          animate();
219                                                  /* all done */
220          if (vdef(NEXTANIM)) {
221 +                char    *fullp;
222                  argv[i] = vval(NEXTANIM);       /* just change input file */
223                  if (!silent)
224                          printargs(argc, argv, stdout);
225 <                if ((argv[0] = getpath(progname,getenv("PATH"),X_OK)) == NULL)
226 <                        fprintf(stderr, "%s: command not found\n", progname);
225 >                fflush(stdout);
226 >                if ((fullp = getpath(argv[0],getenv("PATH"),X_OK)) == NULL)
227 >                        fprintf(stderr, "%s: command not found\n", argv[0]);
228                  else
229 <                        execv(progname, argv);
229 >                        execv(fullp, argv);
230                  quit(1);
231          }
232          quit(0);
233 +        return(0); /* pro forma return */
234   userr:
235          fprintf(stderr, "Usage: %s [-s][-n][-w][-e] anim_file\n", progname);
236          quit(1);
237 +        return 1; /* pro forma return */
238   }
239  
240  
241 < getastat()                      /* check/set animation status */
241 > static int
242 > getastat(void)                  /* check/set animation status */
243   {
244          char    sfname[256];
245          FILE    *fp;
# Line 321 | Line 303 | fmterr:
303   }
304  
305  
306 < putastat()                      /* put out current status */
306 > static void
307 > putastat(void)                  /* put out current status */
308   {
309          char    buf[256];
310          FILE    *fp;
# Line 343 | Line 326 | putastat()                     /* put out current status */
326   }
327  
328  
329 < checkdir()                      /* make sure we have our directory */
329 > static void
330 > checkdir(void)                  /* make sure we have our directory */
331   {
332          struct stat     stb;
333  
# Line 365 | Line 349 | checkdir()                     /* make sure we have our directory */
349   }
350  
351  
352 < setdefaults()                   /* set default values */
352 > static void
353 > setdefaults(void)                       /* set default values */
354   {
355          extern char     *atos();
356          int     decades;
# Line 453 | Line 438 | setdefaults()                  /* set default values */
438   }
439  
440  
441 < sethosts()                      /* set up process servers */
441 > static void
442 > sethosts(void)                  /* set up process servers */
443   {
444          extern char     *iskip();
445          char    buf[256], *dir, *uname;
# Line 508 | Line 494 | sethosts()                     /* set up process servers */
494          }
495   }
496  
497 <
498 < getradfile(rfargs)              /* run rad and get needed variables */
513 < char    *rfargs;
497 > static void
498 > getradfile(char *rfargs)                /* run rad and get needed variables */
499   {
500          static short    mvar[] = {OCTREE,PFILT,RESOLUTION,EXPOSURE,-1};
501          char    combuf[256];
502          register int    i;
503          register char   *cp;
504 <        char    *pippt;
504 >        char    *pippt = NULL;
505                                          /* create rad command */
506          sprintf(rendopt, " @%s/render.opt", vval(DIRECTORY));
507          sprintf(combuf,
# Line 535 | Line 520 | char   *rfargs;
520                          pippt = NULL;
521                  }
522          if (pippt != NULL)
523 <                strcpy(pippt, "> /dev/null");   /* nothing to match */
523 >                strcpy(pippt, "> " NULL_DEVICE);        /* nothing to match */
524          else {
525                  sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
526                  cp += 11;               /* point to file name */
# Line 548 | Line 533 | char   *rfargs;
533   }
534  
535  
536 < animate()                       /* run animation */
536 > static void
537 > animate(void)                   /* run animation */
538   {
539          int     xres, yres;
540          float   pa, mult;
# Line 588 | Line 574 | animate()                      /* run animation */
574          }
575                                          /* figure # frames per batch */
576          d1 = mult*xres*mult*yres*4;             /* space for orig. picture */
577 <        if ((i=vint(INTERP)) || getblur(NULL) > 1)
577 >        if ((i=vint(INTERP)) || getblur(NULL, NULL) > 1)
578                  d1 += mult*xres*mult*yres*sizeof(float);        /* Z-buffer */
579          d2 = xres*yres*4;                       /* space for final picture */
580          frames_batch = (i+1)*(vflt(DISKSPACE)*1048576.-d1)/(d1+i*d2);
# Line 619 | Line 605 | animate()                      /* run animation */
605   }
606  
607  
608 < renderframes(nframes)           /* render next nframes frames */
609 < int     nframes;
608 > static void
609 > renderframes(int nframes)               /* render next nframes frames */
610   {
611          static char     vendbuf[16];
612          VIEW    *vp;
# Line 676 | Line 662 | int    nframes;
662   }
663  
664  
665 < filterframes()                          /* catch up with filtering */
665 > static void
666 > filterframes(void)                              /* catch up with filtering */
667   {
681 –        VIEW    *vp;
668          register int    i;
669  
670          if (astat.tnext < astat.fnext)  /* other work to do first */
671                  return;
672                                          /* filter each view */
673 <        for (i = astat.fnext; i < astat.rnext; i++) {
674 <                if ((vp = getview(i)) == NULL) {        /* get view i */
675 <                        fprintf(stderr,
690 <                        "%s: unexpected error reading view for frame %d\n",
691 <                                        progname, i);
692 <                        quit(1);
693 <                }
694 <                dofilt(i, vp, getexp(i), 0);            /* filter frame */
695 <        }
673 >        for (i = astat.fnext; i < astat.rnext; i++)
674 >                dofilt(i, 0);
675 >
676          bwait(0);                       /* wait for filter processes */
677          archive();                      /* archive originals */
678          astat.fnext = i;                /* update status */
# Line 700 | Line 680 | filterframes()                         /* catch up with filtering */
680   }
681  
682  
683 < transferframes()                        /* catch up with picture transfers */
683 > static void
684 > transferframes(void)                    /* catch up with picture transfers */
685   {
686          char    combuf[10240], *fbase;
687          register char   *cp;
# Line 740 | Line 721 | transferframes()                       /* catch up with picture transfers
721   }
722  
723  
724 < animrend(frame, vp)                     /* start animation frame */
725 < int     frame;
726 < VIEW    *vp;
724 > static void
725 > animrend(                       /* start animation frame */
726 > int     frame,
727 > VIEW    *vp
728 > )
729   {
747 –        extern int      recover();
730          char    combuf[2048];
731          char    fname[128];
732  
# Line 758 | Line 740 | VIEW   *vp;
740   }
741  
742  
743 < walkwait(first, last, vfn)              /* walk-through frames */
744 < int     first, last;
745 < char    *vfn;
743 > static void
744 > walkwait(               /* walk-through frames */
745 > int     first,
746 > int last,
747 > char    *vfn
748 > )
749   {
750 <        double  blurf;
751 <        int     nblur = getblur(&blurf);
750 >        double  mblurf, dblurf;
751 >        int     nblur = getblur(&mblurf, &dblurf);
752          char    combuf[2048];
753          register char   *inspoint;
754          register int    i;
# Line 781 | Line 766 | char   *vfn;
766          inspoint = combuf;
767          while (*inspoint) inspoint++;
768          if (nblur) {
769 <                sprintf(inspoint, " -pm %.3f", blurf/nblur);
769 >                sprintf(inspoint, " -pm %.3f", mblurf/nblur);
770                  while (*inspoint) inspoint++;
771 +                sprintf(inspoint, " -pd %.3f", dblurf/nblur);
772 +                while (*inspoint) inspoint++;
773          }
774          if (nblur > 1 || vint(INTERP)) {
775                  sprintf(inspoint, " -z %s.zbf", vval(BASENAME));
# Line 810 | Line 797 | char   *vfn;
797   }
798  
799  
800 < int
801 < recover(frame)                          /* recover the specified frame */
815 < int     frame;
800 > static int
801 > recover(int frame)                      /* recover the specified frame */
802   {
803          static int      *rfrm;          /* list of recovered frames */
804          static int      nrfrms = 0;
805 <        double  blurf;
806 <        int     nblur = getblur(&blurf);
805 >        double  mblurf, dblurf;
806 >        int     nblur = getblur(&mblurf, &dblurf);
807          char    combuf[2048];
808          char    fname[128];
809          register char   *cp;
# Line 836 | Line 822 | int    frame;
822          cp = combuf;
823          while (*cp) cp++;
824          if (nblur) {
825 <                sprintf(cp, " -pm %.3f", blurf/nblur);
825 >                sprintf(cp, " -pm %.3f", mblurf/nblur);
826                  while (*cp) cp++;
827 +                sprintf(cp, " -pd %.3f", dblurf/nblur);
828 +                while (*cp) cp++;
829          }
830          if (nblur > 1 || vint(INTERP)) {
831                  sprintf(cp, " -z %s.zbf", fname);
# Line 853 | Line 841 | int    frame;
841                  return(1);
842                                          /* add frame to recovered list */
843          if (nrfrms)
844 <                rfrm = (int *)realloc((char *)rfrm, (nrfrms+1)*sizeof(int));
844 >                rfrm = (int *)realloc((void *)rfrm, (nrfrms+1)*sizeof(int));
845          else
846                  rfrm = (int *)malloc(sizeof(int));
847          if (rfrm == NULL) {
# Line 865 | Line 853 | int    frame;
853   }
854  
855  
856 < int
857 < frecover(frame)                         /* recover filtered frame */
870 < int     frame;
856 > static int
857 > frecover(int frame)                             /* recover filtered frame */
858   {
859 <        VIEW    *vp;
873 <        char    *ex;
874 <
875 <        vp = getview(frame);
876 <        ex = getexp(frame);
877 <        if (dofilt(frame, vp, ex, 2) && dofilt(frame, vp, ex, 1))
859 >        if (dofilt(frame, 2) && dofilt(frame, 1))
860                  return(1);
861          return(0);
862   }
863  
864  
865 < archive()                       /* archive and remove renderings */
865 > static void
866 > archive(void)                   /* archive and remove renderings */
867   {
868   #define RMCOML  (sizeof(rmcom)-1)
869          static char     rmcom[] = "rm -f";
# Line 923 | Line 906 | archive()                      /* archive and remove renderings */
906   }
907  
908  
909 < int
910 < dofilt(frame, vp, ep, rvr)                      /* filter frame */
911 < int     frame;
912 < VIEW    *vp;
913 < char    *ep;
931 < int     rvr;
909 > static int
910 > dofilt(                         /* filter frame */
911 > int     frame,
912 > int     rvr
913 > )
914   {
933 –        extern int      frecover();
915          static int      iter = 0;
916 <        double  blurf;
917 <        int     nblur = getblur(&blurf);
916 >        double  mblurf, dblurf;
917 >        int     nblur = getblur(&mblurf, &dblurf);
918 >        VIEW    *vp = getview(frame);
919 >        char    *ep = getexp(frame);
920          char    fnbefore[128], fnafter[128], *fbase;
921          char    combuf[1024], fname0[128], fname1[128];
922          int     usepinterp, usepfilt, nora_rgbe;
923          int     frseq[2];
924                                                  /* check what is needed */
925 +        if (vp == NULL) {
926 +                 fprintf(stderr,
927 +                        "%s: unexpected error reading view for frame %d\n",
928 +                                          progname, frame);
929 +                quit(1);
930 +        }
931          usepinterp = (nblur > 1);
932 <        usepfilt = pfiltalways | ep==NULL;
932 >        usepfilt = pfiltalways | (ep==NULL);
933          if (ep != NULL && !strcmp(ep, "1"))
934                  ep = "+0";
935          nora_rgbe = strcmp(vval(OVERSAMP),"1") || ep==NULL ||
# Line 984 | Line 973 | int    rvr;
973          if (usepinterp) {                       /* using pinterp */
974                  if (rvr == 2 && recover(frseq[1]))      /* recover after? */
975                          return(1);
976 <                if (nblur > 1) {                /* with pmblur */
976 >                if (nblur > 1) {                /* with pdmblur */
977                          sprintf(fname0, "%s/vw0%c", vval(DIRECTORY),
978                                          'a'+(iter%26));
979                          sprintf(fname1, "%s/vw1%c", vval(DIRECTORY),
# Line 1011 | Line 1000 | int    rvr;
1000                                  putc('\n', fp); fclose(fp);
1001                          }
1002                          sprintf(combuf,
1003 <                        "(pmblur %.3f %d %s %s; rm -f %s %s) | pinterp -B",
1004 <                                        blurf, nblur,
1003 >                        "(pmdblur %.3f %.3f %d %s %s; rm -f %s %s) | pinterp -B -a",
1004 >                                        mblurf, dblurf, nblur,
1005                                          fname0, fname1, fname0, fname1);
1006                          iter++;
1007                  } else                          /* no blurring */
# Line 1026 | Line 1015 | int    rvr;
1015                  if (usepfilt)
1016                          sprintf(combuf+strlen(combuf), " %s", rresopt);
1017                  else
1018 <                        sprintf(combuf+strlen(combuf), " %s -e %s",
1018 >                        sprintf(combuf+strlen(combuf), " -a %s -e %s",
1019                                          fresopt, ep);
1020                  sprintf(combuf+strlen(combuf), " %s.unf %s.zbf",
1021                                  fnbefore, fnbefore);
# Line 1073 | Line 1062 | int    rvr;
1062   }
1063  
1064  
1065 < VIEW *
1066 < getview(n)                      /* get view number n */
1078 < int     n;
1065 > static VIEW *
1066 > getview(int n)                  /* get view number n */
1067   {
1068          static FILE     *viewfp = NULL;         /* view file pointer */
1069          static int      viewnum = 0;            /* current view number */
# Line 1087 | Line 1075 | int    n;
1075                          fclose(viewfp);
1076                          viewfp = NULL;
1077                          viewnum = 0;
1078 <                        copystruct(&curview, &stdview);
1078 >                        curview = stdview;
1079                  }
1080                  return(NULL);
1081          }
# Line 1103 | Line 1091 | int    n;
1091                          perror(vval(VIEWFILE));
1092                          quit(1);
1093                  }
1094 <                copystruct(&curview, &stdview);
1094 >                curview = stdview;
1095                  viewnum = 0;
1096          }
1097          if (n < 0) {                            /* get next view */
# Line 1123 | Line 1111 | int    n;
1111   }
1112  
1113  
1114 < int
1115 < countviews()                    /* count views in view file */
1114 > static int
1115 > countviews(void)                        /* count views in view file */
1116   {
1117          int     n;
1118  
# Line 1136 | Line 1124 | countviews()                   /* count views in view file */
1124   }
1125  
1126  
1127 < char *
1128 < getexp(n)                       /* get exposure for nth frame */
1141 < int     n;
1127 > static char *
1128 > getexp(int n)                   /* get exposure for nth frame */
1129   {
1130          extern char     *fskip();
1131          static char     expval[32];
# Line 1207 | Line 1194 | int    n;
1194   }
1195  
1196  
1197 < struct pslot *
1198 < findpslot(pid)                  /* find or allocate a process slot */
1212 < int     pid;
1197 > static struct pslot *
1198 > findpslot(RT_PID pid)                   /* find or allocate a process slot */
1199   {
1200          register struct pslot   *psempty = NULL;
1201          register int    i;
# Line 1224 | Line 1210 | int    pid;
1210   }
1211  
1212  
1213 < int
1214 < donecom(ps, pn, status)         /* clean up after finished process */
1215 < PSERVER *ps;
1216 < int     pn;
1217 < int     status;
1213 > static int
1214 > donecom(                /* clean up after finished process */
1215 >        PSERVER *ps,
1216 >        int     pn,
1217 >        int     status
1218 > )
1219   {
1220 <        register PROC   *pp;
1220 >        register NETPROC        *pp;
1221          register struct pslot   *psl;
1222  
1223          pp = ps->proc + pn;
# Line 1265 | Line 1252 | int    status;
1252   }
1253  
1254  
1255 < int
1256 < serverdown()                    /* check status of last process server */
1255 > static int
1256 > serverdown(void)                        /* check status of last process server */
1257   {
1258          if (lastpserver == NULL || !lastpserver->hostname[0])
1259                  return(0);
# Line 1282 | Line 1269 | serverdown()                   /* check status of last process server
1269   }
1270  
1271  
1272 < int
1273 < bruncom(com, fout, rf)          /* run a command in the background */
1274 < char    *com;
1275 < int     fout;
1276 < int     (*rf)();
1272 > static RT_PID
1273 > bruncom(                /* run a command in the background */
1274 > char    *com,
1275 > int     fout,
1276 > int     (*rf)()
1277 > )
1278   {
1279 <        int     pid;
1279 >        RT_PID  pid;
1280          register struct pslot   *psl;
1281  
1282          if (noaction) {
# Line 1301 | Line 1289 | int    (*rf)();
1289                  bwait(1);
1290          if (!silent) {                          /* echo command */
1291                  PSERVER *ps;
1292 <                int     psn = pid;
1292 >                RT_PID  psn = pid;
1293                  ps = findjob(&psn);
1294                  printf("\t%s\n", com);
1295                  printf("\tProcess started on %s\n", phostname(ps));
# Line 1315 | Line 1303 | int    (*rf)();
1303   }
1304  
1305  
1306 < bwait(ncoms)                            /* wait for batch job(s) to finish */
1307 < int     ncoms;
1306 > static void
1307 > bwait(int ncoms)                                /* wait for batch job(s) to finish */
1308   {
1309          int     status;
1310  
# Line 1330 | Line 1318 | int    ncoms;
1318   }
1319  
1320  
1321 < int
1322 < pruncom(com, ppins, maxcopies)  /* run a command in parallel over network */
1323 < char    *com, *ppins;
1324 < int     maxcopies;
1321 > static int
1322 > pruncom(        /* run a command in parallel over network */
1323 > char    *com,
1324 > char    *ppins,
1325 > int     maxcopies
1326 > )
1327   {
1328          int     retstatus = 0;
1329          int     hostcopies;
# Line 1355 | Line 1345 | int    maxcopies;
1345                          strcpy(com1=buf, com);  /* build -PP command */
1346                          sprintf(com1+(ppins-com), " -PP %s/%s.persist",
1347                                          vval(DIRECTORY), phostname(ps));
1348 +                        unlink(com1+(ppins-com)+5);
1349                          strcat(com1, ppins);
1350                  } else
1351                          com1 = com;
# Line 1399 | Line 1390 | int    maxcopies;
1390   }
1391  
1392  
1393 < runcom(cs)                      /* run a command locally and wait for it */
1394 < char    *cs;
1393 > static int
1394 > runcom(char *cs)                        /* run a command locally and wait for it */
1395   {
1396          if (!silent)            /* echo it */
1397                  printf("\t%s\n", cs);
# Line 1411 | Line 1402 | char   *cs;
1402   }
1403  
1404  
1405 < rmfile(fn)                      /* remove a file */
1406 < char    *fn;
1405 > static int
1406 > rmfile(char *fn)                        /* remove a file */
1407   {
1408          if (!silent)
1409 < #ifdef MSDOS
1409 > #ifdef _WIN32
1410                  printf("\tdel %s\n", fn);
1411   #else
1412                  printf("\trm -f %s\n", fn);
# Line 1426 | Line 1417 | char   *fn;
1417   }
1418  
1419  
1420 < badvalue(vc)                    /* report bad variable value and exit */
1421 < int     vc;
1420 > static void
1421 > badvalue(int vc)                        /* report bad variable value and exit */
1422   {
1423          fprintf(stderr, "%s: bad value for variable '%s'\n",
1424                          progname, vnam(vc));
# Line 1435 | Line 1426 | int    vc;
1426   }
1427  
1428  
1429 < char *
1430 < dirfile(df, path)               /* separate path into directory and file */
1431 < char    *df;
1432 < register char   *path;
1429 > static char *
1430 > dirfile(                /* separate path into directory and file */
1431 > char    *df,
1432 > register char   *path
1433 > )
1434   {
1435          register int    i;
1436          int     psep;
# Line 1446 | Line 1438 | register char  *path;
1438          for (i = 0, psep = -1; path[i]; i++)
1439                  if (path[i] == '/')
1440                          psep = i;
1441 <        if (df != NULL)
1441 >        if (df != NULL) {
1442                  if (psep == 0) {
1443                          df[0] = '/';
1444                          df[1] = '\0';
# Line 1455 | Line 1447 | register char  *path;
1447                          df[psep] = '\0';
1448                  } else
1449                          df[0] = '\0';
1450 +        }
1451          return(path+psep+1);
1452   }
1453  
1454  
1455 < int
1456 < getblur(double *bf)             /* get # blur samples (and fraction) */
1455 > static int
1456 > getblur(double *mbf, double *dbf)       /* get # blur samples (and fraction) */
1457   {
1458 <        double  blurf;
1459 <        int     nblur;
1458 >        double  mblurf, dblurf;
1459 >        int     nmblur, ndblur;
1460          char    *s;
1461 <
1462 <        if (!vdef(MBLUR)) {
1463 <                if (bf != NULL)
1464 <                        *bf = 0.0;
1465 <                return(0);
1466 <        }
1467 <        blurf = atof(vval(MBLUR));
1468 <        if (blurf < 0.0)
1469 <                blurf = 0.0;
1470 <        if (bf != NULL)
1471 <                *bf = blurf;
1472 <        if (blurf <= FTINY)
1473 <                return(0);
1474 <        s = sskip(vval(MBLUR));
1475 <        if (!*s)
1476 <                return(DEF_NBLUR);
1477 <        nblur = atoi(s);
1478 <        if (nblur <= 0)
1461 >                                        /* get motion blur */
1462 >        if (!vdef(MBLUR) || (mblurf = atof(vval(MBLUR))) < 0.0)
1463 >                mblurf = 0.0;
1464 >        if (mbf != NULL)
1465 >                *mbf = mblurf;
1466 >        if (mblurf <= FTINY)
1467 >                nmblur = 0;
1468 >        else if (!*(s = sskip(vval(MBLUR))))
1469 >                nmblur = DEF_NBLUR;
1470 >        else if ((nmblur = atoi(s)) <= 0)
1471 >                nmblur = 1;
1472 >                                        /* get depth-of-field blur */
1473 >        if (!vdef(DBLUR) || (dblurf = atof(vval(DBLUR))) < 0.0)
1474 >                dblurf = 0.0;
1475 >        if (dbf != NULL)
1476 >                *dbf = dblurf;
1477 >        if (dblurf <= FTINY)
1478 >                ndblur = 0;
1479 >        else if (!*(s = sskip(vval(DBLUR))))
1480 >                ndblur = DEF_NBLUR;
1481 >        else if ((ndblur = atoi(s)) <= 0)
1482 >                ndblur = 1;
1483 >        if ((nmblur == 1) & (ndblur == 1))
1484                  return(1);
1485 <        return(nblur);
1485 >                                        /* return combined samples */
1486 >        return(nmblur + ndblur);
1487   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines