9 |
|
|
10 |
|
#include <ctype.h> |
11 |
|
#include <time.h> |
12 |
+ |
#include <signal.h> |
13 |
|
|
14 |
|
#include "platform.h" |
15 |
|
#include "rtprocess.h" |
17 |
|
#include "paths.h" |
18 |
|
#include "vars.h" |
19 |
|
|
20 |
< |
#ifdef _WIN32 |
20 |
> |
#if defined(_WIN32) || defined(_WIN64) |
21 |
|
#define DELCMD "del" |
22 |
|
#define RENAMECMD "rename" |
23 |
|
#else |
25 |
|
#define RENAMECMD "mv" |
26 |
|
#include <sys/types.h> |
27 |
|
#include <sys/wait.h> |
28 |
+ |
#include <signal.h> |
29 |
|
#endif |
30 |
|
|
31 |
|
/* variables (alphabetical by name) */ |
37 |
|
#define INDIRECT 5 /* indirection in lighting */ |
38 |
|
#define MATERIAL 6 /* material files */ |
39 |
|
#define MKILLUM 7 /* mkillum options */ |
40 |
< |
#define OBJECT 8 /* object files */ |
41 |
< |
#define OCONV 9 /* oconv options */ |
42 |
< |
#define OCTREE 10 /* octree file name */ |
43 |
< |
#define OPTFILE 11 /* rendering options file */ |
44 |
< |
#define PENUMBRAS 12 /* shadow penumbras are desired */ |
45 |
< |
#define PFILT 13 /* pfilt options */ |
46 |
< |
#define PICTURE 14 /* picture file root name */ |
47 |
< |
#define QUALITY 15 /* desired rendering quality */ |
48 |
< |
#define RAWFILE 16 /* raw picture file root name */ |
49 |
< |
#define RENDER 17 /* rendering options */ |
50 |
< |
#define REPORT 18 /* report frequency and errfile */ |
51 |
< |
#define RESOLUTION 19 /* maximum picture resolution */ |
52 |
< |
#define SCENE 20 /* scene files */ |
53 |
< |
#define UP 21 /* view up (X, Y or Z) */ |
54 |
< |
#define VARIABILITY 22 /* level of light variability */ |
55 |
< |
#define VIEWS 23 /* view(s) for picture(s) */ |
56 |
< |
#define ZFILE 24 /* distance file root name */ |
57 |
< |
#define ZONE 25 /* simulation zone */ |
40 |
> |
#define MKPMAP 8 /* mkpmap options */ |
41 |
> |
#define OBJECT 9 /* object files */ |
42 |
> |
#define OCONV 10 /* oconv options */ |
43 |
> |
#define OCTREE 11 /* octree file name */ |
44 |
> |
#define OPTFILE 12 /* rendering options file */ |
45 |
> |
#define PCMAP 13 /* caustic photon map */ |
46 |
> |
#define PENUMBRAS 14 /* shadow penumbras are desired */ |
47 |
> |
#define PFILT 15 /* pfilt options */ |
48 |
> |
#define PGMAP 16 /* global photon map */ |
49 |
> |
#define PICTURE 17 /* picture file root name */ |
50 |
> |
#define QUALITY 18 /* desired rendering quality */ |
51 |
> |
#define RAWFILE 19 /* raw picture file root name */ |
52 |
> |
#define RENDER 20 /* rendering options */ |
53 |
> |
#define REPORT 21 /* report frequency and errfile */ |
54 |
> |
#define RESOLUTION 22 /* maximum picture resolution */ |
55 |
> |
#define RPICT 23 /* rpict parameters */ |
56 |
> |
#define RVU 24 /* rvu parameters */ |
57 |
> |
#define SCENE 25 /* scene files */ |
58 |
> |
#define UP 26 /* view up (X, Y or Z) */ |
59 |
> |
#define VARIABILITY 27 /* level of light variability */ |
60 |
> |
#define VIEWS 28 /* view(s) for picture(s) */ |
61 |
> |
#define ZFILE 29 /* distance file root name */ |
62 |
> |
#define ZONE 30 /* simulation zone */ |
63 |
|
/* total number of variables */ |
64 |
< |
int NVARS = 26; |
64 |
> |
int NVARS = 31; |
65 |
|
|
66 |
|
VARIABLE vv[] = { /* variable-value pairs */ |
67 |
|
{"AMBFILE", 3, 0, NULL, onevalue}, |
72 |
|
{"INDIRECT", 3, 0, NULL, intvalue}, |
73 |
|
{"materials", 3, 0, NULL, catvalues}, |
74 |
|
{"mkillum", 3, 0, NULL, catvalues}, |
75 |
+ |
{"mkpmap", 3, 0, NULL, catvalues}, |
76 |
|
{"objects", 3, 0, NULL, catvalues}, |
77 |
|
{"oconv", 3, 0, NULL, catvalues}, |
78 |
|
{"OCTREE", 3, 0, NULL, onevalue}, |
79 |
|
{"OPTFILE", 3, 0, NULL, onevalue}, |
80 |
+ |
{"PCMAP", 2, 0, NULL, onevalue}, |
81 |
|
{"PENUMBRAS", 3, 0, NULL, boolvalue}, |
82 |
|
{"pfilt", 2, 0, NULL, catvalues}, |
83 |
+ |
{"PGMAP", 2, 0, NULL, onevalue}, |
84 |
|
{"PICTURE", 3, 0, NULL, onevalue}, |
85 |
|
{"QUALITY", 3, 0, NULL, qualvalue}, |
86 |
|
{"RAWFILE", 3, 0, NULL, onevalue}, |
87 |
|
{"render", 3, 0, NULL, catvalues}, |
88 |
|
{"REPORT", 3, 0, NULL, onevalue}, |
89 |
|
{"RESOLUTION", 3, 0, NULL, onevalue}, |
90 |
+ |
{"rpict", 3, 0, NULL, catvalues}, |
91 |
+ |
{"rvu", 3, 0, NULL, catvalues}, |
92 |
|
{"scene", 3, 0, NULL, catvalues}, |
93 |
|
{"UP", 2, 0, NULL, onevalue}, |
94 |
|
{"VARIABILITY", 3, 0, NULL, qualvalue}, |
115 |
|
char *oct1name; /* name of post-mkillum octree */ |
116 |
|
time_t oct1date; /* date of post-mkillum octree (>= matdate) */ |
117 |
|
|
118 |
+ |
char *pgmapname; /* name of global photon map */ |
119 |
+ |
time_t pgmapdate; /* date of global photon map (>= oct1date) */ |
120 |
+ |
char *pcmapname; /* name of caustic photon map */ |
121 |
+ |
time_t pcmapdate; /* date of caustic photon map (>= oct1date) */ |
122 |
+ |
|
123 |
|
int nowarn = 0; /* no warnings */ |
124 |
|
int explicate = 0; /* explicate variables */ |
125 |
|
int silent = 0; /* do work silently */ |
129 |
|
char *rvdevice = NULL; /* rvu output device */ |
130 |
|
char *viewselect = NULL; /* specific view only */ |
131 |
|
|
132 |
+ |
#define DEF_RPICT_PATH "rpict" /* default rpict path */ |
133 |
+ |
|
134 |
+ |
/* command paths */ |
135 |
+ |
char c_oconv[256] = "oconv"; |
136 |
+ |
char c_mkillum[256] = "mkillum"; |
137 |
+ |
char c_mkpmap[256] = "mkpmap"; |
138 |
+ |
char c_rvu[256] = "rvu"; |
139 |
+ |
char c_rpict[256] = DEF_RPICT_PATH; |
140 |
+ |
char c_rpiece[] = "rpiece"; |
141 |
+ |
char c_pfilt[256] = "pfilt"; |
142 |
+ |
|
143 |
|
int overture = 0; /* overture calculation needed */ |
144 |
|
|
145 |
|
int children_running = 0; /* set negative in children */ |
158 |
|
static void getoctcube(double org[3], double *sizp); |
159 |
|
static void setdefaults(void); |
160 |
|
static void oconv(void); |
161 |
+ |
static void mkpmap(void); |
162 |
|
static char * addarg(char *op, char *arg); |
163 |
|
static void oconvopts(char *oo); |
164 |
|
static void mkillumopts(char *mo); |
165 |
+ |
static void mkpmapopts(char *mo); |
166 |
|
static void checkambfile(void); |
167 |
|
static double ambval(void); |
168 |
|
static void renderopts(char *op, char *po); |
181 |
|
static int runcom(char *cs); |
182 |
|
static int rmfile(char *fn); |
183 |
|
static int mvfile(char *fold, char *fnew); |
184 |
< |
static int next_process(void); |
184 |
> |
static int next_process(int reserve); |
185 |
|
static void wait_process(int all); |
186 |
|
static void finish_process(void); |
187 |
|
static void badvalue(int vc); |
237 |
|
if (i >= argc) |
238 |
|
goto userr; |
239 |
|
rifname = argv[i]; |
210 |
– |
/* check command-line options */ |
211 |
– |
if ((nprocs > 1) & (viewselect != NULL)) |
212 |
– |
nprocs = 1; |
240 |
|
/* assign Radiance root file name */ |
241 |
|
rootname(radname, rifname); |
242 |
|
/* load variable values */ |
259 |
|
printvars(stdout); |
260 |
|
/* build octree (and run mkillum) */ |
261 |
|
oconv(); |
262 |
+ |
/* run mkpmap if indicated */ |
263 |
+ |
mkpmap(); |
264 |
|
/* check date on ambient file */ |
265 |
|
checkambfile(); |
266 |
|
/* run simulation */ |
282 |
|
|
283 |
|
static void |
284 |
|
rootname( /* remove tail from end of fn */ |
285 |
< |
register char *rn, |
286 |
< |
register char *fn |
285 |
> |
char *rn, |
286 |
> |
char *fn |
287 |
|
) |
288 |
|
{ |
289 |
|
char *tp, *dp; |
300 |
|
|
301 |
|
static time_t |
302 |
|
checklast( /* check files and find most recent */ |
303 |
< |
register char *fnames |
303 |
> |
char *fnames |
304 |
|
) |
305 |
|
{ |
306 |
|
char thisfile[PATH_MAX]; |
330 |
|
int pred |
331 |
|
) |
332 |
|
{ |
333 |
< |
register char *cp; |
334 |
< |
register int n; |
333 |
> |
char *cp; |
334 |
> |
int n; |
335 |
|
int suffix; |
336 |
|
|
337 |
|
n = 0; cp = orig; suffix = -1; /* suffix position, length */ |
353 |
|
static void |
354 |
|
checkfiles(void) /* check for existence and modified times */ |
355 |
|
{ |
356 |
+ |
char fntemp[256]; |
357 |
|
time_t objdate; |
358 |
|
|
359 |
|
if (!vdef(OCTREE)) { |
383 |
|
vnam(OCTREE), vnam(SCENE), vnam(ILLUM)); |
384 |
|
quit(1); |
385 |
|
} |
386 |
+ |
if (vdef(PGMAP)) { |
387 |
+ |
if (!*sskip2(vval(PGMAP),1)) { |
388 |
+ |
fprintf(stderr, "%s: '%s' missing # photons argument\n", |
389 |
+ |
progname, vnam(PGMAP)); |
390 |
+ |
quit(1); |
391 |
+ |
} |
392 |
+ |
atos(fntemp, sizeof(fntemp), vval(PGMAP)); |
393 |
+ |
pgmapname = savqstr(fntemp); |
394 |
+ |
pgmapdate = fdate(pgmapname); |
395 |
+ |
} |
396 |
+ |
if (vdef(PCMAP)) { |
397 |
+ |
if (!*sskip2(vval(PCMAP),1)) { |
398 |
+ |
fprintf(stderr, "%s: '%s' missing # photons argument\n", |
399 |
+ |
progname, vnam(PCMAP)); |
400 |
+ |
quit(1); |
401 |
+ |
} |
402 |
+ |
atos(fntemp, sizeof(fntemp), vval(PCMAP)); |
403 |
+ |
pcmapname = savqstr(fntemp); |
404 |
+ |
pcmapdate = fdate(pcmapname); |
405 |
+ |
} |
406 |
|
matdate = checklast(vval(MATERIAL)); |
407 |
|
} |
408 |
|
|
417 |
|
double min[3], max[3]; |
418 |
|
char buf[1024]; |
419 |
|
FILE *fp; |
420 |
< |
register int i; |
420 |
> |
int i; |
421 |
|
|
422 |
|
if (osiz <= FTINY) { |
423 |
|
if (!nprocs && fdate(oct1name) < |
530 |
|
touch(vval(OCTREE)); |
531 |
|
else { /* build command */ |
532 |
|
if (vdef(MATERIAL)) |
533 |
< |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
534 |
< |
vval(MATERIAL), vval(SCENE), |
535 |
< |
vval(OCTREE)); |
533 |
> |
sprintf(combuf, "%s%s %s %s > %s", c_oconv, |
534 |
> |
ocopts, vval(MATERIAL), |
535 |
> |
vval(SCENE), vval(OCTREE)); |
536 |
|
else |
537 |
< |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
537 |
> |
sprintf(combuf, "%s%s %s > %s", c_oconv, ocopts, |
538 |
|
vval(SCENE), vval(OCTREE)); |
539 |
|
|
540 |
|
if (runcom(combuf)) { /* run it */ |
560 |
|
touch(oct0name); |
561 |
|
else { /* build command */ |
562 |
|
if (octreedate) |
563 |
< |
sprintf(combuf, "oconv%s -i %s %s > %s", ocopts, |
564 |
< |
vval(OCTREE), vval(ILLUM), oct0name); |
563 |
> |
sprintf(combuf, "%s%s -i %s %s > %s", c_oconv, |
564 |
> |
ocopts, vval(OCTREE), |
565 |
> |
vval(ILLUM), oct0name); |
566 |
|
else if (vdef(MATERIAL)) |
567 |
< |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
568 |
< |
vval(MATERIAL), vval(ILLUM), oct0name); |
518 |
< |
else |
519 |
< |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
567 |
> |
sprintf(combuf, "%s%s %s %s > %s", c_oconv, |
568 |
> |
ocopts, vval(MATERIAL), |
569 |
|
vval(ILLUM), oct0name); |
570 |
+ |
else |
571 |
+ |
sprintf(combuf, "%s%s %s > %s", c_oconv, |
572 |
+ |
ocopts, vval(ILLUM), oct0name); |
573 |
|
if (runcom(combuf)) { /* run it */ |
574 |
|
fprintf(stderr, |
575 |
|
"%s: error generating octree\n\t%s removed\n", |
589 |
|
else { |
590 |
|
mkillumopts(mkopts); /* build mkillum command */ |
591 |
|
mktemp(illumtmp); |
592 |
< |
sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts, |
592 |
> |
sprintf(combuf, "%s%s %s \"<\" %s > %s", c_mkillum, mkopts, |
593 |
|
oct0name, vval(ILLUM), illumtmp); |
594 |
|
if (runcom(combuf)) { /* run it */ |
595 |
< |
fprintf(stderr, "%s: error running mkillum\n", |
596 |
< |
progname); |
595 |
> |
fprintf(stderr, "%s: error running %s\n", |
596 |
> |
progname, c_mkillum); |
597 |
|
unlink(illumtmp); |
598 |
|
quit(1); |
599 |
|
} |
600 |
+ |
rmfile(oct0name); |
601 |
|
/* make octree1 (frozen) */ |
602 |
|
if (octreedate) |
603 |
< |
sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts, |
604 |
< |
vval(OCTREE), illumtmp, oct1name); |
603 |
> |
sprintf(combuf, "%s%s -f -i %s %s > %s", c_oconv, |
604 |
> |
ocopts, vval(OCTREE), illumtmp, oct1name); |
605 |
|
else if (vdef(MATERIAL)) |
606 |
< |
sprintf(combuf, "oconv%s -f %s %s > %s", ocopts, |
607 |
< |
vval(MATERIAL), illumtmp, oct1name); |
606 |
> |
sprintf(combuf, "%s%s -f %s %s > %s", c_oconv, |
607 |
> |
ocopts, vval(MATERIAL), illumtmp, oct1name); |
608 |
|
else |
609 |
< |
sprintf(combuf, "oconv%s -f %s > %s", ocopts, |
609 |
> |
sprintf(combuf, "%s%s -f %s > %s", c_oconv, ocopts, |
610 |
|
illumtmp, oct1name); |
611 |
|
if (runcom(combuf)) { /* run it */ |
612 |
|
fprintf(stderr, |
624 |
|
} |
625 |
|
|
626 |
|
|
627 |
+ |
static void |
628 |
+ |
mkpmap(void) /* run mkpmap if indicated */ |
629 |
+ |
{ |
630 |
+ |
char combuf[2048], *cp; |
631 |
+ |
time_t tnow; |
632 |
+ |
/* nothing to do? */ |
633 |
+ |
if ((pgmapname == NULL) | (pgmapdate >= oct1date) && |
634 |
+ |
(pcmapname == NULL) | (pcmapdate >= oct1date)) |
635 |
+ |
return; |
636 |
+ |
/* just update existing file dates? */ |
637 |
+ |
if (touchonly && (pgmapname == NULL) | (pgmapdate > 0) && |
638 |
+ |
(pcmapname == NULL) | (pcmapdate > 0)) { |
639 |
+ |
if (pgmapname != NULL) |
640 |
+ |
touch(pgmapname); |
641 |
+ |
if (pcmapname != NULL) |
642 |
+ |
touch(pcmapname); |
643 |
+ |
} else { /* else need to (re)run pkpmap */ |
644 |
+ |
strcpy(combuf, c_mkpmap); |
645 |
+ |
for (cp = combuf; *cp; cp++) |
646 |
+ |
; |
647 |
+ |
mkpmapopts(cp); |
648 |
+ |
/* force file overwrite */ |
649 |
+ |
cp = addarg(cp, "-fo+"); |
650 |
+ |
if (vdef(REPORT)) { |
651 |
+ |
char errfile[256]; |
652 |
+ |
int n; |
653 |
+ |
double minutes; |
654 |
+ |
n = sscanf(vval(REPORT), "%lf %s", &minutes, errfile); |
655 |
+ |
if (n == 2) |
656 |
+ |
sprintf(cp, " -t %d -e %s", (int)(minutes*60), errfile); |
657 |
+ |
else if (n == 1) |
658 |
+ |
sprintf(cp, " -t %d", (int)(minutes*60)); |
659 |
+ |
else |
660 |
+ |
badvalue(REPORT); |
661 |
+ |
} |
662 |
+ |
if (pgmapname != NULL && pgmapdate < oct1date) { |
663 |
+ |
cp = addarg(cp, "-apg"); |
664 |
+ |
addarg(cp, vval(PGMAP)); |
665 |
+ |
cp = sskip(sskip(cp)); /* remove any bandwidth */ |
666 |
+ |
*cp = '\0'; |
667 |
+ |
} |
668 |
+ |
if (pcmapname != NULL && pcmapdate < oct1date) { |
669 |
+ |
cp = addarg(cp, "-apc"); |
670 |
+ |
addarg(cp, vval(PCMAP)); |
671 |
+ |
cp = sskip(sskip(cp)); /* remove any bandwidth */ |
672 |
+ |
*cp = '\0'; |
673 |
+ |
} |
674 |
+ |
cp = addarg(cp, oct1name); |
675 |
+ |
if (runcom(combuf)) { |
676 |
+ |
fprintf(stderr, "%s: error running %s\n", |
677 |
+ |
progname, c_mkpmap); |
678 |
+ |
if (pgmapname != NULL && pgmapdate < oct1date) |
679 |
+ |
unlink(pgmapname); |
680 |
+ |
if (pcmapname != NULL && pcmapdate < oct1date) |
681 |
+ |
unlink(pcmapname); |
682 |
+ |
quit(1); |
683 |
+ |
} |
684 |
+ |
} |
685 |
+ |
tnow = time((time_t *)NULL); |
686 |
+ |
if (pgmapname != NULL) |
687 |
+ |
pgmapdate = tnow; |
688 |
+ |
if (pcmapname != NULL) |
689 |
+ |
pcmapdate = tnow; |
690 |
+ |
oct1date = tnow; /* trigger ambient file removal if needed */ |
691 |
+ |
} |
692 |
+ |
|
693 |
+ |
|
694 |
|
static char * |
695 |
< |
addarg( /* add argument and advance pointer */ |
696 |
< |
register char *op, |
697 |
< |
register char *arg |
695 |
> |
addarg( /* append argument and advance pointer */ |
696 |
> |
char *op, |
697 |
> |
char *arg |
698 |
|
) |
699 |
|
{ |
700 |
+ |
while (*op) |
701 |
+ |
op++; |
702 |
|
*op = ' '; |
703 |
|
while ( (*++op = *arg++) ) |
704 |
|
; |
708 |
|
|
709 |
|
static void |
710 |
|
oconvopts( /* get oconv options */ |
711 |
< |
register char *oo |
711 |
> |
char *oo |
712 |
|
) |
713 |
|
{ |
714 |
|
/* BEWARE: This may be called via setdefaults(), so no assumptions */ |
715 |
|
|
716 |
|
*oo = '\0'; |
717 |
< |
if (vdef(OCONV)) |
718 |
< |
addarg(oo, vval(OCONV)); |
717 |
> |
if (!vdef(OCONV)) |
718 |
> |
return; |
719 |
> |
if (vval(OCONV)[0] != '-') { |
720 |
> |
atos(c_oconv, sizeof(c_oconv), vval(OCONV)); |
721 |
> |
oo = addarg(oo, sskip2(vval(OCONV), 1)); |
722 |
> |
} else |
723 |
> |
oo = addarg(oo, vval(OCONV)); |
724 |
|
} |
725 |
|
|
726 |
|
|
731 |
|
{ |
732 |
|
/* BEWARE: This may be called via setdefaults(), so no assumptions */ |
733 |
|
|
734 |
< |
if (nprocs > 1) { |
734 |
> |
if (nprocs > 1) |
735 |
|
sprintf(mo, " -n %d", nprocs); |
736 |
< |
while (*mo) |
737 |
< |
mo++; |
736 |
> |
else |
737 |
> |
*mo = '\0'; |
738 |
> |
if (!vdef(MKILLUM)) |
739 |
> |
return; |
740 |
> |
if (vval(MKILLUM)[0] != '-') { |
741 |
> |
atos(c_mkillum, sizeof(c_mkillum), vval(MKILLUM)); |
742 |
> |
mo = addarg(mo, sskip2(vval(MKILLUM), 1)); |
743 |
|
} else |
744 |
+ |
mo = addarg(mo, vval(MKILLUM)); |
745 |
+ |
} |
746 |
+ |
|
747 |
+ |
|
748 |
+ |
static void |
749 |
+ |
mkpmapopts( /* get mkpmap options */ |
750 |
+ |
char *mo |
751 |
+ |
) |
752 |
+ |
{ |
753 |
+ |
/* BEWARE: This may be called via setdefaults(), so no assumptions */ |
754 |
+ |
|
755 |
+ |
if (nprocs > 1) |
756 |
+ |
sprintf(mo, " -n %d", nprocs); |
757 |
+ |
else |
758 |
|
*mo = '\0'; |
759 |
< |
if (vdef(MKILLUM)) |
760 |
< |
addarg(mo, vval(MKILLUM)); |
759 |
> |
if (!vdef(MKPMAP)) |
760 |
> |
return; |
761 |
> |
if (vval(MKPMAP)[0] != '-') { |
762 |
> |
atos(c_mkpmap, sizeof(c_mkpmap), vval(MKPMAP)); |
763 |
> |
mo = addarg(mo, sskip2(vval(MKPMAP), 1)); |
764 |
> |
} else |
765 |
> |
mo = addarg(mo, vval(MKPMAP)); |
766 |
|
} |
767 |
|
|
768 |
|
|
807 |
|
char *po |
808 |
|
) |
809 |
|
{ |
810 |
+ |
char pmapf[256], *bw; |
811 |
+ |
|
812 |
+ |
if (vdef(PGMAP)) { |
813 |
+ |
*op = '\0'; |
814 |
+ |
bw = sskip2(vval(PGMAP), 2); |
815 |
+ |
atos(pmapf, sizeof(pmapf), vval(PGMAP)); |
816 |
+ |
op = addarg(addarg(op, "-ap"), pmapf); |
817 |
+ |
if (atoi(bw) > 0) op = addarg(op, bw); |
818 |
+ |
} |
819 |
|
switch(vscale(QUALITY)) { |
820 |
|
case LOW: |
821 |
|
lowqopts(op, po); |
827 |
|
hiqopts(op, po); |
828 |
|
break; |
829 |
|
} |
830 |
+ |
if (vdef(PCMAP)) { |
831 |
+ |
bw = sskip2(vval(PCMAP), 2); |
832 |
+ |
atos(pmapf, sizeof(pmapf), vval(PCMAP)); |
833 |
+ |
op = addarg(addarg(op, "-ap"), pmapf); |
834 |
+ |
if (atoi(bw) > 0) op = addarg(op, bw); |
835 |
+ |
} |
836 |
+ |
if (vdef(RENDER)) |
837 |
+ |
op = addarg(op, vval(RENDER)); |
838 |
+ |
if (rvdevice != NULL) { |
839 |
+ |
if (vdef(RVU)) { |
840 |
+ |
if (vval(RVU)[0] != '-') { |
841 |
+ |
atos(c_rvu, sizeof(c_rvu), vval(RVU)); |
842 |
+ |
po = addarg(po, sskip2(vval(RVU), 1)); |
843 |
+ |
} else |
844 |
+ |
po = addarg(po, vval(RVU)); |
845 |
+ |
} |
846 |
+ |
} else { |
847 |
+ |
if (vdef(RPICT)) { |
848 |
+ |
if (vval(RPICT)[0] != '-') { |
849 |
+ |
atos(c_rpict, sizeof(c_rpict), vval(RPICT)); |
850 |
+ |
po = addarg(po, sskip2(vval(RPICT), 1)); |
851 |
+ |
} else |
852 |
+ |
po = addarg(po, vval(RPICT)); |
853 |
+ |
} |
854 |
+ |
} |
855 |
|
} |
856 |
|
|
857 |
|
|
858 |
|
static void |
859 |
|
lowqopts( /* low quality rendering options */ |
860 |
< |
register char *op, |
860 |
> |
char *op, |
861 |
|
char *po |
862 |
|
) |
863 |
|
{ |
898 |
|
op = addarg(op, "-ds .4"); |
899 |
|
else |
900 |
|
op = addarg(op, "-ds 0"); |
901 |
< |
op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5"); |
901 |
> |
op = addarg(op, "-dt .2 -dc .25 -dr 0 -ss 0 -st .5"); |
902 |
|
if (vdef(AMBFILE)) { |
903 |
|
sprintf(op, " -af %s", vval(AMBFILE)); |
904 |
|
op += strlen(op); |
919 |
|
d = ambval(); |
920 |
|
sprintf(op, " -av %.2g %.2g %.2g", d, d, d); |
921 |
|
op += strlen(op); |
922 |
< |
op = addarg(op, "-lr 6 -lw .01"); |
738 |
< |
if (vdef(RENDER)) |
739 |
< |
op = addarg(op, vval(RENDER)); |
922 |
> |
op = addarg(op, "-lr 6 -lw .003"); |
923 |
|
} |
924 |
|
|
925 |
|
|
926 |
|
static void |
927 |
|
medqopts( /* medium quality rendering options */ |
928 |
< |
register char *op, |
928 |
> |
char *op, |
929 |
|
char *po |
930 |
|
) |
931 |
|
{ |
970 |
|
} |
971 |
|
po = addarg(po, "-pt .08"); |
972 |
|
if (vbool(PENUMBRAS)) |
973 |
< |
op = addarg(op, "-ds .2 -dj .5"); |
973 |
> |
op = addarg(op, "-ds .2 -dj .9"); |
974 |
|
else |
975 |
|
op = addarg(op, "-ds .3"); |
976 |
< |
op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1"); |
976 |
> |
op = addarg(op, "-dt .1 -dc .5 -dr 1 -ss 1 -st .1"); |
977 |
|
if ( (overture = vint(INDIRECT)) ) { |
978 |
|
sprintf(op, " -ab %d", overture); |
979 |
|
op += strlen(op); |
997 |
|
d = ambval(); |
998 |
|
sprintf(op, " -av %.2g %.2g %.2g", d, d, d); |
999 |
|
op += strlen(op); |
1000 |
< |
op = addarg(op, "-lr 8 -lw .002"); |
818 |
< |
if (vdef(RENDER)) |
819 |
< |
op = addarg(op, vval(RENDER)); |
1000 |
> |
op = addarg(op, "-lr 8 -lw 1e-4"); |
1001 |
|
} |
1002 |
|
|
1003 |
|
|
1004 |
|
static void |
1005 |
|
hiqopts( /* high quality rendering options */ |
1006 |
< |
register char *op, |
1006 |
> |
char *op, |
1007 |
|
char *po |
1008 |
|
) |
1009 |
|
{ |
1048 |
|
} |
1049 |
|
po = addarg(po, "-pt .04"); |
1050 |
|
if (vbool(PENUMBRAS)) |
1051 |
< |
op = addarg(op, "-ds .1 -dj .65"); |
1051 |
> |
op = addarg(op, "-ds .1 -dj .9"); |
1052 |
|
else |
1053 |
|
op = addarg(op, "-ds .2"); |
1054 |
< |
op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01"); |
1054 |
> |
op = addarg(op, "-dt .05 -dc .75 -dr 3 -ss 16 -st .01"); |
1055 |
|
sprintf(op, " -ab %d", overture=vint(INDIRECT)+1); |
1056 |
|
op += strlen(op); |
1057 |
|
if (vdef(AMBFILE)) { |
1073 |
|
d = ambval(); |
1074 |
|
sprintf(op, " -av %.2g %.2g %.2g", d, d, d); |
1075 |
|
op += strlen(op); |
1076 |
< |
op = addarg(op, "-lr 12 -lw .0005"); |
896 |
< |
if (vdef(RENDER)) |
897 |
< |
op = addarg(op, vval(RENDER)); |
1076 |
> |
op = addarg(op, "-lr 12 -lw 1e-5"); |
1077 |
|
} |
1078 |
|
|
1079 |
|
|
1080 |
+ |
#if defined(_WIN32) || defined(_WIN64) |
1081 |
|
static void |
1082 |
+ |
setenv( /* set an environment variable */ |
1083 |
+ |
char *vname, |
1084 |
+ |
char *value |
1085 |
+ |
) |
1086 |
+ |
{ |
1087 |
+ |
char *evp; |
1088 |
+ |
|
1089 |
+ |
evp = bmalloc(strlen(vname)+strlen(value)+2); |
1090 |
+ |
if (evp == NULL) |
1091 |
+ |
syserr(progname); |
1092 |
+ |
sprintf(evp, "%s=%s", vname, value); |
1093 |
+ |
if (putenv(evp) != 0) { |
1094 |
+ |
fprintf(stderr, "%s: out of environment space\n", progname); |
1095 |
+ |
quit(1); |
1096 |
+ |
} |
1097 |
+ |
if (!silent) |
1098 |
+ |
printf("set %s\n", evp); |
1099 |
+ |
} |
1100 |
+ |
#endif |
1101 |
+ |
|
1102 |
+ |
|
1103 |
+ |
static void |
1104 |
|
xferopts( /* transfer options if indicated */ |
1105 |
|
char *ro |
1106 |
|
) |
1107 |
|
{ |
1108 |
|
int fd, n; |
1109 |
< |
register char *cp; |
1109 |
> |
char *cp; |
1110 |
|
|
1111 |
|
n = strlen(ro); |
1112 |
|
if (n < 2) |
1124 |
|
syserr(vval(OPTFILE)); |
1125 |
|
sprintf(ro, " @%s", vval(OPTFILE)); |
1126 |
|
} |
1127 |
< |
#ifdef _WIN32 |
1127 |
> |
#if defined(_WIN32) || defined(_WIN64) |
1128 |
|
else if (n > 50) { |
1129 |
|
setenv("ROPT", ro+1); |
1130 |
|
strcpy(ro, " $ROPT"); |
1135 |
|
|
1136 |
|
static void |
1137 |
|
pfiltopts( /* get pfilt options */ |
1138 |
< |
register char *po |
1138 |
> |
char *po |
1139 |
|
) |
1140 |
|
{ |
1141 |
|
*po = '\0'; |
1151 |
|
po = addarg(po, "-m .25"); |
1152 |
|
break; |
1153 |
|
} |
1154 |
< |
if (vdef(PFILT)) |
1155 |
< |
po = addarg(po, vval(PFILT)); |
1154 |
> |
if (vdef(PFILT)) { |
1155 |
> |
if (vval(PFILT)[0] != '-') { |
1156 |
> |
atos(c_pfilt, sizeof(c_pfilt), vval(PFILT)); |
1157 |
> |
po = addarg(po, sskip2(vval(PFILT), 1)); |
1158 |
> |
} else |
1159 |
> |
po = addarg(po, vval(PFILT)); |
1160 |
> |
} |
1161 |
|
} |
1162 |
|
|
1163 |
|
|
1164 |
|
static int |
1165 |
|
matchword( /* match white-delimited words */ |
1166 |
< |
register char *s1, |
1167 |
< |
register char *s2 |
1166 |
> |
char *s1, |
1167 |
> |
char *s2 |
1168 |
|
) |
1169 |
|
{ |
1170 |
|
while (isspace(*s1)) s1++; |
1178 |
|
|
1179 |
|
static char * |
1180 |
|
specview( /* get proper view spec from vs */ |
1181 |
< |
register char *vs |
1181 |
> |
char *vs |
1182 |
|
) |
1183 |
|
{ |
1184 |
|
static char vup[7][12] = {"-vu 0 0 -1","-vu 0 -1 0","-vu -1 0 0", |
1185 |
|
"-vu 0 0 1", "-vu 1 0 0","-vu 0 1 0","-vu 0 0 1"}; |
1186 |
|
static char viewopts[128]; |
1187 |
< |
register char *cp; |
1187 |
> |
char *cp; |
1188 |
|
int xpos, ypos, zpos, viewtype, upax; |
1189 |
< |
register int i; |
1189 |
> |
int i; |
1190 |
|
double cent[3], dim[3], mult, d; |
1191 |
|
|
1192 |
|
if (vs == NULL || *vs == '-') |
1219 |
|
} else if (*vs == 'z') { |
1220 |
|
zpos = -1; vs++; |
1221 |
|
} |
1222 |
< |
viewtype = 'v'; |
1223 |
< |
if((*vs == 'v') | (*vs == 'l') | (*vs == 'a') | (*vs == 'h') | (*vs == 'c')) |
1222 |
> |
switch (*vs) { |
1223 |
> |
case VT_PER: |
1224 |
> |
case VT_PAR: |
1225 |
> |
case VT_ANG: |
1226 |
> |
case VT_HEM: |
1227 |
> |
case VT_PLS: |
1228 |
> |
case VT_CYL: |
1229 |
|
viewtype = *vs++; |
1230 |
+ |
break; |
1231 |
+ |
default: |
1232 |
+ |
viewtype = VT_PER; |
1233 |
+ |
break; |
1234 |
+ |
} |
1235 |
|
cp = viewopts; |
1236 |
|
if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) { /* got one! */ |
1237 |
|
*cp++ = '-'; *cp++ = 'v'; *cp++ = 't'; *cp++ = viewtype; |
1246 |
|
cent[i] += .5*dim[i]; |
1247 |
|
} |
1248 |
|
mult = vlet(ZONE)=='E' ? 2. : .45 ; |
1249 |
< |
sprintf(cp, " -vp %.2g %.2g %.2g -vd %.2g %.2g %.2g", |
1249 |
> |
sprintf(cp, " -vp %.3g %.3g %.3g -vd %.3g %.3g %.3g", |
1250 |
|
cent[0]+xpos*mult*dim[0], |
1251 |
|
cent[1]+ypos*mult*dim[1], |
1252 |
|
cent[2]+zpos*mult*dim[2], |
1273 |
|
} |
1274 |
|
cp = addarg(cp, vup[upax+3]); |
1275 |
|
switch (viewtype) { |
1276 |
< |
case 'v': |
1276 |
> |
case VT_PER: |
1277 |
|
cp = addarg(cp, "-vh 45 -vv 45"); |
1278 |
|
break; |
1279 |
< |
case 'l': |
1279 |
> |
case VT_PAR: |
1280 |
|
d = sqrt(dim[0]*dim[0]+dim[1]*dim[1]+dim[2]*dim[2]); |
1281 |
< |
sprintf(cp, " -vh %.2g -vv %.2g", d, d); |
1281 |
> |
sprintf(cp, " -vh %.3g -vv %.3g", d, d); |
1282 |
|
cp += strlen(cp); |
1283 |
|
break; |
1284 |
< |
case 'a': |
1285 |
< |
case 'h': |
1284 |
> |
case VT_ANG: |
1285 |
> |
case VT_HEM: |
1286 |
> |
case VT_PLS: |
1287 |
|
cp = addarg(cp, "-vh 180 -vv 180"); |
1288 |
|
break; |
1289 |
< |
case 'c': |
1289 |
> |
case VT_CYL: |
1290 |
|
cp = addarg(cp, "-vh 180 -vv 90"); |
1291 |
|
break; |
1292 |
|
} |
1294 |
|
while (!isspace(*vs)) /* else skip id */ |
1295 |
|
if (!*vs++) |
1296 |
|
return(NULL); |
1297 |
< |
if (upax) { /* specify up vector */ |
1297 |
> |
if (upax) { /* prepend up vector */ |
1298 |
|
strcpy(cp, vup[upax+3]); |
1299 |
|
cp += strlen(cp); |
1300 |
|
} |
1302 |
|
if (cp == viewopts) /* append any additional options */ |
1303 |
|
vs++; /* skip prefixed space if unneeded */ |
1304 |
|
strcpy(cp, vs); |
1305 |
< |
#ifdef _WIN32 |
1305 |
> |
#if defined(_WIN32) || defined(_WIN64) |
1306 |
|
if (strlen(viewopts) > 40) { |
1307 |
|
setenv("VIEW", viewopts); |
1308 |
|
return("$VIEW"); |
1318 |
|
char *vn /* returned view name */ |
1319 |
|
) |
1320 |
|
{ |
1321 |
< |
register char *mv; |
1321 |
> |
char *mv; |
1322 |
|
|
1323 |
|
if (viewselect != NULL) { /* command-line selected */ |
1324 |
|
if (n) /* only do one */ |
1325 |
|
return(NULL); |
1326 |
+ |
|
1327 |
+ |
if (isint(viewselect)) { /* view number? */ |
1328 |
+ |
n = atoi(viewselect)-1; |
1329 |
+ |
goto numview; |
1330 |
+ |
} |
1331 |
|
if (viewselect[0] == '-') { /* already specified */ |
1332 |
< |
if (vn != NULL) *vn = '\0'; |
1332 |
> |
if (vn != NULL) |
1333 |
> |
strcpy(vn, "0"); |
1334 |
|
return(viewselect); |
1335 |
|
} |
1336 |
|
if (vn != NULL) { |
1339 |
|
; |
1340 |
|
*vn = '\0'; |
1341 |
|
} |
1118 |
– |
/* view number? */ |
1119 |
– |
if (isint(viewselect)) |
1120 |
– |
return(specview(nvalue(VIEWS, atoi(viewselect)-1))); |
1342 |
|
/* check list */ |
1343 |
|
while ((mv = nvalue(VIEWS, n++)) != NULL) |
1344 |
|
if (matchword(viewselect, mv)) |
1345 |
|
return(specview(mv)); |
1346 |
+ |
|
1347 |
|
return(specview(viewselect)); /* standard view? */ |
1348 |
|
} |
1349 |
+ |
numview: |
1350 |
|
mv = nvalue(VIEWS, n); /* use view n */ |
1351 |
|
if ((vn != NULL) & (mv != NULL)) { |
1352 |
< |
register char *mv2 = mv; |
1353 |
< |
if (*mv2 != '-') |
1352 |
> |
if (*mv != '-') { |
1353 |
> |
char *mv2 = mv; |
1354 |
|
while (*mv2 && !isspace(*mv2)) |
1355 |
|
*vn++ = *mv2++; |
1356 |
< |
*vn = '\0'; |
1356 |
> |
*vn = '\0'; |
1357 |
> |
} else |
1358 |
> |
sprintf(vn, "%d", n+1); |
1359 |
|
} |
1360 |
|
return(specview(mv)); |
1361 |
|
} |
1363 |
|
|
1364 |
|
static int |
1365 |
|
myprintview( /* print out selected view */ |
1366 |
< |
register char *vopts, |
1366 |
> |
char *vopts, |
1367 |
|
FILE *fp |
1368 |
|
) |
1369 |
|
{ |
1370 |
|
VIEW vwr; |
1371 |
|
char buf[128]; |
1372 |
< |
register char *cp; |
1373 |
< |
#ifdef _WIN32 |
1372 |
> |
char *cp; |
1373 |
> |
#if defined(_WIN32) || defined(_WIN64) |
1374 |
|
/* XXX Should we allow something like this for all platforms? */ |
1375 |
|
/* XXX Or is it still required at all? */ |
1376 |
|
again: |
1377 |
|
#endif |
1378 |
|
if (vopts == NULL) |
1379 |
|
return(-1); |
1380 |
< |
#ifdef _WIN32 |
1380 |
> |
#if defined(_WIN32) || defined(_WIN64) |
1381 |
|
if (vopts[0] == '$') { |
1382 |
|
vopts = getenv(vopts+1); |
1383 |
|
goto again; |
1410 |
|
return; |
1411 |
|
if (sayview) |
1412 |
|
myprintview(vw, stdout); |
1413 |
< |
sprintf(combuf, "rvu %s%s%s -R %s ", vw, po, opts, rifname); |
1413 |
> |
sprintf(combuf, "%s %s%s%s -R %s ", c_rvu, vw, opts, po, rifname); |
1414 |
> |
if (nprocs > 1) |
1415 |
> |
sprintf(combuf+strlen(combuf), "-n %d ", nprocs); |
1416 |
|
if (rvdevice != NULL) |
1417 |
|
sprintf(combuf+strlen(combuf), "-o %s ", rvdevice); |
1418 |
|
if (vdef(EXPOSURE)) |
1419 |
|
sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE)); |
1420 |
|
strcat(combuf, oct1name); |
1421 |
|
if (runcom(combuf)) { /* run it */ |
1422 |
< |
fprintf(stderr, "%s: error running rvu\n", progname); |
1422 |
> |
fprintf(stderr, "%s: error running %s\n", progname, c_rvu); |
1423 |
|
quit(1); |
1424 |
|
} |
1425 |
|
} |
1426 |
|
|
1427 |
|
|
1428 |
+ |
static int |
1429 |
+ |
syncf_done( /* check if an rpiece sync file is complete */ |
1430 |
+ |
char *sfname |
1431 |
+ |
) |
1432 |
+ |
{ |
1433 |
+ |
FILE *fp = fopen(sfname, "r"); |
1434 |
+ |
int todo = 1; |
1435 |
+ |
int x, y; |
1436 |
+ |
|
1437 |
+ |
if (fp == NULL) |
1438 |
+ |
return(0); |
1439 |
+ |
if (fscanf(fp, "%d %d", &x, &y) != 2) |
1440 |
+ |
goto checked; |
1441 |
+ |
todo = x*y; /* total number of tiles */ |
1442 |
+ |
if (fscanf(fp, "%d %d", &x, &y) != 2 || (x != 0) | (y != 0)) |
1443 |
+ |
goto checked; |
1444 |
+ |
/* XXX assume no redundant tiles */ |
1445 |
+ |
while (fscanf(fp, "%d %d", &x, &y) == 2) |
1446 |
+ |
if (!--todo) |
1447 |
+ |
break; |
1448 |
+ |
checked: |
1449 |
+ |
fclose(fp); |
1450 |
+ |
return(!todo); |
1451 |
+ |
} |
1452 |
+ |
|
1453 |
+ |
|
1454 |
|
static void |
1455 |
|
rpict( /* run rpict and pfilt for each view */ |
1456 |
|
char *opts, |
1457 |
|
char *po |
1458 |
|
) |
1459 |
|
{ |
1460 |
< |
char combuf[PATH_MAX]; |
1460 |
> |
#define do_rpiece (sfile[0]!='\0') |
1461 |
> |
char combuf[5*PATH_MAX+512]; |
1462 |
|
char rawfile[PATH_MAX], picfile[PATH_MAX]; |
1463 |
|
char zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32]; |
1464 |
< |
char rppopt[128], *pfile = NULL; |
1464 |
> |
char rppopt[32], sfile[PATH_MAX], *pfile = NULL; |
1465 |
|
char pfopts[128]; |
1466 |
|
char vs[32], *vw; |
1467 |
|
int vn, mult; |
1468 |
|
FILE *fp; |
1469 |
|
time_t rfdt, pfdt; |
1470 |
+ |
int xres, yres; |
1471 |
+ |
double aspect; |
1472 |
+ |
int n; |
1473 |
|
/* get pfilt options */ |
1474 |
|
pfiltopts(pfopts); |
1475 |
|
/* get resolution, reporting */ |
1484 |
|
mult = 3; |
1485 |
|
break; |
1486 |
|
} |
1487 |
< |
{ |
1488 |
< |
int xres, yres; |
1489 |
< |
double aspect; |
1490 |
< |
int n; |
1491 |
< |
n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect); |
1492 |
< |
if (n == 3) |
1493 |
< |
sprintf(res, "-x %d -y %d -pa %.3f", |
1494 |
< |
mult*xres, mult*yres, aspect); |
1495 |
< |
else if (n) { |
1496 |
< |
if (n == 1) yres = xres; |
1240 |
< |
sprintf(res, "-x %d -y %d", mult*xres, mult*yres); |
1241 |
< |
} else |
1242 |
< |
badvalue(RESOLUTION); |
1243 |
< |
} |
1487 |
> |
n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect); |
1488 |
> |
if (n == 3) |
1489 |
> |
sprintf(res, "-x %d -y %d -pa %.3f", |
1490 |
> |
mult*xres, mult*yres, aspect); |
1491 |
> |
else if (n) { |
1492 |
> |
aspect = 1.; |
1493 |
> |
if (n == 1) yres = xres; |
1494 |
> |
sprintf(res, "-x %d -y %d", mult*xres, mult*yres); |
1495 |
> |
} else |
1496 |
> |
badvalue(RESOLUTION); |
1497 |
|
rep[0] = '\0'; |
1498 |
|
if (vdef(REPORT)) { |
1499 |
|
double minutes; |
1247 |
– |
int n; |
1500 |
|
n = sscanf(vval(REPORT), "%lf %s", &minutes, rawfile); |
1501 |
|
if (n == 2) |
1502 |
|
sprintf(rep, " -t %d -e %s", (int)(minutes*60), rawfile); |
1506 |
|
badvalue(REPORT); |
1507 |
|
} |
1508 |
|
/* set up parallel rendering */ |
1509 |
< |
if ((nprocs > 1) & (!vdef(ZFILE))) { |
1510 |
< |
strcpy(rppopt, "-S 1 -PP pfXXXXXX"); |
1511 |
< |
pfile = rppopt+9; |
1512 |
< |
if (mktemp(pfile) == NULL) |
1509 |
> |
sfile[0] = '\0'; |
1510 |
> |
if ((nprocs > 1) & !touchonly & !vdef(ZFILE) && |
1511 |
> |
getview(0, vs) != NULL) { |
1512 |
> |
if (!strcmp(c_rpict, DEF_RPICT_PATH) && |
1513 |
> |
getview(1, NULL) == NULL) { |
1514 |
> |
sprintf(sfile, "%s_%s_rpsync.txt", |
1515 |
> |
vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), |
1516 |
> |
vs); |
1517 |
> |
strcpy(rppopt, "-PP pfXXXXXX"); |
1518 |
> |
} else { |
1519 |
> |
strcpy(rppopt, "-S 1 -PP pfXXXXXX"); |
1520 |
> |
} |
1521 |
> |
pfile = rppopt + strlen(rppopt) - 8; |
1522 |
> |
if (mktemp(pfile) == NULL) { |
1523 |
> |
if (do_rpiece) { |
1524 |
> |
fprintf(stderr, "%s: cannot create\n", pfile); |
1525 |
> |
quit(1); |
1526 |
> |
} |
1527 |
> |
pfile[-5] = '\0'; |
1528 |
|
pfile = NULL; |
1529 |
+ |
} |
1530 |
|
} |
1531 |
|
vn = 0; /* do each view */ |
1532 |
|
while ((vw = getview(vn++, vs)) != NULL) { |
1533 |
|
if (sayview) |
1534 |
|
myprintview(vw, stdout); |
1535 |
< |
if (!vs[0]) |
1268 |
< |
sprintf(vs, "%d", vn); |
1269 |
< |
sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs); |
1535 |
> |
sprintf(picfile, "%s_%s.hdr", vval(PICTURE), vs); |
1536 |
|
if (vdef(ZFILE)) |
1537 |
|
sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs); |
1538 |
|
else |
1553 |
|
touch(picfile); |
1554 |
|
continue; |
1555 |
|
} |
1556 |
< |
if (next_process()) { /* parallel running? */ |
1556 |
> |
/* parallel running? */ |
1557 |
> |
if (do_rpiece) { |
1558 |
> |
if (rfdt < oct1date || !fdate(sfile)) { |
1559 |
> |
int xdiv = 8+nprocs/3, ydiv = 8+nprocs/3; |
1560 |
> |
if (rfdt >= oct1date) { |
1561 |
> |
fprintf(stderr, |
1562 |
> |
"%s: partial output not created with %s\n", rawfile, c_rpiece); |
1563 |
> |
quit(1); |
1564 |
> |
} |
1565 |
> |
if (rfdt) { /* start fresh */ |
1566 |
> |
rmfile(rawfile); |
1567 |
> |
rfdt = 0; |
1568 |
> |
} |
1569 |
> |
if (!silent) |
1570 |
> |
printf("\techo %d %d > %s\n", |
1571 |
> |
xdiv, ydiv, sfile); |
1572 |
> |
if ((fp = fopen(sfile, "w")) == NULL) { |
1573 |
> |
fprintf(stderr, "%s: cannot create\n", |
1574 |
> |
sfile); |
1575 |
> |
quit(1); |
1576 |
> |
} |
1577 |
> |
fprintf(fp, "%d %d\n", xdiv, ydiv); |
1578 |
> |
fclose(fp); |
1579 |
> |
} |
1580 |
> |
} else if (next_process(0)) { |
1581 |
|
if (pfile != NULL) |
1582 |
< |
sleep(20); |
1582 |
> |
sleep(10); |
1583 |
|
continue; |
1584 |
< |
} |
1584 |
> |
} else if (!inchild()) |
1585 |
> |
pfile = NULL; |
1586 |
|
/* XXX Remember to call finish_process() */ |
1587 |
|
/* build rpict command */ |
1588 |
< |
if (rfdt >= oct1date) { /* recover */ |
1589 |
< |
sprintf(combuf, "rpict%s%s%s%s -ro %s %s", |
1590 |
< |
rep, po, opts, zopt, rawfile, oct1name); |
1591 |
< |
if (runcom(combuf)) /* run rpict */ |
1588 |
> |
if (rfdt >= oct1date) { /* already in progress */ |
1589 |
> |
if (do_rpiece) { |
1590 |
> |
sprintf(combuf, "%s -R %s %s%s %s %s%s%s -o %s %s", |
1591 |
> |
c_rpiece, sfile, rppopt, rep, vw, |
1592 |
> |
res, opts, po, rawfile, oct1name); |
1593 |
> |
while (next_process(1)) { |
1594 |
> |
sleep(10); |
1595 |
> |
combuf[strlen(c_rpiece)+2] = 'F'; |
1596 |
> |
} |
1597 |
> |
} else |
1598 |
> |
sprintf(combuf, "%s%s%s%s%s -ro %s %s", c_rpict, |
1599 |
> |
rep, opts, po, zopt, rawfile, oct1name); |
1600 |
> |
if (runcom(combuf)) /* run rpict/rpiece */ |
1601 |
|
goto rperror; |
1602 |
|
} else { |
1603 |
|
if (overture) { /* run overture calculation */ |
1604 |
|
sprintf(combuf, |
1605 |
< |
"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s", |
1606 |
< |
rep, vw, opts, |
1605 |
> |
"%s%s %s%s -x 64 -y 64 -ps 1 %s > %s", |
1606 |
> |
c_rpict, rep, vw, opts, |
1607 |
|
oct1name, overfile); |
1608 |
< |
if (runcom(combuf)) { |
1609 |
< |
fprintf(stderr, |
1608 |
> |
if (!do_rpiece || !next_process(0)) { |
1609 |
> |
if (runcom(combuf)) { |
1610 |
> |
fprintf(stderr, |
1611 |
|
"%s: error in overture for view %s\n", |
1612 |
< |
progname, vs); |
1613 |
< |
quit(1); |
1614 |
< |
} |
1612 |
> |
progname, vs); |
1613 |
> |
quit(1); |
1614 |
> |
} |
1615 |
|
#ifndef NULL_DEVICE |
1616 |
< |
rmfile(overfile); |
1616 |
> |
rmfile(overfile); |
1617 |
|
#endif |
1618 |
+ |
} else if (do_rpiece) |
1619 |
+ |
sleep(20); |
1620 |
|
} |
1621 |
< |
sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s", |
1622 |
< |
rep, vw, res, po, opts, |
1623 |
< |
zopt, oct1name, rawfile); |
1624 |
< |
if (pfile != NULL && inchild()) { |
1625 |
< |
/* rpict persistent mode */ |
1621 |
> |
if (do_rpiece) { |
1622 |
> |
sprintf(combuf, "%s -F %s %s%s %s %s%s%s -o %s %s", |
1623 |
> |
c_rpiece, sfile, rppopt, rep, vw, |
1624 |
> |
res, opts, po, rawfile, oct1name); |
1625 |
> |
while (next_process(1)) |
1626 |
> |
sleep(10); |
1627 |
> |
} else { |
1628 |
> |
sprintf(combuf, "%s%s %s %s%s%s%s %s > %s", |
1629 |
> |
c_rpict, rep, vw, res, opts, po, |
1630 |
> |
zopt, oct1name, rawfile); |
1631 |
> |
} |
1632 |
> |
if ((pfile != NULL) & !do_rpiece) { |
1633 |
|
if (!silent) |
1634 |
|
printf("\t%s\n", combuf); |
1635 |
|
fflush(stdout); |
1636 |
< |
sprintf(combuf, "rpict%s %s %s%s%s %s > %s", |
1637 |
< |
rep, rppopt, res, po, opts, |
1638 |
< |
oct1name, rawfile); |
1636 |
> |
sprintf(combuf, "%s%s %s %s%s%s %s > %s", |
1637 |
> |
c_rpict, rep, rppopt, res, |
1638 |
> |
opts, po, oct1name, rawfile); |
1639 |
|
fp = popen(combuf, "w"); |
1640 |
|
if (fp == NULL) |
1641 |
|
goto rperror; |
1642 |
|
myprintview(vw, fp); |
1643 |
|
if (pclose(fp)) |
1644 |
|
goto rperror; |
1645 |
< |
} else { /* rpict normal mode */ |
1646 |
< |
if (runcom(combuf)) |
1647 |
< |
goto rperror; |
1645 |
> |
} else if (runcom(combuf)) |
1646 |
> |
goto rperror; |
1647 |
> |
} |
1648 |
> |
if (do_rpiece) { /* need to finish raw, first */ |
1649 |
> |
finish_process(); |
1650 |
> |
wait_process(1); |
1651 |
> |
if (!syncf_done(sfile)) { |
1652 |
> |
fprintf(stderr, |
1653 |
> |
"%s: %s did not complete rendering of view %s\n", |
1654 |
> |
progname, c_rpiece, vs); |
1655 |
> |
quit(1); |
1656 |
|
} |
1657 |
|
} |
1658 |
|
if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) { |
1659 |
|
/* build pfilt command */ |
1660 |
< |
if (mult > 1) |
1661 |
< |
sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s", |
1662 |
< |
pfopts, mult, mult, rawfile, picfile); |
1660 |
> |
if (do_rpiece) |
1661 |
> |
sprintf(combuf, |
1662 |
> |
"%s%s -x %d -y %d -p %.3f %s > %s", |
1663 |
> |
c_pfilt, pfopts, xres, yres, aspect, |
1664 |
> |
rawfile, picfile); |
1665 |
> |
else if (mult > 1) |
1666 |
> |
sprintf(combuf, "%s%s -x /%d -y /%d %s > %s", |
1667 |
> |
c_pfilt, pfopts, mult, mult, |
1668 |
> |
rawfile, picfile); |
1669 |
|
else |
1670 |
< |
sprintf(combuf, "pfilt%s %s > %s", pfopts, |
1671 |
< |
rawfile, picfile); |
1670 |
> |
sprintf(combuf, "%s%s %s > %s", c_pfilt, |
1671 |
> |
pfopts, rawfile, picfile); |
1672 |
|
if (runcom(combuf)) { /* run pfilt */ |
1673 |
|
fprintf(stderr, |
1674 |
|
"%s: error filtering view %s\n\t%s removed\n", |
1679 |
|
} |
1680 |
|
/* remove/rename raw file */ |
1681 |
|
if (vdef(RAWFILE)) { |
1682 |
< |
sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs); |
1682 |
> |
sprintf(combuf, "%s_%s.hdr", vval(RAWFILE), vs); |
1683 |
|
mvfile(rawfile, combuf); |
1684 |
|
} else |
1685 |
|
rmfile(rawfile); |
1686 |
< |
finish_process(); /* exit if child */ |
1686 |
> |
if (do_rpiece) /* done with sync file */ |
1687 |
> |
rmfile(sfile); |
1688 |
> |
else |
1689 |
> |
finish_process(); /* exit if child */ |
1690 |
|
} |
1691 |
|
wait_process(1); /* wait for children to finish */ |
1692 |
< |
if (pfile != NULL) { /* clean up rpict persistent mode */ |
1692 |
> |
if (pfile != NULL) { /* clean up persistent rpict */ |
1693 |
|
RT_PID pid; |
1694 |
|
fp = fopen(pfile, "r"); |
1695 |
|
if (fp != NULL) { |
1703 |
|
rperror: |
1704 |
|
fprintf(stderr, "%s: error rendering view %s\n", progname, vs); |
1705 |
|
quit(1); |
1706 |
+ |
#undef do_rpiece |
1707 |
|
} |
1708 |
|
|
1709 |
|
|
1716 |
|
printf("\ttouch %s\n", fn); |
1717 |
|
if (!nprocs) |
1718 |
|
return(0); |
1391 |
– |
#ifdef notused |
1392 |
– |
if (access(fn, F_OK) == -1) /* create it */ |
1393 |
– |
if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1) |
1394 |
– |
return(-1); |
1395 |
– |
#endif |
1719 |
|
return(setfdate(fn, time((time_t *)NULL))); |
1720 |
|
} |
1721 |
|
|
1763 |
|
|
1764 |
|
#ifdef RHAS_FORK_EXEC |
1765 |
|
static int |
1766 |
< |
next_process(void) /* fork the next process (max. nprocs) */ |
1766 |
> |
next_process(int reserve) /* fork the next process */ |
1767 |
|
{ |
1768 |
|
RT_PID child_pid; |
1769 |
|
|
1774 |
|
progname); |
1775 |
|
quit(1); |
1776 |
|
} |
1777 |
+ |
if (reserve > 0 && children_running >= nprocs-reserve) |
1778 |
+ |
return(0); /* caller holding back process(es) */ |
1779 |
|
if (children_running >= nprocs) |
1780 |
|
wait_process(0); /* wait for someone to finish */ |
1781 |
|
fflush(NULL); /* flush output */ |
1782 |
|
child_pid = fork(); /* split process */ |
1783 |
|
if (child_pid == 0) { /* we're the child */ |
1784 |
|
children_running = -1; |
1785 |
+ |
nprocs = 1; |
1786 |
|
return(0); |
1787 |
|
} |
1788 |
|
if (child_pid > 0) { /* we're the parent */ |
1798 |
|
int all |
1799 |
|
) |
1800 |
|
{ |
1801 |
< |
int ourstatus = 0; |
1802 |
< |
RT_PID pid, status; |
1801 |
> |
int ourstatus = 0, status; |
1802 |
> |
RT_PID pid; |
1803 |
|
|
1804 |
|
if (all) |
1805 |
|
all = children_running; |
1824 |
|
} |
1825 |
|
#else /* ! RHAS_FORK_EXEC */ |
1826 |
|
static int |
1827 |
< |
next_process(void) |
1827 |
> |
next_process(int reserve) |
1828 |
|
{ |
1829 |
|
return(0); /* cannot start new process */ |
1830 |
|
} |
1836 |
|
} |
1837 |
|
int |
1838 |
|
kill(pid, sig) /* win|unix_process.c should also wait and kill */ |
1839 |
< |
RT_PID pid, sig; |
1839 |
> |
RT_PID pid; |
1840 |
> |
int sig; |
1841 |
|
{ |
1842 |
|
return 0; |
1843 |
|
} |
1850 |
|
return; /* in parent -- noop */ |
1851 |
|
exit(0); |
1852 |
|
} |
1526 |
– |
|
1527 |
– |
#ifdef _WIN32 |
1528 |
– |
setenv(vname, value) /* set an environment variable */ |
1529 |
– |
char *vname, *value; |
1530 |
– |
{ |
1531 |
– |
register char *evp; |
1532 |
– |
|
1533 |
– |
evp = bmalloc(strlen(vname)+strlen(value)+2); |
1534 |
– |
if (evp == NULL) |
1535 |
– |
syserr(progname); |
1536 |
– |
sprintf(evp, "%s=%s", vname, value); |
1537 |
– |
if (putenv(evp) != 0) { |
1538 |
– |
fprintf(stderr, "%s: out of environment space\n", progname); |
1539 |
– |
quit(1); |
1540 |
– |
} |
1541 |
– |
if (!silent) |
1542 |
– |
printf("set %s\n", evp); |
1543 |
– |
} |
1544 |
– |
#endif |
1853 |
|
|
1854 |
|
|
1855 |
|
static void |