--- ray/src/util/rad.c 2015/05/27 14:22:02 2.116 +++ ray/src/util/rad.c 2022/02/06 17:19:55 2.129 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rad.c,v 2.116 2015/05/27 14:22:02 greg Exp $"; +static const char RCSid[] = "$Id: rad.c,v 2.129 2022/02/06 17:19:55 greg Exp $"; #endif /* * Executive program for oconv, rpict and pfilt @@ -9,6 +9,7 @@ static const char RCSid[] = "$Id: rad.c,v 2.116 2015/0 #include #include +#include #include "platform.h" #include "rtprocess.h" @@ -16,7 +17,7 @@ static const char RCSid[] = "$Id: rad.c,v 2.116 2015/0 #include "paths.h" #include "vars.h" -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) #define DELCMD "del" #define RENAMECMD "rename" #else @@ -241,12 +242,18 @@ main( /* load variable values */ loadvars(rifname); /* get any additional assignments */ - for (i++; i < argc; i++) - if (setvariable(argv[i], matchvar) < 0) { - fprintf(stderr, "%s: unknown variable: %s\n", + for (i++; i < argc; i++) { + int rv = setvariable(argv[i], matchvar); + if (rv < 0) { + fprintf(stderr, "%s: unknown setting: %s\n", progname, argv[i]); quit(1); } + if (!rv) + fprintf(stderr, + "%s: bad variable assignment: %s (ignored)\n", + progname, argv[i]); + } /* check assignments */ checkvalues(); /* check files and dates */ @@ -555,9 +562,10 @@ oconv(void) /* run oconv and mkillum if necessary * return; /* make octree0 */ if ((oct0date < scenedate) | (oct0date < illumdate)) { - if (touchonly && oct0date) - touch(oct0name); - else { /* build command */ + if (touchonly && (oct0date || oct1date)) { + if (oct0date) + touch(oct0name); + } else { /* build command */ if (octreedate) sprintf(combuf, "%s%s -i %s %s > %s", c_oconv, ocopts, vval(OCTREE), @@ -582,7 +590,7 @@ oconv(void) /* run oconv and mkillum if necessary * oct0date = octreedate; if (oct0date < illumdate) /* ditto */ oct0date = illumdate; - } + } if (touchonly && oct1date) touch(oct1name); else { @@ -644,6 +652,8 @@ mkpmap(void) /* run mkpmap if indicated */ for (cp = combuf; *cp; cp++) ; mkpmapopts(cp); + /* force file overwrite */ + cp = addarg(cp, "-fo+"); if (vdef(REPORT)) { char errfile[256]; int n; @@ -657,14 +667,12 @@ mkpmap(void) /* run mkpmap if indicated */ badvalue(REPORT); } if (pgmapname != NULL && pgmapdate < oct1date) { - unlink(pgmapname); cp = addarg(cp, "-apg"); addarg(cp, vval(PGMAP)); cp = sskip(sskip(cp)); /* remove any bandwidth */ *cp = '\0'; } if (pcmapname != NULL && pcmapdate < oct1date) { - unlink(pcmapname); cp = addarg(cp, "-apc"); addarg(cp, vval(PCMAP)); cp = sskip(sskip(cp)); /* remove any bandwidth */ @@ -751,7 +759,10 @@ mkpmapopts( /* get mkpmap options */ { /* BEWARE: This may be called via setdefaults(), so no assumptions */ - *mo = '\0'; + if (nprocs > 1) + sprintf(mo, " -n %d", nprocs); + else + *mo = '\0'; if (!vdef(MKPMAP)) return; if (vval(MKPMAP)[0] != '-') { @@ -785,8 +796,8 @@ ambval(void) /* compute ambient value */ { if (vdef(EXPOSURE)) { if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-') - return(.5/pow(2.,vflt(EXPOSURE))); - return(.5/vflt(EXPOSURE)); + return(.18/pow(2.,vflt(EXPOSURE))); + return(.18/vflt(EXPOSURE)); } if (vlet(ZONE) == 'E') return(10.); @@ -805,6 +816,13 @@ renderopts( /* set rendering options */ { 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); @@ -816,34 +834,34 @@ renderopts( /* set rendering options */ hiqopts(op, po); break; } - if (vdef(PGMAP)) { - 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); - } 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)) + if (vdef(RENDER)) { op = addarg(op, vval(RENDER)); + bw = strstr(vval(RENDER), "-aa "); + if (bw != NULL && atof(bw+4) <= FTINY) + overture = 0; + } 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)); + } } } @@ -1070,7 +1088,7 @@ hiqopts( /* high quality rendering options */ } -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) static void setenv( /* set an environment variable */ char *vname, @@ -1117,7 +1135,7 @@ xferopts( /* transfer options if indicated */ syserr(vval(OPTFILE)); sprintf(ro, " @%s", vval(OPTFILE)); } -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) else if (n > 50) { setenv("ROPT", ro+1); strcpy(ro, " $ROPT"); @@ -1144,12 +1162,13 @@ 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)); + } } @@ -1294,7 +1313,7 @@ specview( /* get proper view spec from vs */ if (cp == viewopts) /* append any additional options */ vs++; /* skip prefixed space if unneeded */ strcpy(cp, vs); -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) if (strlen(viewopts) > 40) { setenv("VIEW", viewopts); return("$VIEW"); @@ -1340,7 +1359,7 @@ getview( /* get view n, or NULL if none */ } numview: mv = nvalue(VIEWS, n); /* use view n */ - if ((vn != NULL) & (mv != NULL)) + if ((vn != NULL) & (mv != NULL)) { if (*mv != '-') { char *mv2 = mv; while (*mv2 && !isspace(*mv2)) @@ -1348,7 +1367,7 @@ numview: *vn = '\0'; } else sprintf(vn, "%d", n+1); - + } return(specview(mv)); } @@ -1362,14 +1381,14 @@ myprintview( /* print out selected view */ VIEW vwr; char buf[128]; char *cp; -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) /* XXX Should we allow something like this for all platforms? */ /* XXX Or is it still required at all? */ again: #endif if (vopts == NULL) return(-1); -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) if (vopts[0] == '$') { vopts = getenv(vopts+1); goto again; @@ -1516,6 +1535,7 @@ rpict( /* run rpict and pfilt for each view */ fprintf(stderr, "%s: cannot create\n", pfile); quit(1); } + pfile[-5] = '\0'; pfile = NULL; } }