--- ray/src/util/rad.c 2010/10/08 22:11:57 2.99 +++ ray/src/util/rad.c 2015/10/22 18:09:37 2.122 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rad.c,v 2.99 2010/10/08 22:11:57 greg Exp $"; +static const char RCSid[] = "$Id: rad.c,v 2.122 2015/10/22 18:09:37 greg Exp $"; #endif /* * Executive program for oconv, rpict and pfilt @@ -9,6 +9,7 @@ static const char RCSid[] = "$Id: rad.c,v 2.99 2010/10 #include #include +#include #include "platform.h" #include "rtprocess.h" @@ -24,6 +25,7 @@ static const char RCSid[] = "$Id: rad.c,v 2.99 2010/10 #define RENAMECMD "mv" #include #include + #include #endif /* variables (alphabetical by name) */ @@ -35,28 +37,31 @@ static const char RCSid[] = "$Id: rad.c,v 2.99 2010/10 #define INDIRECT 5 /* indirection in lighting */ #define MATERIAL 6 /* material files */ #define MKILLUM 7 /* mkillum options */ -#define OBJECT 8 /* object files */ -#define OCONV 9 /* oconv options */ -#define OCTREE 10 /* octree file name */ -#define OPTFILE 11 /* rendering options file */ -#define PENUMBRAS 12 /* shadow penumbras are desired */ -#define PFILT 13 /* pfilt options */ -#define PICTURE 14 /* picture file root name */ -#define QUALITY 15 /* desired rendering quality */ -#define RAWFILE 16 /* raw picture file root name */ -#define RENDER 17 /* rendering options */ -#define REPORT 18 /* report frequency and errfile */ -#define RESOLUTION 19 /* maximum picture resolution */ -#define RPICT 20 /* rpict parameters */ -#define RVU 21 /* rvu parameters */ -#define SCENE 22 /* scene files */ -#define UP 23 /* view up (X, Y or Z) */ -#define VARIABILITY 24 /* level of light variability */ -#define VIEWS 25 /* view(s) for picture(s) */ -#define ZFILE 26 /* distance file root name */ -#define ZONE 27 /* simulation zone */ +#define MKPMAP 8 /* mkpmap options */ +#define OBJECT 9 /* object files */ +#define OCONV 10 /* oconv options */ +#define OCTREE 11 /* octree file name */ +#define OPTFILE 12 /* rendering options file */ +#define PCMAP 13 /* caustic photon map */ +#define PENUMBRAS 14 /* shadow penumbras are desired */ +#define PFILT 15 /* pfilt options */ +#define PGMAP 16 /* global photon map */ +#define PICTURE 17 /* picture file root name */ +#define QUALITY 18 /* desired rendering quality */ +#define RAWFILE 19 /* raw picture file root name */ +#define RENDER 20 /* rendering options */ +#define REPORT 21 /* report frequency and errfile */ +#define RESOLUTION 22 /* maximum picture resolution */ +#define RPICT 23 /* rpict parameters */ +#define RVU 24 /* rvu parameters */ +#define SCENE 25 /* scene files */ +#define UP 26 /* view up (X, Y or Z) */ +#define VARIABILITY 27 /* level of light variability */ +#define VIEWS 28 /* view(s) for picture(s) */ +#define ZFILE 29 /* distance file root name */ +#define ZONE 30 /* simulation zone */ /* total number of variables */ -int NVARS = 28; +int NVARS = 31; VARIABLE vv[] = { /* variable-value pairs */ {"AMBFILE", 3, 0, NULL, onevalue}, @@ -67,12 +72,15 @@ VARIABLE vv[] = { /* variable-value pairs */ {"INDIRECT", 3, 0, NULL, intvalue}, {"materials", 3, 0, NULL, catvalues}, {"mkillum", 3, 0, NULL, catvalues}, + {"mkpmap", 3, 0, NULL, catvalues}, {"objects", 3, 0, NULL, catvalues}, {"oconv", 3, 0, NULL, catvalues}, {"OCTREE", 3, 0, NULL, onevalue}, {"OPTFILE", 3, 0, NULL, onevalue}, + {"PCMAP", 2, 0, NULL, onevalue}, {"PENUMBRAS", 3, 0, NULL, boolvalue}, {"pfilt", 2, 0, NULL, catvalues}, + {"PGMAP", 2, 0, NULL, onevalue}, {"PICTURE", 3, 0, NULL, onevalue}, {"QUALITY", 3, 0, NULL, qualvalue}, {"RAWFILE", 3, 0, NULL, onevalue}, @@ -107,6 +115,11 @@ time_t oct0date; /* date of pre-mkillum octree */ char *oct1name; /* name of post-mkillum octree */ time_t oct1date; /* date of post-mkillum octree (>= matdate) */ +char *pgmapname; /* name of global photon map */ +time_t pgmapdate; /* date of global photon map (>= oct1date) */ +char *pcmapname; /* name of caustic photon map */ +time_t pcmapdate; /* date of caustic photon map (>= oct1date) */ + int nowarn = 0; /* no warnings */ int explicate = 0; /* explicate variables */ int silent = 0; /* do work silently */ @@ -121,6 +134,7 @@ char *viewselect = NULL; /* specific view only */ /* command paths */ char c_oconv[256] = "oconv"; char c_mkillum[256] = "mkillum"; +char c_mkpmap[256] = "mkpmap"; char c_rvu[256] = "rvu"; char c_rpict[256] = DEF_RPICT_PATH; char c_rpiece[] = "rpiece"; @@ -144,9 +158,11 @@ static void checkfiles(void); static void getoctcube(double org[3], double *sizp); static void setdefaults(void); static void oconv(void); +static void mkpmap(void); static char * addarg(char *op, char *arg); static void oconvopts(char *oo); static void mkillumopts(char *mo); +static void mkpmapopts(char *mo); static void checkambfile(void); static double ambval(void); static void renderopts(char *op, char *po); @@ -243,6 +259,8 @@ main( printvars(stdout); /* build octree (and run mkillum) */ oconv(); + /* run mkpmap if indicated */ + mkpmap(); /* check date on ambient file */ checkambfile(); /* run simulation */ @@ -264,8 +282,8 @@ userr: static void rootname( /* remove tail from end of fn */ - register char *rn, - register char *fn + char *rn, + char *fn ) { char *tp, *dp; @@ -282,7 +300,7 @@ rootname( /* remove tail from end of fn */ static time_t checklast( /* check files and find most recent */ - register char *fnames + char *fnames ) { char thisfile[PATH_MAX]; @@ -312,8 +330,8 @@ newfname( /* create modified file name */ int pred ) { - register char *cp; - register int n; + char *cp; + int n; int suffix; n = 0; cp = orig; suffix = -1; /* suffix position, length */ @@ -335,6 +353,7 @@ newfname( /* create modified file name */ static void checkfiles(void) /* check for existence and modified times */ { + char fntemp[256]; time_t objdate; if (!vdef(OCTREE)) { @@ -364,6 +383,26 @@ checkfiles(void) /* check for existence and modified vnam(OCTREE), vnam(SCENE), vnam(ILLUM)); quit(1); } + if (vdef(PGMAP)) { + if (!*sskip2(vval(PGMAP),1)) { + fprintf(stderr, "%s: '%s' missing # photons argument\n", + progname, vnam(PGMAP)); + quit(1); + } + atos(fntemp, sizeof(fntemp), vval(PGMAP)); + pgmapname = savqstr(fntemp); + pgmapdate = fdate(pgmapname); + } + if (vdef(PCMAP)) { + if (!*sskip2(vval(PCMAP),1)) { + fprintf(stderr, "%s: '%s' missing # photons argument\n", + progname, vnam(PCMAP)); + quit(1); + } + atos(fntemp, sizeof(fntemp), vval(PCMAP)); + pcmapname = savqstr(fntemp); + pcmapdate = fdate(pcmapname); + } matdate = checklast(vval(MATERIAL)); } @@ -378,7 +417,7 @@ getoctcube( /* get octree bounding cube */ double min[3], max[3]; char buf[1024]; FILE *fp; - register int i; + int i; if (osiz <= FTINY) { if (!nprocs && fdate(oct1name) < @@ -558,6 +597,7 @@ oconv(void) /* run oconv and mkillum if necessary * unlink(illumtmp); quit(1); } + rmfile(oct0name); /* make octree1 (frozen) */ if (octreedate) sprintf(combuf, "%s%s -f -i %s %s > %s", c_oconv, @@ -584,10 +624,77 @@ oconv(void) /* run oconv and mkillum if necessary * } +static void +mkpmap(void) /* run mkpmap if indicated */ +{ + char combuf[2048], *cp; + time_t tnow; + /* nothing to do? */ + if ((pgmapname == NULL) | (pgmapdate >= oct1date) && + (pcmapname == NULL) | (pcmapdate >= oct1date)) + return; + /* just update existing file dates? */ + if (touchonly && (pgmapname == NULL) | (pgmapdate > 0) && + (pcmapname == NULL) | (pcmapdate > 0)) { + if (pgmapname != NULL) + touch(pgmapname); + if (pcmapname != NULL) + touch(pcmapname); + } else { /* else need to (re)run pkpmap */ + strcpy(combuf, c_mkpmap); + for (cp = combuf; *cp; cp++) + ; + mkpmapopts(cp); + /* force file overwrite */ + cp = addarg(cp, "-fo+"); + if (vdef(REPORT)) { + char errfile[256]; + int n; + double minutes; + n = sscanf(vval(REPORT), "%lf %s", &minutes, errfile); + if (n == 2) + sprintf(cp, " -t %d -e %s", (int)(minutes*60), errfile); + else if (n == 1) + sprintf(cp, " -t %d", (int)(minutes*60)); + else + badvalue(REPORT); + } + if (pgmapname != NULL && pgmapdate < oct1date) { + cp = addarg(cp, "-apg"); + addarg(cp, vval(PGMAP)); + cp = sskip(sskip(cp)); /* remove any bandwidth */ + *cp = '\0'; + } + if (pcmapname != NULL && pcmapdate < oct1date) { + cp = addarg(cp, "-apc"); + addarg(cp, vval(PCMAP)); + cp = sskip(sskip(cp)); /* remove any bandwidth */ + *cp = '\0'; + } + cp = addarg(cp, oct1name); + if (runcom(combuf)) { + fprintf(stderr, "%s: error running %s\n", + progname, c_mkpmap); + if (pgmapname != NULL && pgmapdate < oct1date) + unlink(pgmapname); + if (pcmapname != NULL && pcmapdate < oct1date) + unlink(pcmapname); + quit(1); + } + } + tnow = time((time_t *)NULL); + if (pgmapname != NULL) + pgmapdate = tnow; + if (pcmapname != NULL) + pcmapdate = tnow; + oct1date = tnow; /* trigger ambient file removal if needed */ +} + + static char * addarg( /* append argument and advance pointer */ -register char *op, -register char *arg +char *op, +char *arg ) { while (*op) @@ -601,18 +708,19 @@ register char *arg static void oconvopts( /* get oconv options */ - register char *oo + char *oo ) { /* BEWARE: This may be called via setdefaults(), so no assumptions */ *oo = '\0'; - if (vdef(OCONV)) - if (vval(OCONV)[0] != '-') { - atos(c_oconv, sizeof(c_oconv), vval(OCONV)); - oo = addarg(oo, sskip2(vval(OCONV), 1)); - } else - oo = addarg(oo, vval(OCONV)); + if (!vdef(OCONV)) + return; + if (vval(OCONV)[0] != '-') { + atos(c_oconv, sizeof(c_oconv), vval(OCONV)); + oo = addarg(oo, sskip2(vval(OCONV), 1)); + } else + oo = addarg(oo, vval(OCONV)); } @@ -627,16 +735,35 @@ mkillumopts( /* get mkillum options */ sprintf(mo, " -n %d", nprocs); else *mo = '\0'; - if (vdef(MKILLUM)) - if (vval(MKILLUM)[0] != '-') { - atos(c_mkillum, sizeof(c_mkillum), vval(MKILLUM)); - mo = addarg(mo, sskip2(vval(MKILLUM), 1)); - } else - mo = addarg(mo, vval(MKILLUM)); + if (!vdef(MKILLUM)) + return; + if (vval(MKILLUM)[0] != '-') { + atos(c_mkillum, sizeof(c_mkillum), vval(MKILLUM)); + mo = addarg(mo, sskip2(vval(MKILLUM), 1)); + } else + mo = addarg(mo, vval(MKILLUM)); } static void +mkpmapopts( /* get mkpmap options */ + char *mo +) +{ + /* BEWARE: This may be called via setdefaults(), so no assumptions */ + + *mo = '\0'; + if (!vdef(MKPMAP)) + return; + if (vval(MKPMAP)[0] != '-') { + atos(c_mkpmap, sizeof(c_mkpmap), vval(MKPMAP)); + mo = addarg(mo, sskip2(vval(MKPMAP), 1)); + } else + mo = addarg(mo, vval(MKPMAP)); +} + + +static void checkambfile(void) /* check date on ambient file */ { time_t afdate; @@ -677,6 +804,15 @@ renderopts( /* set rendering options */ char *po ) { + char pmapf[256], *bw; + + if (vdef(PGMAP)) { + *op = '\0'; + bw = sskip2(vval(PGMAP), 2); + atos(pmapf, sizeof(pmapf), vval(PGMAP)); + op = addarg(addarg(op, "-ap"), pmapf); + if (atoi(bw) > 0) op = addarg(op, bw); + } switch(vscale(QUALITY)) { case LOW: lowqopts(op, po); @@ -688,29 +824,37 @@ renderopts( /* set rendering options */ hiqopts(op, po); break; } + if (vdef(PCMAP)) { + bw = sskip2(vval(PCMAP), 2); + atos(pmapf, sizeof(pmapf), vval(PCMAP)); + op = addarg(addarg(op, "-ap"), pmapf); + if (atoi(bw) > 0) op = addarg(op, bw); + } if (vdef(RENDER)) op = addarg(op, vval(RENDER)); if (rvdevice != NULL) { - if (vdef(RVU)) + if (vdef(RVU)) { if (vval(RVU)[0] != '-') { atos(c_rvu, sizeof(c_rvu), vval(RVU)); po = addarg(po, sskip2(vval(RVU), 1)); } else po = addarg(po, vval(RVU)); + } } else { - if (vdef(RPICT)) + if (vdef(RPICT)) { if (vval(RPICT)[0] != '-') { atos(c_rpict, sizeof(c_rpict), vval(RPICT)); po = addarg(po, sskip2(vval(RPICT), 1)); } else po = addarg(po, vval(RPICT)); + } } } static void lowqopts( /* low quality rendering options */ - register char *op, + char *op, char *po ) { @@ -772,13 +916,13 @@ lowqopts( /* low quality rendering options */ d = ambval(); sprintf(op, " -av %.2g %.2g %.2g", d, d, d); op += strlen(op); - op = addarg(op, "-lr 6 -lw .01"); + op = addarg(op, "-lr 6 -lw .003"); } static void medqopts( /* medium quality rendering options */ - register char *op, + char *op, char *po ) { @@ -826,7 +970,7 @@ medqopts( /* medium quality rendering options */ op = addarg(op, "-ds .2 -dj .9"); else op = addarg(op, "-ds .3"); - op = addarg(op, "-dt .1 -dc .5 -dr 1 -ss .7 -st .1"); + op = addarg(op, "-dt .1 -dc .5 -dr 1 -ss 1 -st .1"); if ( (overture = vint(INDIRECT)) ) { sprintf(op, " -ab %d", overture); op += strlen(op); @@ -850,13 +994,13 @@ medqopts( /* medium quality rendering options */ d = ambval(); sprintf(op, " -av %.2g %.2g %.2g", d, d, d); op += strlen(op); - op = addarg(op, "-lr 8 -lw .002"); + op = addarg(op, "-lr 8 -lw 1e-4"); } static void hiqopts( /* high quality rendering options */ - register char *op, + char *op, char *po ) { @@ -904,7 +1048,7 @@ hiqopts( /* high quality rendering options */ op = addarg(op, "-ds .1 -dj .9"); else op = addarg(op, "-ds .2"); - op = addarg(op, "-dt .05 -dc .75 -dr 3 -ss 1 -st .01"); + op = addarg(op, "-dt .05 -dc .75 -dr 3 -ss 16 -st .01"); sprintf(op, " -ab %d", overture=vint(INDIRECT)+1); op += strlen(op); if (vdef(AMBFILE)) { @@ -926,17 +1070,40 @@ hiqopts( /* high quality rendering options */ d = ambval(); sprintf(op, " -av %.2g %.2g %.2g", d, d, d); op += strlen(op); - op = addarg(op, "-lr 12 -lw .0005"); + op = addarg(op, "-lr 12 -lw 1e-5"); } +#ifdef _WIN32 static void +setenv( /* set an environment variable */ + char *vname, + char *value +) +{ + char *evp; + + evp = bmalloc(strlen(vname)+strlen(value)+2); + if (evp == NULL) + syserr(progname); + sprintf(evp, "%s=%s", vname, value); + if (putenv(evp) != 0) { + fprintf(stderr, "%s: out of environment space\n", progname); + quit(1); + } + if (!silent) + printf("set %s\n", evp); +} +#endif + + +static void xferopts( /* transfer options if indicated */ char *ro ) { int fd, n; - register char *cp; + char *cp; n = strlen(ro); if (n < 2) @@ -965,7 +1132,7 @@ xferopts( /* transfer options if indicated */ static void pfiltopts( /* get pfilt options */ - register char *po + char *po ) { *po = '\0'; @@ -981,19 +1148,20 @@ pfiltopts( /* get pfilt options */ po = addarg(po, "-m .25"); break; } - if (vdef(PFILT)) + if (vdef(PFILT)) { if (vval(PFILT)[0] != '-') { atos(c_pfilt, sizeof(c_pfilt), vval(PFILT)); po = addarg(po, sskip2(vval(PFILT), 1)); } else po = addarg(po, vval(PFILT)); + } } static int matchword( /* match white-delimited words */ - register char *s1, - register char *s2 + char *s1, + char *s2 ) { while (isspace(*s1)) s1++; @@ -1007,15 +1175,15 @@ matchword( /* match white-delimited words */ static char * specview( /* get proper view spec from vs */ - register char *vs + char *vs ) { static char vup[7][12] = {"-vu 0 0 -1","-vu 0 -1 0","-vu -1 0 0", "-vu 0 0 1", "-vu 1 0 0","-vu 0 1 0","-vu 0 0 1"}; static char viewopts[128]; - register char *cp; + char *cp; int xpos, ypos, zpos, viewtype, upax; - register int i; + int i; double cent[3], dim[3], mult, d; if (vs == NULL || *vs == '-') @@ -1075,7 +1243,7 @@ specview( /* get proper view spec from vs */ cent[i] += .5*dim[i]; } mult = vlet(ZONE)=='E' ? 2. : .45 ; - sprintf(cp, " -vp %.2g %.2g %.2g -vd %.2g %.2g %.2g", + sprintf(cp, " -vp %.3g %.3g %.3g -vd %.3g %.3g %.3g", cent[0]+xpos*mult*dim[0], cent[1]+ypos*mult*dim[1], cent[2]+zpos*mult*dim[2], @@ -1107,7 +1275,7 @@ specview( /* get proper view spec from vs */ break; case VT_PAR: d = sqrt(dim[0]*dim[0]+dim[1]*dim[1]+dim[2]*dim[2]); - sprintf(cp, " -vh %.2g -vv %.2g", d, d); + sprintf(cp, " -vh %.3g -vv %.3g", d, d); cp += strlen(cp); break; case VT_ANG: @@ -1147,7 +1315,7 @@ getview( /* get view n, or NULL if none */ char *vn /* returned view name */ ) { - register char *mv; + char *mv; if (viewselect != NULL) { /* command-line selected */ if (n) /* only do one */ @@ -1179,7 +1347,7 @@ numview: mv = nvalue(VIEWS, n); /* use view n */ if ((vn != NULL) & (mv != NULL)) if (*mv != '-') { - register char *mv2 = mv; + char *mv2 = mv; while (*mv2 && !isspace(*mv2)) *vn++ = *mv2++; *vn = '\0'; @@ -1192,13 +1360,13 @@ numview: static int myprintview( /* print out selected view */ - register char *vopts, + char *vopts, FILE *fp ) { VIEW vwr; char buf[128]; - register char *cp; + char *cp; #ifdef _WIN32 /* XXX Should we allow something like this for all platforms? */ /* XXX Or is it still required at all? */ @@ -1254,6 +1422,32 @@ rvu( /* run rvu with first view */ } +static int +syncf_done( /* check if an rpiece sync file is complete */ + char *sfname +) +{ + FILE *fp = fopen(sfname, "r"); + int todo = 1; + int x, y; + + if (fp == NULL) + return(0); + if (fscanf(fp, "%d %d", &x, &y) != 2) + goto checked; + todo = x*y; /* total number of tiles */ + if (fscanf(fp, "%d %d", &x, &y) != 2 || (x != 0) | (y != 0)) + goto checked; + /* XXX assume no redundant tiles */ + while (fscanf(fp, "%d %d", &x, &y) == 2) + if (!--todo) + break; +checked: + fclose(fp); + return(!todo); +} + + static void rpict( /* run rpict and pfilt for each view */ char *opts, @@ -1261,15 +1455,18 @@ rpict( /* run rpict and pfilt for each view */ ) { #define do_rpiece (sfile[0]!='\0') - char combuf[4*PATH_MAX+512]; + char combuf[5*PATH_MAX+512]; char rawfile[PATH_MAX], picfile[PATH_MAX]; char zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32]; - char rppopt[128], sfile[64], *pfile = NULL; + char rppopt[32], sfile[PATH_MAX], *pfile = NULL; char pfopts[128]; char vs[32], *vw; int vn, mult; FILE *fp; time_t rfdt, pfdt; + int xres, yres; + double aspect; + int n; /* get pfilt options */ pfiltopts(pfopts); /* get resolution, reporting */ @@ -1284,24 +1481,19 @@ rpict( /* run rpict and pfilt for each view */ mult = 3; break; } - { - int xres, yres; - double aspect; - int n; - n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect); - if (n == 3) - sprintf(res, "-x %d -y %d -pa %.3f", - mult*xres, mult*yres, aspect); - else if (n) { - if (n == 1) yres = xres; - sprintf(res, "-x %d -y %d", mult*xres, mult*yres); - } else - badvalue(RESOLUTION); - } + n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect); + if (n == 3) + sprintf(res, "-x %d -y %d -pa %.3f", + mult*xres, mult*yres, aspect); + else if (n) { + aspect = 1.; + if (n == 1) yres = xres; + sprintf(res, "-x %d -y %d", mult*xres, mult*yres); + } else + badvalue(RESOLUTION); rep[0] = '\0'; if (vdef(REPORT)) { double minutes; - int n; n = sscanf(vval(REPORT), "%lf %s", &minutes, rawfile); if (n == 2) sprintf(rep, " -t %d -e %s", (int)(minutes*60), rawfile); @@ -1316,7 +1508,9 @@ rpict( /* run rpict and pfilt for each view */ getview(0, vs) != NULL) { if (!strcmp(c_rpict, DEF_RPICT_PATH) && getview(1, NULL) == NULL) { - sprintf(sfile, "rpsync_%s.txt", vs); + sprintf(sfile, "%s_%s_rpsync.txt", + vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), + vs); strcpy(rppopt, "-PP pfXXXXXX"); } else { strcpy(rppopt, "-S 1 -PP pfXXXXXX"); @@ -1359,7 +1553,15 @@ rpict( /* run rpict and pfilt for each view */ if (do_rpiece) { if (rfdt < oct1date || !fdate(sfile)) { int xdiv = 8+nprocs/3, ydiv = 8+nprocs/3; - rfdt = 0; /* start fresh */ + if (rfdt >= oct1date) { + fprintf(stderr, + "%s: partial output not created with %s\n", rawfile, c_rpiece); + quit(1); + } + if (rfdt) { /* start fresh */ + rmfile(rawfile); + rfdt = 0; + } if (!silent) printf("\techo %d %d > %s\n", xdiv, ydiv, sfile); @@ -1396,25 +1598,21 @@ rpict( /* run rpict and pfilt for each view */ } else { if (overture) { /* run overture calculation */ sprintf(combuf, - "%s%s %s%s -x 64 -y 64 -ps 1 %s > %s", + "%s%s %s%s -x 64 -y 64 -ps 1 %s > %s", c_rpict, rep, vw, opts, oct1name, overfile); - if (do_rpiece) - while (next_process(1)) - sleep(5); - if (runcom(combuf)) { - fprintf(stderr, + if (!do_rpiece || !next_process(0)) { + if (runcom(combuf)) { + fprintf(stderr, "%s: error in overture for view %s\n", - progname, vs); - quit(1); - } - if (do_rpiece) { - finish_process(); - wait_process(1); - } + progname, vs); + quit(1); + } #ifndef NULL_DEVICE - rmfile(overfile); + rmfile(overfile); #endif + } else if (do_rpiece) + sleep(20); } if (do_rpiece) { sprintf(combuf, "%s -F %s %s%s %s %s%s%s -o %s %s", @@ -1446,11 +1644,21 @@ rpict( /* run rpict and pfilt for each view */ if (do_rpiece) { /* need to finish raw, first */ finish_process(); wait_process(1); - /* XXX should check sync file to see if really done? */ + if (!syncf_done(sfile)) { + fprintf(stderr, + "%s: %s did not complete rendering of view %s\n", + progname, c_rpiece, vs); + quit(1); + } } if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) { /* build pfilt command */ - if (mult > 1) + if (do_rpiece) + sprintf(combuf, + "%s%s -x %d -y %d -p %.3f %s > %s", + c_pfilt, pfopts, xres, yres, aspect, + rawfile, picfile); + else if (mult > 1) sprintf(combuf, "%s%s -x /%d -y /%d %s > %s", c_pfilt, pfopts, mult, mult, rawfile, picfile); @@ -1570,6 +1778,7 @@ next_process(int reserve) /* fork the next process */ child_pid = fork(); /* split process */ if (child_pid == 0) { /* we're the child */ children_running = -1; + nprocs = 1; return(0); } if (child_pid > 0) { /* we're the parent */ @@ -1637,25 +1846,6 @@ finish_process(void) /* exit a child process */ return; /* in parent -- noop */ exit(0); } - -#ifdef _WIN32 -setenv(vname, value) /* set an environment variable */ -char *vname, *value; -{ - register char *evp; - - evp = bmalloc(strlen(vname)+strlen(value)+2); - if (evp == NULL) - syserr(progname); - sprintf(evp, "%s=%s", vname, value); - if (putenv(evp) != 0) { - fprintf(stderr, "%s: out of environment space\n", progname); - quit(1); - } - if (!silent) - printf("set %s\n", evp); -} -#endif static void