ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/radiance/ray/src/util/rad.c

Comparing ray/src/util/rad.c (file contents):
Revision 2.54 by gregl, Fri Jan 23 15:15:59 1998 UTC vs.
Revision 2.118 by greg, Wed May 27 14:32:35 2015 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1995 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		* Executive program for oconv, rpict and pfilt
6		*/
7
8		#include "standard.h"
9	+
10	+	#include <ctype.h>
11	+	#include <time.h>
12	+
13	+	#include "platform.h"
14	+	#include "rtprocess.h"
15	+	#include "view.h"
16		#include "paths.h"
17		#include "vars.h"
14	–	#include <ctype.h>
15	–	#include <sys/types.h>
18
19	<	/* variables */
20	<	#define OBJECT          0               /* object files */
21	<	#define SCENE           1               /* scene files */
22	<	#define MATERIAL        2               /* material files */
23	<	#define ILLUM           3               /* mkillum input files */
24	<	#define MKILLUM         4               /* mkillum options */
25	<	#define RENDER          5               /* rendering options */
26	<	#define OCONV           6               /* oconv options */
27	<	#define PFILT           7               /* pfilt options */
28	<	#define VIEW            8               /* view(s) for picture(s) */
29	<	#define ZONE            9               /* simulation zone */
30	<	#define QUALITY         10              /* desired rendering quality */
19	>	#ifdef _WIN32
20	>	#define DELCMD "del"
21	>	#define RENAMECMD "rename"
22	>	#else
23	>	#define DELCMD "rm -f"
24	>	#define RENAMECMD "mv"
25	>	#include <sys/types.h>
26	>	#include <sys/wait.h>
27	>	#include <signal.h>
28	>	#endif
29	>
30	>	/* variables (alphabetical by name) */
31	>	#define AMBFILE         0               /* ambient file name */
32	>	#define DETAIL          1               /* level of scene detail */
33	>	#define EXPOSURE        2               /* picture exposure setting */
34	>	#define EYESEP          3               /* interocular distance */
35	>	#define ILLUM           4               /* mkillum input files */
36	>	#define INDIRECT        5               /* indirection in lighting */
37	>	#define MATERIAL        6               /* material files */
38	>	#define MKILLUM         7               /* mkillum options */
39	>	#define MKPMAP          8               /* mkpmap options */
40	>	#define OBJECT          9               /* object files */
41	>	#define OCONV           10              /* oconv options */
42		#define OCTREE          11              /* octree file name */
43	<	#define PICTURE         12              /* picture file root name */
44	<	#define AMBFILE         13              /* ambient file name */
45	<	#define OPTFILE         14              /* rendering options file */
46	<	#define EXPOSURE        15              /* picture exposure setting */
47	<	#define RESOLUTION      16              /* maximum picture resolution */
48	<	#define UP              17              /* view up (X, Y or Z) */
49	<	#define INDIRECT        18              /* indirection in lighting */
50	<	#define DETAIL          19              /* level of scene detail */
51	<	#define PENUMBRAS       20              /* shadow penumbras are desired */
52	<	#define VARIABILITY     21              /* level of light variability */
53	<	#define REPORT          22              /* report frequency and errfile */
54	<	#define RAWFILE         23              /* raw picture file root name */
55	<	#define ZFILE           24              /* distance file root name */
43	>	#define OPTFILE         12              /* rendering options file */
44	>	#define PCMAP           13              /* caustic photon map */
45	>	#define PENUMBRAS       14              /* shadow penumbras are desired */
46	>	#define PFILT           15              /* pfilt options */
47	>	#define PGMAP           16              /* global photon map */
48	>	#define PICTURE         17              /* picture file root name */
49	>	#define QUALITY         18              /* desired rendering quality */
50	>	#define RAWFILE         19              /* raw picture file root name */
51	>	#define RENDER          20              /* rendering options */
52	>	#define REPORT          21              /* report frequency and errfile */
53	>	#define RESOLUTION      22              /* maximum picture resolution */
54	>	#define RPICT           23              /* rpict parameters */
55	>	#define RVU             24              /* rvu parameters */
56	>	#define SCENE           25              /* scene files */
57	>	#define UP              26              /* view up (X, Y or Z) */
58	>	#define VARIABILITY     27              /* level of light variability */
59	>	#define VIEWS           28              /* view(s) for picture(s) */
60	>	#define ZFILE           29              /* distance file root name */
61	>	#define ZONE            30              /* simulation zone */
62		/* total number of variables */
63	<	int NVARS = 25;
63	>	int NVARS = 31;
64
65		VARIABLE        vv[] = {                /* variable-value pairs */
66	<	{"objects",     3,      0,      NULL,   catvalues},
67	<	{"scene",       3,      0,      NULL,   catvalues},
68	<	{"materials",   3,      0,      NULL,   catvalues},
66	>	{"AMBFILE",     3,      0,      NULL,   onevalue},
67	>	{"DETAIL",      3,      0,      NULL,   qualvalue},
68	>	{"EXPOSURE",    3,      0,      NULL,   fltvalue},
69	>	{"EYESEP",      3,      0,      NULL,   fltvalue},
70		{"illum",       3,      0,      NULL,   catvalues},
71	+	{"INDIRECT",    3,      0,      NULL,   intvalue},
72	+	{"materials",   3,      0,      NULL,   catvalues},
73		{"mkillum",     3,      0,      NULL,   catvalues},
74	<	{"render",      3,      0,      NULL,   catvalues},
74	>	{"mkpmap",      3,      0,      NULL,   catvalues},
75	>	{"objects",     3,      0,      NULL,   catvalues},
76		{"oconv",       3,      0,      NULL,   catvalues},
54	–	{"pfilt",       2,      0,      NULL,   catvalues},
55	–	{"view",        2,      0,      NULL,   NULL},
56	–	{"ZONE",        2,      0,      NULL,   onevalue},
57	–	{"QUALITY",     3,      0,      NULL,   qualvalue},
77		{"OCTREE",      3,      0,      NULL,   onevalue},
59	–	{"PICTURE",     3,      0,      NULL,   onevalue},
60	–	{"AMBFILE",     3,      0,      NULL,   onevalue},
78		{"OPTFILE",     3,      0,      NULL,   onevalue},
79	<	{"EXPOSURE",    3,      0,      NULL,   fltvalue},
79	>	{"PCMAP",       2,      0,      NULL,   onevalue},
80	>	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
81	>	{"pfilt",       2,      0,      NULL,   catvalues},
82	>	{"PGMAP",       2,      0,      NULL,   onevalue},
83	>	{"PICTURE",     3,      0,      NULL,   onevalue},
84	>	{"QUALITY",     3,      0,      NULL,   qualvalue},
85	>	{"RAWFILE",     3,      0,      NULL,   onevalue},
86	>	{"render",      3,      0,      NULL,   catvalues},
87	>	{"REPORT",      3,      0,      NULL,   onevalue},
88		{"RESOLUTION",  3,      0,      NULL,   onevalue},
89	+	{"rpict",       3,      0,      NULL,   catvalues},
90	+	{"rvu",         3,      0,      NULL,   catvalues},
91	+	{"scene",       3,      0,      NULL,   catvalues},
92		{"UP",          2,      0,      NULL,   onevalue},
65	–	{"INDIRECT",    3,      0,      NULL,   intvalue},
66	–	{"DETAIL",      3,      0,      NULL,   qualvalue},
67	–	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
93		{"VARIABILITY", 3,      0,      NULL,   qualvalue},
94	<	{"REPORT",      3,      0,      NULL,   onevalue},
70	<	{"RAWFILE",     3,      0,      NULL,   onevalue},
94	>	{"view",        2,      0,      NULL,   NULL},
95		{"ZFILE",       2,      0,      NULL,   onevalue},
96	+	{"ZONE",        2,      0,      NULL,   onevalue},
97		};
98
99		/* overture calculation file */
100	<	#ifdef NIX
101	<	char    overfile[] = "overture.unf";
100	>	#ifdef NULL_DEVICE
101	>	char    overfile[] = NULL_DEVICE;
102		#else
103	<	char    overfile[] = "/dev/null";
103	>	char    overfile[] = "overture.unf";
104		#endif
105
81	–	extern time_t   fdate(), time();
106
107		time_t  scenedate;              /* date of latest scene or object file */
108		time_t  octreedate;             /* date of octree */
#	Line 90 | Line 114 | time_t oct0date;               /* date of pre-mkillum octree */
114		char    *oct1name;              /* name of post-mkillum octree */
115		time_t  oct1date;               /* date of post-mkillum octree (>= matdate) */
116
117	+	char    *pgmapname;             /* name of global photon map */
118	+	time_t  pgmapdate;              /* date of global photon map (>= oct1date) */
119	+	char    *pcmapname;             /* name of caustic photon map */
120	+	time_t  pcmapdate;              /* date of caustic photon map (>= oct1date) */
121	+
122		int     nowarn = 0;             /* no warnings */
123		int     explicate = 0;          /* explicate variables */
124		int     silent = 0;             /* do work silently */
125		int     touchonly = 0;          /* touch files only */
126	<	int     noaction = 0;           /* don't do anything */
126	>	int     nprocs = 1;             /* maximum executing processes */
127		int     sayview = 0;            /* print view out */
128	<	char    *rvdevice = NULL;       /* rview output device */
128	>	char    *rvdevice = NULL;       /* rvu output device */
129		char    *viewselect = NULL;     /* specific view only */
130
131	+	#define DEF_RPICT_PATH  "rpict"         /* default rpict path */
132	+
133	+	/* command paths */
134	+	char    c_oconv[256] = "oconv";
135	+	char    c_mkillum[256] = "mkillum";
136	+	char    c_mkpmap[256] = "mkpmap";
137	+	char    c_rvu[256] = "rvu";
138	+	char    c_rpict[256] = DEF_RPICT_PATH;
139	+	char    c_rpiece[] = "rpiece";
140	+	char    c_pfilt[256] = "pfilt";
141	+
142		int     overture = 0;           /* overture calculation needed */
143
144	+	int     children_running = 0;   /* set negative in children */
145	+
146		char    *progname;              /* global argv[0] */
147		char    *rifname;               /* global rad input file name */
148
149	<	char    radname[MAXPATH];       /* root Radiance file name */
149	>	char    radname[PATH_MAX];      /* root Radiance file name */
150
151	+	#define inchild()       (children_running < 0)
152
153	<	main(argc, argv)
154	<	int     argc;
155	<	char    *argv[];
153	>	static void rootname(char       *rn, char       *fn);
154	>	static time_t checklast(char    *fnames);
155	>	static char * newfname(char     *orig, int      pred);
156	>	static void checkfiles(void);
157	>	static void getoctcube(double   org[3], double  *sizp);
158	>	static void setdefaults(void);
159	>	static void oconv(void);
160	>	static void mkpmap(void);
161	>	static char * addarg(char       *op, char       *arg);
162	>	static void oconvopts(char      *oo);
163	>	static void mkillumopts(char    *mo);
164	>	static void mkpmapopts(char     *mo);
165	>	static void checkambfile(void);
166	>	static double ambval(void);
167	>	static void renderopts(char     *op, char       *po);
168	>	static void lowqopts(char       *op, char       *po);
169	>	static void medqopts(char       *op, char       *po);
170	>	static void hiqopts(char        *op, char       *po);
171	>	static void xferopts(char       *ro);
172	>	static void pfiltopts(char      *po);
173	>	static int matchword(char       *s1, char       *s2);
174	>	static char * specview(char     *vs);
175	>	static char * getview(int       n, char *vn);
176	>	static int myprintview(char     *vopts, FILE    *fp);
177	>	static void rvu(char    *opts, char     *po);
178	>	static void rpict(char  *opts, char     *po);
179	>	static int touch(char   *fn);
180	>	static int runcom(char  *cs);
181	>	static int rmfile(char  *fn);
182	>	static int mvfile(char  *fold, char     *fnew);
183	>	static int next_process(int     reserve);
184	>	static void wait_process(int    all);
185	>	static void finish_process(void);
186	>	static void badvalue(int        vc);
187	>	static void syserr(char *s);
188	>
189	>
190	>	int
191	>	main(
192	>	int     argc,
193	>	char    *argv[]
194	>	)
195		{
196		char    ropts[512];
197		char    popts[64];
#	Line 123 | Line 205 | char   *argv[];
205		silent++;
206		break;
207		case 'n':
208	<	noaction++;
208	>	nprocs = 0;
209		break;
210	+	case 'N':
211	+	nprocs = atoi(argv[++i]);
212	+	if (nprocs < 0)
213	+	nprocs = 0;
214	+	break;
215		case 't':
216		touchonly++;
217		break;
#	Line 171 | Line 258 | char   *argv[];
258		printvars(stdout);
259		/* build octree (and run mkillum) */
260		oconv();
261	+	/* run mkpmap if indicated */
262	+	mkpmap();
263		/* check date on ambient file */
264		checkambfile();
265		/* run simulation */
266		renderopts(ropts, popts);
267		xferopts(ropts);
268		if (rvdevice != NULL)
269	<	rview(ropts, popts);
269	>	rvu(ropts, popts);
270		else
271		rpict(ropts, popts);
272		quit(0);
273		userr:
274		fprintf(stderr,
275	<	"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
275	>	"Usage: %s [-w][-s][-n|-N npr][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
276		progname);
277		quit(1);
278	+	return 1; /* pro forma return */
279		}
280
281
282	<	rootname(rn, fn)                /* remove tail from end of fn */
283	<	register char   *rn, *fn;
282	>	static void
283	>	rootname(               /* remove tail from end of fn */
284	>	char    *rn,
285	>	char    *fn
286	>	)
287		{
288		char    *tp, *dp;
289
290	<	for (tp = NULL, dp = rn; *rn = *fn++; rn++)
290	>	for (tp = NULL, dp = rn; (*rn = *fn++); rn++)
291		if (ISDIRSEP(*rn))
292		dp = rn;
293		else if (*rn == '.')
#	Line 204 | Line 297 | register char  *rn, *fn;
297		}
298
299
300	<	time_t
301	<	checklast(fnames)                       /* check files and find most recent */
302	<	register char   *fnames;
300	>	static time_t
301	>	checklast(                      /* check files and find most recent */
302	>	char    *fnames
303	>	)
304		{
305	<	char    thisfile[MAXPATH];
305	>	char    thisfile[PATH_MAX];
306		time_t  thisdate, lastdate = 0;
213	–	register char   *cp;
307
308		if (fnames == NULL)
309		return(0);
310	<	while (*fnames) {
311	<	while (isspace(*fnames)) fnames++;
312	<	cp = thisfile;
313	<	while (*fnames && !isspace(*fnames))
314	<	*cp++ = *fnames++;
315	<	*cp = '\0';
310	>	while ((fnames = nextword(thisfile, PATH_MAX, fnames)) != NULL) {
311	>	if (thisfile[0] == '!' ||
312	>	(thisfile[0] == '\\' && thisfile[1] == '!')) {
313	>	if (!lastdate)
314	>	lastdate = 1;
315	>	continue;
316	>	}
317		if (!(thisdate = fdate(thisfile)))
318		syserr(thisfile);
319		if (thisdate > lastdate)
#	Line 229 | Line 323 | register char  *fnames;
323		}
324
325
326	<	char *
327	<	newfname(orig, pred)            /* create modified file name */
328	<	char    *orig;
329	<	int     pred;
326	>	static char *
327	>	newfname(               /* create modified file name */
328	>	char    *orig,
329	>	int     pred
330	>	)
331		{
332	<	extern char     *rindex();
333	<	register char   *cp;
239	<	register int    n;
332	>	char    *cp;
333	>	int     n;
334		int     suffix;
335
336		n = 0; cp = orig; suffix = -1;          /* suffix position, length */
#	Line 255 | Line 349 | int    pred;
349		}
350
351
352	<	checkfiles()                    /* check for existence and modified times */
352	>	static void
353	>	checkfiles(void)                        /* check for existence and modified times */
354		{
355	+	char    fntemp[256];
356		time_t  objdate;
357
358		if (!vdef(OCTREE)) {
#	Line 264 | Line 360 | checkfiles()                   /* check for existence and modified tim
360		syserr(progname);
361		sprintf(vval(OCTREE), "%s.oct", radname);
362		vdef(OCTREE)++;
363	+	} else if (vval(OCTREE)[0] == '!') {
364	+	fprintf(stderr, "%s: illegal '%s' specification\n",
365	+	progname, vnam(OCTREE));
366	+	quit(1);
367		}
368		octreedate = fdate(vval(OCTREE));
369		if (vdef(ILLUM)) {              /* illum requires secondary octrees */
#	Line 282 | Line 382 | checkfiles()                   /* check for existence and modified tim
382		vnam(OCTREE), vnam(SCENE), vnam(ILLUM));
383		quit(1);
384		}
385	+	if (vdef(PGMAP)) {
386	+	if (!*sskip2(vval(PGMAP),1)) {
387	+	fprintf(stderr, "%s: '%s' missing # photons argument\n",
388	+	progname, vnam(PGMAP));
389	+	quit(1);
390	+	}
391	+	atos(fntemp, sizeof(fntemp), vval(PGMAP));
392	+	pgmapname = savqstr(fntemp);
393	+	pgmapdate = fdate(pgmapname);
394	+	}
395	+	if (vdef(PCMAP)) {
396	+	if (!*sskip2(vval(PCMAP),1)) {
397	+	fprintf(stderr, "%s: '%s' missing # photons argument\n",
398	+	progname, vnam(PCMAP));
399	+	quit(1);
400	+	}
401	+	atos(fntemp, sizeof(fntemp), vval(PCMAP));
402	+	pcmapname = savqstr(fntemp);
403	+	pcmapdate = fdate(pcmapname);
404	+	}
405		matdate = checklast(vval(MATERIAL));
406		}
407
408
409	<	getoctcube(org, sizp)           /* get octree bounding cube */
410	<	double  org[3], *sizp;
409	>	static void
410	>	getoctcube(             /* get octree bounding cube */
411	>	double  org[3],
412	>	double  *sizp
413	>	)
414		{
292	–	extern FILE     *popen();
415		static double   oorg[3], osiz = 0.;
416		double  min[3], max[3];
417		char    buf[1024];
418		FILE    *fp;
419	<	register int    i;
419	>	int     i;
420
421	<	if (osiz <= FTINY)
422	<	if (noaction && fdate(oct1name) <
421	>	if (osiz <= FTINY) {
422	>	if (!nprocs && fdate(oct1name) <
423		(scenedate>illumdate?scenedate:illumdate)) {
424		/* run getbbox */
425		sprintf(buf, "getbbox -w -h %s",
#	Line 332 | Line 454 | double org[3], *sizp;
454		}
455		pclose(fp);
456		}
457	+	}
458		org[0] = oorg[0]; org[1] = oorg[1]; org[2] = oorg[2]; *sizp = osiz;
459		}
460
461
462	<	setdefaults()                   /* set default values for unassigned var's */
462	>	static void
463	>	setdefaults(void)                       /* set default values for unassigned var's */
464		{
465	<	double  org[3], size;
465	>	double  org[3], lim[3], size;
466		char    buf[128];
467
468		if (!vdef(ZONE)) {
#	Line 348 | Line 472 | setdefaults()                  /* set default values for unassigned v
472		vval(ZONE) = savqstr(buf);
473		vdef(ZONE)++;
474		}
475	+	if (!vdef(EYESEP)) {
476	+	if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf",
477	+	&org[0], &lim[0], &org[1], &lim[1],
478	+	&org[2], &lim[2]) != 6)
479	+	badvalue(ZONE);
480	+	sprintf(buf, "%f",
481	+	0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2]));
482	+	vval(EYESEP) = savqstr(buf);
483	+	vdef(EYESEP)++;
484	+	}
485		if (!vdef(INDIRECT)) {
486		vval(INDIRECT) = "0";
487		vdef(INDIRECT)++;
#	Line 364 | Line 498 | setdefaults()                  /* set default values for unassigned v
498		vval(PICTURE) = radname;
499		vdef(PICTURE)++;
500		}
501	<	if (!vdef(VIEW)) {
502	<	vval(VIEW) = "X";
503	<	vdef(VIEW)++;
501	>	if (!vdef(VIEWS)) {
502	>	vval(VIEWS) = "X";
503	>	vdef(VIEWS)++;
504		}
505		if (!vdef(DETAIL)) {
506		vval(DETAIL) = "M";
#	Line 383 | Line 517 | setdefaults()                  /* set default values for unassigned v
517		}
518
519
520	<	oconv()                         /* run oconv and mkillum if necessary */
520	>	static void
521	>	oconv(void)                             /* run oconv and mkillum if necessary */
522		{
523		static char     illumtmp[] = "ilXXXXXX";
524	<	char    combuf[1024], ocopts[64], mkopts[64];
524	>	char    combuf[PATH_MAX], ocopts[64], mkopts[1024];
525
526		oconvopts(ocopts);              /* get options */
527		if (octreedate < scenedate) {   /* check date on original octree */
#	Line 394 | Line 529 | oconv()                                /* run oconv and mkillum if necessary */
529		touch(vval(OCTREE));
530		else {                          /* build command */
531		if (vdef(MATERIAL))
532	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
533	<	vval(MATERIAL), vval(SCENE),
534	<	vval(OCTREE));
532	>	sprintf(combuf, "%s%s %s %s > %s", c_oconv,
533	>	ocopts, vval(MATERIAL),
534	>	vval(SCENE), vval(OCTREE));
535		else
536	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
536	>	sprintf(combuf, "%s%s %s > %s", c_oconv, ocopts,
537		vval(SCENE), vval(OCTREE));
538
539		if (runcom(combuf)) {           /* run it */
#	Line 415 | Line 550 | oconv()                                /* run oconv and mkillum if necessary */
550		}
551		if (oct1name == vval(OCTREE))           /* no mkillum? */
552		oct1date = octreedate > matdate ? octreedate : matdate;
553	<	if (oct1date >= octreedate & oct1date >= matdate
554	<	& oct1date >= illumdate)        /* all done */
553	>	if ((oct1date >= octreedate) & (oct1date >= matdate)
554	>	& (oct1date >= illumdate))      /* all done */
555		return;
556		/* make octree0 */
557	<	if (oct0date < scenedate | oct0date < illumdate) {
557	>	if ((oct0date < scenedate) | (oct0date < illumdate)) {
558		if (touchonly && oct0date)
559		touch(oct0name);
560		else {                          /* build command */
561		if (octreedate)
562	<	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
563	<	vval(OCTREE), vval(ILLUM), oct0name);
562	>	sprintf(combuf, "%s%s -i %s %s > %s", c_oconv,
563	>	ocopts, vval(OCTREE),
564	>	vval(ILLUM), oct0name);
565		else if (vdef(MATERIAL))
566	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
567	<	vval(MATERIAL), vval(ILLUM), oct0name);
432	<	else
433	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
566	>	sprintf(combuf, "%s%s %s %s > %s", c_oconv,
567	>	ocopts, vval(MATERIAL),
568		vval(ILLUM), oct0name);
569	+	else
570	+	sprintf(combuf, "%s%s %s > %s", c_oconv,
571	+	ocopts, vval(ILLUM), oct0name);
572		if (runcom(combuf)) {           /* run it */
573		fprintf(stderr,
574		"%s: error generating octree\n\t%s removed\n",
#	Line 451 | Line 588 | oconv()                                /* run oconv and mkillum if necessary */
588		else {
589		mkillumopts(mkopts);            /* build mkillum command */
590		mktemp(illumtmp);
591	<	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
591	>	sprintf(combuf, "%s%s %s \"<\" %s > %s", c_mkillum, mkopts,
592		oct0name, vval(ILLUM), illumtmp);
593		if (runcom(combuf)) {                   /* run it */
594	<	fprintf(stderr, "%s: error running mkillum\n",
595	<	progname);
594	>	fprintf(stderr, "%s: error running %s\n",
595	>	progname, c_mkillum);
596		unlink(illumtmp);
597		quit(1);
598		}
599	+	rmfile(oct0name);
600		/* make octree1 (frozen) */
601		if (octreedate)
602	<	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
603	<	vval(OCTREE), illumtmp, oct1name);
602	>	sprintf(combuf, "%s%s -f -i %s %s > %s", c_oconv,
603	>	ocopts, vval(OCTREE), illumtmp, oct1name);
604		else if (vdef(MATERIAL))
605	<	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
606	<	vval(MATERIAL), illumtmp, oct1name);
605	>	sprintf(combuf, "%s%s -f %s %s > %s", c_oconv,
606	>	ocopts, vval(MATERIAL), illumtmp, oct1name);
607		else
608	<	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
608	>	sprintf(combuf, "%s%s -f %s > %s", c_oconv, ocopts,
609		illumtmp, oct1name);
610		if (runcom(combuf)) {           /* run it */
611		fprintf(stderr,
#	Line 485 | Line 623 | oconv()                                /* run oconv and mkillum if necessary */
623		}
624
625
626	<	char *
627	<	addarg(op, arg)                         /* add argument and advance pointer */
490	<	register char   *op, *arg;
626	>	static void
627	>	mkpmap(void)                    /* run mkpmap if indicated */
628		{
629	+	char    combuf[2048], *cp;
630	+	time_t  tnow;
631	+	/* nothing to do? */
632	+	if ((pgmapname == NULL) | (pgmapdate >= oct1date) &&
633	+	(pcmapname == NULL) | (pcmapdate >= oct1date))
634	+	return;
635	+	/* just update existing file dates? */
636	+	if (touchonly && (pgmapname == NULL) | (pgmapdate > 0) &&
637	+	(pcmapname == NULL) | (pcmapdate > 0)) {
638	+	if (pgmapname != NULL)
639	+	touch(pgmapname);
640	+	if (pcmapname != NULL)
641	+	touch(pcmapname);
642	+	} else {                /* else need to (re)run pkpmap */
643	+	strcpy(combuf, c_mkpmap);
644	+	for (cp = combuf; *cp; cp++)
645	+	;
646	+	mkpmapopts(cp);
647	+	/* force file overwrite */
648	+	cp = addarg(cp, "-fo+");
649	+	if (vdef(REPORT)) {
650	+	char    errfile[256];
651	+	int     n;
652	+	double  minutes;
653	+	n = sscanf(vval(REPORT), "%lf %s", &minutes, errfile);
654	+	if (n == 2)
655	+	sprintf(cp, " -t %d -e %s", (int)(minutes*60), errfile);
656	+	else if (n == 1)
657	+	sprintf(cp, " -t %d", (int)(minutes*60));
658	+	else
659	+	badvalue(REPORT);
660	+	}
661	+	if (pgmapname != NULL && pgmapdate < oct1date) {
662	+	cp = addarg(cp, "-apg");
663	+	addarg(cp, vval(PGMAP));
664	+	cp = sskip(sskip(cp));  /* remove any bandwidth */
665	+	*cp = '\0';
666	+	}
667	+	if (pcmapname != NULL && pcmapdate < oct1date) {
668	+	cp = addarg(cp, "-apc");
669	+	addarg(cp, vval(PCMAP));
670	+	cp = sskip(sskip(cp));  /* remove any bandwidth */
671	+	*cp = '\0';
672	+	}
673	+	cp = addarg(cp, oct1name);
674	+	if (runcom(combuf)) {
675	+	fprintf(stderr, "%s: error running %s\n",
676	+	progname, c_mkpmap);
677	+	if (pgmapname != NULL && pgmapdate < oct1date)
678	+	unlink(pgmapname);
679	+	if (pcmapname != NULL && pcmapdate < oct1date)
680	+	unlink(pcmapname);
681	+	quit(1);
682	+	}
683	+	}
684	+	tnow = time((time_t *)NULL);
685	+	if (pgmapname != NULL)
686	+	pgmapdate = tnow;
687	+	if (pcmapname != NULL)
688	+	pcmapdate = tnow;
689	+	oct1date = tnow;        /* trigger ambient file removal if needed */
690	+	}
691	+
692	+
693	+	static char *
694	+	addarg(                         /* append argument and advance pointer */
695	+	char    *op,
696	+	char    *arg
697	+	)
698	+	{
699	+	while (*op)
700	+	op++;
701		*op = ' ';
702	<	while (*++op = *arg++)
702	>	while ( (*++op = *arg++) )
703		;
704		return(op);
705		}
706
707
708	<	oconvopts(oo)                           /* get oconv options */
709	<	register char   *oo;
708	>	static void
709	>	oconvopts(                              /* get oconv options */
710	>	char    *oo
711	>	)
712		{
713		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
714
715		*oo = '\0';
716	<	if (vdef(OCONV))
717	<	addarg(oo, vval(OCONV));
716	>	if (!vdef(OCONV))
717	>	return;
718	>	if (vval(OCONV)[0] != '-') {
719	>	atos(c_oconv, sizeof(c_oconv), vval(OCONV));
720	>	oo = addarg(oo, sskip2(vval(OCONV), 1));
721	>	} else
722	>	oo = addarg(oo, vval(OCONV));
723		}
724
725
726	<	mkillumopts(mo)                         /* get mkillum options */
727	<	register char   *mo;
726	>	static void
727	>	mkillumopts(                            /* get mkillum options */
728	>	char    *mo
729	>	)
730		{
731		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
732
733	+	if (nprocs > 1)
734	+	sprintf(mo, " -n %d", nprocs);
735	+	else
736	+	*mo = '\0';
737	+	if (!vdef(MKILLUM))
738	+	return;
739	+	if (vval(MKILLUM)[0] != '-') {
740	+	atos(c_mkillum, sizeof(c_mkillum), vval(MKILLUM));
741	+	mo = addarg(mo, sskip2(vval(MKILLUM), 1));
742	+	} else
743	+	mo = addarg(mo, vval(MKILLUM));
744	+	}
745	+
746	+
747	+	static void
748	+	mkpmapopts(                             /* get mkpmap options */
749	+	char    *mo
750	+	)
751	+	{
752	+	/* BEWARE:  This may be called via setdefaults(), so no assumptions */
753	+
754		*mo = '\0';
755	<	if (vdef(MKILLUM))
756	<	addarg(mo, vval(MKILLUM));
755	>	if (!vdef(MKPMAP))
756	>	return;
757	>	if (vval(MKPMAP)[0] != '-') {
758	>	atos(c_mkpmap, sizeof(c_mkpmap), vval(MKPMAP));
759	>	mo = addarg(mo, sskip2(vval(MKPMAP), 1));
760	>	} else
761	>	mo = addarg(mo, vval(MKPMAP));
762		}
763
764
765	<	checkambfile()                  /* check date on ambient file */
765	>	static void
766	>	checkambfile(void)                      /* check date on ambient file */
767		{
768		time_t  afdate;
769
#	Line 526 | Line 771 | checkambfile()                 /* check date on ambient file */
771		return;
772		if (!(afdate = fdate(vval(AMBFILE))))
773		return;
774	<	if (oct1date > afdate)
774	>	if (oct1date > afdate) {
775		if (touchonly)
776		touch(vval(AMBFILE));
777		else
778		rmfile(vval(AMBFILE));
779	+	}
780		}
781
782
783	<	double
784	<	ambval()                                /* compute ambient value */
783	>	static double
784	>	ambval(void)                            /* compute ambient value */
785		{
786		if (vdef(EXPOSURE)) {
787		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
#	Line 547 | Line 793 | ambval()                               /* compute ambient value */
793		if (vlet(ZONE) == 'I')
794		return(.01);
795		badvalue(ZONE);
796	+	return 0; /* pro forma return */
797		}
798
799
800	<	renderopts(op, po)                      /* set rendering options */
801	<	char    *op, *po;
800	>	static void
801	>	renderopts(                     /* set rendering options */
802	>	char    *op,
803	>	char    *po
804	>	)
805		{
806	+	char    pmapf[256], *bw;
807	+
808		switch(vscale(QUALITY)) {
809		case LOW:
810		lowqopts(op, po);
#	Line 564 | Line 816 | char   *op, *po;
816		hiqopts(op, po);
817		break;
818		}
819	+	if (vdef(PGMAP)) {
820	+	bw = sskip2(vval(PGMAP), 2);
821	+	atos(pmapf, sizeof(pmapf), vval(PGMAP));
822	+	op = addarg(addarg(op, "-ap"), pmapf);
823	+	if (atoi(bw) > 0) op = addarg(op, bw);
824	+	}
825	+	if (vdef(PCMAP)) {
826	+	bw = sskip2(vval(PCMAP), 2);
827	+	atos(pmapf, sizeof(pmapf), vval(PCMAP));
828	+	op = addarg(addarg(op, "-ap"), pmapf);
829	+	if (atoi(bw) > 0) op = addarg(op, bw);
830	+	}
831	+	if (vdef(RENDER))
832	+	op = addarg(op, vval(RENDER));
833	+	if (rvdevice != NULL) {
834	+	if (vdef(RVU))
835	+	if (vval(RVU)[0] != '-') {
836	+	atos(c_rvu, sizeof(c_rvu), vval(RVU));
837	+	po = addarg(po, sskip2(vval(RVU), 1));
838	+	} else
839	+	po = addarg(po, vval(RVU));
840	+	} else {
841	+	if (vdef(RPICT))
842	+	if (vval(RPICT)[0] != '-') {
843	+	atos(c_rpict, sizeof(c_rpict), vval(RPICT));
844	+	po = addarg(po, sskip2(vval(RPICT), 1));
845	+	} else
846	+	po = addarg(po, vval(RPICT));
847	+	}
848		}
849
850
851	<	lowqopts(op, po)                        /* low quality rendering options */
852	<	register char   *op;
853	<	char    *po;
851	>	static void
852	>	lowqopts(                       /* low quality rendering options */
853	>	char    *op,
854	>	char    *po
855	>	)
856		{
857		double  d, org[3], siz[3];
858
#	Line 579 | Line 862 | char   *po;
862		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
863		badvalue(ZONE);
864		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
865	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
865	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
866		badvalue(ZONE);
867		getoctcube(org, &d);
868		d *= 3./(siz[0]+siz[1]+siz[2]);
#	Line 587 | Line 870 | char   *po;
870		case LOW:
871		po = addarg(po, "-ps 16");
872		op = addarg(op, "-dp 64");
873	<	sprintf(op, " -ar %d", (int)(4*d));
873	>	sprintf(op, " -ar %d", (int)(8*d));
874		op += strlen(op);
875		break;
876		case MEDIUM:
877		po = addarg(po, "-ps 8");
878		op = addarg(op, "-dp 128");
879	<	sprintf(op, " -ar %d", (int)(8*d));
879	>	sprintf(op, " -ar %d", (int)(16*d));
880		op += strlen(op);
881		break;
882		case HIGH:
883		po = addarg(po, "-ps 4");
884		op = addarg(op, "-dp 256");
885	<	sprintf(op, " -ar %d", (int)(16*d));
885	>	sprintf(op, " -ar %d", (int)(32*d));
886		op += strlen(op);
887		break;
888		}
#	Line 608 | Line 891 | char   *po;
891		op = addarg(op, "-ds .4");
892		else
893		op = addarg(op, "-ds 0");
894	<	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5");
894	>	op = addarg(op, "-dt .2 -dc .25 -dr 0 -ss 0 -st .5");
895		if (vdef(AMBFILE)) {
896		sprintf(op, " -af %s", vval(AMBFILE));
897		op += strlen(op);
#	Line 616 | Line 899 | char   *po;
899		overture = 0;
900		switch (vscale(VARIABILITY)) {
901		case LOW:
902	<	op = addarg(op, "-aa .4 -ad 64");
902	>	op = addarg(op, "-aa .3 -ad 256");
903		break;
904		case MEDIUM:
905	<	op = addarg(op, "-aa .3 -ad 128");
905	>	op = addarg(op, "-aa .25 -ad 512");
906		break;
907		case HIGH:
908	<	op = addarg(op, "-aa .25 -ad 256");
908	>	op = addarg(op, "-aa .2 -ad 1024");
909		break;
910		}
911		op = addarg(op, "-as 0");
912		d = ambval();
913		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
914		op += strlen(op);
915	<	op = addarg(op, "-lr 3 -lw .02");
633	<	if (vdef(RENDER))
634	<	op = addarg(op, vval(RENDER));
915	>	op = addarg(op, "-lr 6 -lw .003");
916		}
917
918
919	<	medqopts(op, po)                        /* medium quality rendering options */
920	<	register char   *op;
921	<	char    *po;
919	>	static void
920	>	medqopts(                       /* medium quality rendering options */
921	>	char    *op,
922	>	char    *po
923	>	)
924		{
925		double  d, org[3], siz[3], asz;
926
#	Line 647 | Line 930 | char   *po;
930		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
931		badvalue(ZONE);
932		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
933	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
933	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
934		badvalue(ZONE);
935		getoctcube(org, &d);
936		asz = (siz[0]+siz[1]+siz[2])/3.;
#	Line 656 | Line 939 | char   *po;
939		case LOW:
940		po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
941		op = addarg(op, "-dp 256");
942	<	sprintf(op, " -ar %d", (int)(8*d));
942	>	sprintf(op, " -ar %d", (int)(16*d));
943		op += strlen(op);
944		sprintf(op, " -ms %.2g", asz/20.);
945		op += strlen(op);
#	Line 664 | Line 947 | char   *po;
947		case MEDIUM:
948		po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
949		op = addarg(op, "-dp 512");
950	<	sprintf(op, " -ar %d", (int)(16*d));
950	>	sprintf(op, " -ar %d", (int)(32*d));
951		op += strlen(op);
952		sprintf(op, " -ms %.2g", asz/40.);
953		op += strlen(op);
#	Line 672 | Line 955 | char   *po;
955		case HIGH:
956		po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
957		op = addarg(op, "-dp 1024");
958	<	sprintf(op, " -ar %d", (int)(32*d));
958	>	sprintf(op, " -ar %d", (int)(64*d));
959		op += strlen(op);
960		sprintf(op, " -ms %.2g", asz/80.);
961		op += strlen(op);
#	Line 680 | Line 963 | char   *po;
963		}
964		po = addarg(po, "-pt .08");
965		if (vbool(PENUMBRAS))
966	<	op = addarg(op, "-ds .2 -dj .5");
966	>	op = addarg(op, "-ds .2 -dj .9");
967		else
968		op = addarg(op, "-ds .3");
969	<	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
970	<	if (overture = vint(INDIRECT)) {
969	>	op = addarg(op, "-dt .1 -dc .5 -dr 1 -ss 1 -st .1");
970	>	if ( (overture = vint(INDIRECT)) ) {
971		sprintf(op, " -ab %d", overture);
972		op += strlen(op);
973		}
#	Line 695 | Line 978 | char   *po;
978		overture = 0;
979		switch (vscale(VARIABILITY)) {
980		case LOW:
981	<	op = addarg(op, "-aa .25 -ad 196 -as 0");
981	>	op = addarg(op, "-aa .2 -ad 329 -as 42");
982		break;
983		case MEDIUM:
984	<	op = addarg(op, "-aa .2 -ad 400 -as 64");
984	>	op = addarg(op, "-aa .15 -ad 800 -as 128");
985		break;
986		case HIGH:
987	<	op = addarg(op, "-aa .15 -ad 768 -as 196");
987	>	op = addarg(op, "-aa .1 -ad 1536 -as 392");
988		break;
989		}
990		d = ambval();
991		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
992		op += strlen(op);
993	<	op = addarg(op, "-lr 6 -lw .002");
711	<	if (vdef(RENDER))
712	<	op = addarg(op, vval(RENDER));
993	>	op = addarg(op, "-lr 8 -lw 1e-4");
994		}
995
996
997	<	hiqopts(op, po)                         /* high quality rendering options */
998	<	register char   *op;
999	<	char    *po;
997	>	static void
998	>	hiqopts(                                /* high quality rendering options */
999	>	char    *op,
1000	>	char    *po
1001	>	)
1002		{
1003		double  d, org[3], siz[3], asz;
1004
#	Line 725 | Line 1008 | char   *po;
1008		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
1009		badvalue(ZONE);
1010		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
1011	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
1011	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
1012		badvalue(ZONE);
1013		getoctcube(org, &d);
1014		asz = (siz[0]+siz[1]+siz[2])/3.;
#	Line 734 | Line 1017 | char   *po;
1017		case LOW:
1018		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
1019		op = addarg(op, "-dp 1024");
1020	<	sprintf(op, " -ar %d", (int)(16*d));
1020	>	sprintf(op, " -ar %d", (int)(32*d));
1021		op += strlen(op);
1022		sprintf(op, " -ms %.2g", asz/40.);
1023		op += strlen(op);
#	Line 742 | Line 1025 | char   *po;
1025		case MEDIUM:
1026		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
1027		op = addarg(op, "-dp 2048");
1028	<	sprintf(op, " -ar %d", (int)(32*d));
1028	>	sprintf(op, " -ar %d", (int)(64*d));
1029		op += strlen(op);
1030		sprintf(op, " -ms %.2g", asz/80.);
1031		op += strlen(op);
#	Line 750 | Line 1033 | char   *po;
1033		case HIGH:
1034		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
1035		op = addarg(op, "-dp 4096");
1036	<	sprintf(op, " -ar %d", (int)(64*d));
1036	>	sprintf(op, " -ar %d", (int)(128*d));
1037		op += strlen(op);
1038		sprintf(op, " -ms %.2g", asz/160.);
1039		op += strlen(op);
#	Line 758 | Line 1041 | char   *po;
1041		}
1042		po = addarg(po, "-pt .04");
1043		if (vbool(PENUMBRAS))
1044	<	op = addarg(op, "-ds .1 -dj .65");
1044	>	op = addarg(op, "-ds .1 -dj .9");
1045		else
1046		op = addarg(op, "-ds .2");
1047	<	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
1047	>	op = addarg(op, "-dt .05 -dc .75 -dr 3 -ss 16 -st .01");
1048		sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
1049		op += strlen(op);
1050		if (vdef(AMBFILE)) {
#	Line 771 | Line 1054 | char   *po;
1054		overture = 0;
1055		switch (vscale(VARIABILITY)) {
1056		case LOW:
1057	<	op = addarg(op, "-aa .15 -ad 256 -as 0");
1057	>	op = addarg(op, "-aa .125 -ad 512 -as 64");
1058		break;
1059		case MEDIUM:
1060	<	op = addarg(op, "-aa .125 -ad 512 -as 256");
1060	>	op = addarg(op, "-aa .1 -ad 1536 -as 768");
1061		break;
1062		case HIGH:
1063	<	op = addarg(op, "-aa .08 -ad 1024 -as 512");
1063	>	op = addarg(op, "-aa .075 -ad 4096 -as 2048");
1064		break;
1065		}
1066		d = ambval();
1067		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
1068		op += strlen(op);
1069	<	op = addarg(op, "-lr 12 -lw .0005");
787	<	if (vdef(RENDER))
788	<	op = addarg(op, vval(RENDER));
1069	>	op = addarg(op, "-lr 12 -lw 1e-5");
1070		}
1071
1072
1073	<	xferopts(ro)                            /* transfer options if indicated */
1074	<	char    *ro;
1073	>	#ifdef _WIN32
1074	>	static void
1075	>	setenv(                 /* set an environment variable */
1076	>	char    *vname,
1077	>	char    *value
1078	>	)
1079		{
1080	+	char    *evp;
1081	+
1082	+	evp = bmalloc(strlen(vname)+strlen(value)+2);
1083	+	if (evp == NULL)
1084	+	syserr(progname);
1085	+	sprintf(evp, "%s=%s", vname, value);
1086	+	if (putenv(evp) != 0) {
1087	+	fprintf(stderr, "%s: out of environment space\n", progname);
1088	+	quit(1);
1089	+	}
1090	+	if (!silent)
1091	+	printf("set %s\n", evp);
1092	+	}
1093	+	#endif
1094	+
1095	+
1096	+	static void
1097	+	xferopts(                               /* transfer options if indicated */
1098	+	char    *ro
1099	+	)
1100	+	{
1101		int     fd, n;
1102	<	register char   *cp;
1102	>	char    *cp;
1103
1104		n = strlen(ro);
1105		if (n < 2)
#	Line 811 | Line 1117 | char   *ro;
1117		syserr(vval(OPTFILE));
1118		sprintf(ro, " @%s", vval(OPTFILE));
1119		}
1120	<	#ifdef MSDOS
1120	>	#ifdef _WIN32
1121		else if (n > 50) {
1122		setenv("ROPT", ro+1);
1123		strcpy(ro, " $ROPT");
#	Line 820 | Line 1126 | char   *ro;
1126		}
1127
1128
1129	<	pfiltopts(po)                           /* get pfilt options */
1130	<	register char   *po;
1129	>	static void
1130	>	pfiltopts(                              /* get pfilt options */
1131	>	char    *po
1132	>	)
1133		{
1134		*po = '\0';
1135		if (vdef(EXPOSURE)) {
#	Line 830 | Line 1138 | register char  *po;
1138		}
1139		switch (vscale(QUALITY)) {
1140		case MEDIUM:
1141	<	po = addarg(po, "-r 1");
1141	>	po = addarg(po, "-r .6");
1142		break;
1143		case HIGH:
1144		po = addarg(po, "-m .25");
1145		break;
1146		}
1147		if (vdef(PFILT))
1148	<	po = addarg(po, vval(PFILT));
1148	>	if (vval(PFILT)[0] != '-') {
1149	>	atos(c_pfilt, sizeof(c_pfilt), vval(PFILT));
1150	>	po = addarg(po, sskip2(vval(PFILT), 1));
1151	>	} else
1152	>	po = addarg(po, vval(PFILT));
1153		}
1154
1155
1156	<	matchword(s1, s2)                       /* match white-delimited words */
1157	<	register char   *s1, *s2;
1156	>	static int
1157	>	matchword(                      /* match white-delimited words */
1158	>	char    *s1,
1159	>	char    *s2
1160	>	)
1161		{
1162		while (isspace(*s1)) s1++;
1163		while (isspace(*s2)) s2++;
#	Line 853 | Line 1168 | register char  *s1, *s2;
1168		}
1169
1170
1171	<	char *
1172	<	specview(vs)                            /* get proper view spec from vs */
1173	<	register char   *vs;
1171	>	static char *
1172	>	specview(                               /* get proper view spec from vs */
1173	>	char    *vs
1174	>	)
1175		{
1176		static char     vup[7][12] = {"-vu 0 0 -1","-vu 0 -1 0","-vu -1 0 0",
1177		"-vu 0 0 1", "-vu 1 0 0","-vu 0 1 0","-vu 0 0 1"};
1178		static char     viewopts[128];
1179	<	register char   *cp;
1179	>	char    *cp;
1180		int     xpos, ypos, zpos, viewtype, upax;
1181	<	register int    i;
1181	>	int     i;
1182		double  cent[3], dim[3], mult, d;
1183
1184		if (vs == NULL || *vs == '-')
#	Line 873 | Line 1189 | register char  *vs;
1189		upax = 1-'X'+UPPER(vval(UP)[1]);
1190		else
1191		upax = 1-'X'+vlet(UP);
1192	<	if (upax < 1 | upax > 3)
1192	>	if ((upax < 1) | (upax > 3))
1193		badvalue(UP);
1194		if (vval(UP)[0] == '-')
1195		upax = -upax;
#	Line 895 | Line 1211 | register char  *vs;
1211		} else if (*vs == 'z') {
1212		zpos = -1; vs++;
1213		}
1214	<	viewtype = 'v';
1215	<	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c')
1214	>	switch (*vs) {
1215	>	case VT_PER:
1216	>	case VT_PAR:
1217	>	case VT_ANG:
1218	>	case VT_HEM:
1219	>	case VT_PLS:
1220	>	case VT_CYL:
1221		viewtype = *vs++;
1222	+	break;
1223	+	default:
1224	+	viewtype = VT_PER;
1225	+	break;
1226	+	}
1227		cp = viewopts;
1228		if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {       /* got one! */
1229		*cp++ = '-'; *cp++ = 'v'; *cp++ = 't'; *cp++ = viewtype;
#	Line 912 | Line 1238 | register char  *vs;
1238		cent[i] += .5*dim[i];
1239		}
1240		mult = vlet(ZONE)=='E' ? 2. : .45 ;
1241	<	sprintf(cp, " -vp %.2g %.2g %.2g -vd %.2g %.2g %.2g",
1241	>	sprintf(cp, " -vp %.3g %.3g %.3g -vd %.3g %.3g %.3g",
1242		cent[0]+xpos*mult*dim[0],
1243		cent[1]+ypos*mult*dim[1],
1244		cent[2]+zpos*mult*dim[2],
#	Line 939 | Line 1265 | register char  *vs;
1265		}
1266		cp = addarg(cp, vup[upax+3]);
1267		switch (viewtype) {
1268	<	case 'v':
1268	>	case VT_PER:
1269		cp = addarg(cp, "-vh 45 -vv 45");
1270		break;
1271	<	case 'l':
1271	>	case VT_PAR:
1272		d = sqrt(dim[0]*dim[0]+dim[1]*dim[1]+dim[2]*dim[2]);
1273	<	sprintf(cp, " -vh %.2g -vv %.2g", d, d);
1273	>	sprintf(cp, " -vh %.3g -vv %.3g", d, d);
1274		cp += strlen(cp);
1275		break;
1276	<	case 'a':
1277	<	case 'h':
1276	>	case VT_ANG:
1277	>	case VT_HEM:
1278	>	case VT_PLS:
1279		cp = addarg(cp, "-vh 180 -vv 180");
1280		break;
1281	<	case 'c':
1281	>	case VT_CYL:
1282		cp = addarg(cp, "-vh 180 -vv 90");
1283		break;
1284		}
#	Line 959 | Line 1286 | register char  *vs;
1286		while (!isspace(*vs))           /* else skip id */
1287		if (!*vs++)
1288		return(NULL);
1289	<	if (upax) {                     /* specify up vector */
1289	>	if (upax) {                     /* prepend up vector */
1290		strcpy(cp, vup[upax+3]);
1291		cp += strlen(cp);
1292		}
#	Line 967 | Line 1294 | register char  *vs;
1294		if (cp == viewopts)             /* append any additional options */
1295		vs++;           /* skip prefixed space if unneeded */
1296		strcpy(cp, vs);
1297	<	#ifdef MSDOS
1297	>	#ifdef _WIN32
1298		if (strlen(viewopts) > 40) {
1299		setenv("VIEW", viewopts);
1300		return("$VIEW");
#	Line 977 | Line 1304 | register char  *vs;
1304		}
1305
1306
1307	<	char *
1308	<	getview(n, vn)                          /* get view n, or NULL if none */
1309	<	int     n;
1310	<	char    *vn;            /* returned view name */
1307	>	static char *
1308	>	getview(                                /* get view n, or NULL if none */
1309	>	int     n,
1310	>	char    *vn             /* returned view name */
1311	>	)
1312		{
1313	<	register char   *mv;
1313	>	char    *mv;
1314
1315		if (viewselect != NULL) {               /* command-line selected */
1316		if (n)                          /* only do one */
1317		return(NULL);
1318	+
1319	+	if (isint(viewselect)) {        /* view number? */
1320	+	n = atoi(viewselect)-1;
1321	+	goto numview;
1322	+	}
1323		if (viewselect[0] == '-') {     /* already specified */
1324	<	if (vn != NULL) *vn = '\0';
1324	>	if (vn != NULL)
1325	>	strcpy(vn, "0");
1326		return(viewselect);
1327		}
1328		if (vn != NULL) {
#	Line 997 | Line 1331 | char   *vn;            /* returned view name */
1331		;
1332		*vn = '\0';
1333		}
1000	–	/* view number? */
1001	–	if (isint(viewselect))
1002	–	return(specview(nvalue(VIEW, atoi(viewselect)-1)));
1334		/* check list */
1335	<	while ((mv = nvalue(VIEW, n++)) != NULL)
1335	>	while ((mv = nvalue(VIEWS, n++)) != NULL)
1336		if (matchword(viewselect, mv))
1337		return(specview(mv));
1338	+
1339		return(specview(viewselect));   /* standard view? */
1340		}
1341	<	mv = nvalue(VIEW, n);           /* use view n */
1342	<	if (vn != NULL & mv != NULL) {
1343	<	register char   *mv2 = mv;
1344	<	if (*mv2 != '-')
1341	>	numview:
1342	>	mv = nvalue(VIEWS, n);          /* use view n */
1343	>	if ((vn != NULL) & (mv != NULL))
1344	>	if (*mv != '-') {
1345	>	char    *mv2 = mv;
1346		while (*mv2 && !isspace(*mv2))
1347		*vn++ = *mv2++;
1348	<	*vn = '\0';
1349	<	}
1348	>	*vn = '\0';
1349	>	} else
1350	>	sprintf(vn, "%d", n+1);
1351	>
1352		return(specview(mv));
1353		}
1354
1355
1356	<	printview(vopts)                        /* print out selected view */
1357	<	register char   *vopts;
1356	>	static int
1357	>	myprintview(                    /* print out selected view */
1358	>	char    *vopts,
1359	>	FILE    *fp
1360	>	)
1361		{
1362	<	extern char     *atos(), *getenv();
1363	<	char    buf[256];
1364	<	FILE    *fp;
1365	<	register char   *cp;
1366	<
1362	>	VIEW    vwr;
1363	>	char    buf[128];
1364	>	char    *cp;
1365	>	#ifdef _WIN32
1366	>	/* XXX Should we allow something like this for all platforms? */
1367	>	/* XXX Or is it still required at all? */
1368	>	again:
1369	>	#endif
1370		if (vopts == NULL)
1371		return(-1);
1372	<	fputs("VIEW=", stdout);
1373	<	do {
1374	<	if (matchword(vopts, "-vf")) {          /* expand view file */
1375	<	vopts = sskip(vopts);
1376	<	if (!*atos(buf, sizeof(buf), vopts))
1036	<	return(-1);
1037	<	if ((fp = fopen(buf, "r")) == NULL)
1038	<	return(-1);
1039	<	for (buf[sizeof(buf)-2] = '\n';
1040	<	fgets(buf, sizeof(buf), fp) != NULL &&
1041	<	buf[0] != '\n';
1042	<	buf[sizeof(buf)-2] = '\n') {
1043	<	if (buf[sizeof(buf)-2] != '\n') {
1044	<	ungetc(buf[sizeof(buf)-2], fp);
1045	<	buf[sizeof(buf)-2] = '\0';
1046	<	}
1047	<	if (matchword(buf, "VIEW=") ||
1048	<	matchword(buf, "rview")) {
1049	<	for (cp = sskip(buf); *cp && *cp != '\n'; cp++)
1050	<	putchar(*cp);
1051	<	}
1052	<	}
1053	<	fclose(fp);
1054	<	vopts = sskip(vopts);
1055	<	} else {
1056	<	while (isspace(*vopts))
1057	<	vopts++;
1058	<	putchar(' ');
1059	<	#ifdef MSDOS
1060	<	if (*vopts == '$') {            /* expand env. var. */
1061	<	if (!*atos(buf, sizeof(buf), vopts+1))
1062	<	return(-1);
1063	<	if ((cp = getenv(buf)) == NULL)
1064	<	return(-1);
1065	<	fputs(cp, stdout);
1066	<	vopts = sskip(vopts);
1067	<	} else
1372	>	#ifdef _WIN32
1373	>	if (vopts[0] == '$') {
1374	>	vopts = getenv(vopts+1);
1375	>	goto again;
1376	>	}
1377		#endif
1378	<	while (*vopts && !isspace(*vopts))
1379	<	putchar(*vopts++);
1380	<	}
1381	<	} while (*vopts++);
1382	<	putchar('\n');
1378	>	vwr = stdview;
1379	>	sscanview(&vwr, cp=vopts);              /* set initial options */
1380	>	while ((cp = strstr(cp, "-vf ")) != NULL &&
1381	>	*atos(buf, sizeof(buf), cp += 4)) {
1382	>	viewfile(buf, &vwr, NULL);      /* load -vf file */
1383	>	sscanview(&vwr, cp);            /* reset tail */
1384	>	}
1385	>	fputs(VIEWSTR, fp);
1386	>	fprintview(&vwr, fp);                   /* print full spec. */
1387	>	fputc('\n', fp);
1388		return(0);
1389		}
1390
1391
1392	<	rview(opts, po)                         /* run rview with first view */
1393	<	char    *opts, *po;
1392	>	static void
1393	>	rvu(                            /* run rvu with first view */
1394	>	char    *opts,
1395	>	char    *po
1396	>	)
1397		{
1398		char    *vw;
1399	<	char    combuf[512];
1399	>	char    combuf[PATH_MAX];
1400		/* build command */
1401		if (touchonly || (vw = getview(0, NULL)) == NULL)
1402		return;
1403		if (sayview)
1404	<	printview(vw);
1405	<	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1404	>	myprintview(vw, stdout);
1405	>	sprintf(combuf, "%s %s%s%s -R %s ", c_rvu, vw, opts, po, rifname);
1406	>	if (nprocs > 1)
1407	>	sprintf(combuf+strlen(combuf), "-n %d ", nprocs);
1408		if (rvdevice != NULL)
1409		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1410		if (vdef(EXPOSURE))
1411		sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1412		strcat(combuf, oct1name);
1413		if (runcom(combuf)) {           /* run it */
1414	<	fprintf(stderr, "%s: error running rview\n", progname);
1414	>	fprintf(stderr, "%s: error running %s\n", progname, c_rvu);
1415		quit(1);
1416		}
1417		}
1418
1419
1420	<	rpict(opts, po)                         /* run rpict and pfilt for each view */
1421	<	char    *opts, *po;
1420	>	static int
1421	>	syncf_done(                     /* check if an rpiece sync file is complete */
1422	>	char *sfname
1423	>	)
1424		{
1425	<	char    combuf[1024];
1426	<	char    rawfile[MAXPATH], picfile[MAXPATH];
1427	<	char    zopt[MAXPATH+4], rep[MAXPATH+16], res[32];
1425	>	FILE    *fp = fopen(sfname, "r");
1426	>	int     todo = 1;
1427	>	int     x, y;
1428	>
1429	>	if (fp == NULL)
1430	>	return(0);
1431	>	if (fscanf(fp, "%d %d", &x, &y) != 2)
1432	>	goto checked;
1433	>	todo = x*y;             /* total number of tiles */
1434	>	if (fscanf(fp, "%d %d", &x, &y) != 2 || (x != 0) | (y != 0))
1435	>	goto checked;
1436	>	/* XXX assume no redundant tiles */
1437	>	while (fscanf(fp, "%d %d", &x, &y) == 2)
1438	>	if (!--todo)
1439	>	break;
1440	>	checked:
1441	>	fclose(fp);
1442	>	return(!todo);
1443	>	}
1444	>
1445	>
1446	>	static void
1447	>	rpict(                          /* run rpict and pfilt for each view */
1448	>	char    *opts,
1449	>	char    *po
1450	>	)
1451	>	{
1452	>	#define do_rpiece       (sfile[0]!='\0')
1453	>	char    combuf[5*PATH_MAX+512];
1454	>	char    rawfile[PATH_MAX], picfile[PATH_MAX];
1455	>	char    zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
1456	>	char    rppopt[32], sfile[PATH_MAX], *pfile = NULL;
1457		char    pfopts[128];
1458		char    vs[32], *vw;
1459		int     vn, mult;
1460	+	FILE    *fp;
1461		time_t  rfdt, pfdt;
1462	+	int     xres, yres;
1463	+	double  aspect;
1464	+	int     n;
1465		/* get pfilt options */
1466		pfiltopts(pfopts);
1467		/* get resolution, reporting */
#	Line 1122 | Line 1476 | char   *opts, *po;
1476		mult = 3;
1477		break;
1478		}
1479	<	{
1480	<	int     xres, yres;
1481	<	double  aspect;
1482	<	int     n;
1483	<	n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect);
1484	<	if (n == 3)
1485	<	sprintf(res, "-x %d -y %d -pa %.3f",
1486	<	mult*xres, mult*yres, aspect);
1487	<	else if (n) {
1488	<	if (n == 1) yres = xres;
1135	<	sprintf(res, "-x %d -y %d", mult*xres, mult*yres);
1136	<	} else
1137	<	badvalue(RESOLUTION);
1138	<	}
1479	>	n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect);
1480	>	if (n == 3)
1481	>	sprintf(res, "-x %d -y %d -pa %.3f",
1482	>	mult*xres, mult*yres, aspect);
1483	>	else if (n) {
1484	>	aspect = 1.;
1485	>	if (n == 1) yres = xres;
1486	>	sprintf(res, "-x %d -y %d", mult*xres, mult*yres);
1487	>	} else
1488	>	badvalue(RESOLUTION);
1489		rep[0] = '\0';
1490		if (vdef(REPORT)) {
1491		double  minutes;
1142	–	int     n;
1492		n = sscanf(vval(REPORT), "%lf %s", &minutes, rawfile);
1493		if (n == 2)
1494		sprintf(rep, " -t %d -e %s", (int)(minutes*60), rawfile);
#	Line 1148 | Line 1497 | char   *opts, *po;
1497		else
1498		badvalue(REPORT);
1499		}
1500	<	/* do each view */
1501	<	vn = 0;
1500	>	/* set up parallel rendering */
1501	>	sfile[0] = '\0';
1502	>	if ((nprocs > 1) & !touchonly & !vdef(ZFILE) &&
1503	>	getview(0, vs) != NULL) {
1504	>	if (!strcmp(c_rpict, DEF_RPICT_PATH) &&
1505	>	getview(1, NULL) == NULL) {
1506	>	sprintf(sfile, "%s_%s_rpsync.txt",
1507	>	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE),
1508	>	vs);
1509	>	strcpy(rppopt, "-PP pfXXXXXX");
1510	>	} else {
1511	>	strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1512	>	}
1513	>	pfile = rppopt + strlen(rppopt) - 8;
1514	>	if (mktemp(pfile) == NULL) {
1515	>	if (do_rpiece) {
1516	>	fprintf(stderr, "%s: cannot create\n", pfile);
1517	>	quit(1);
1518	>	}
1519	>	pfile = NULL;
1520	>	}
1521	>	}
1522	>	vn = 0;                                 /* do each view */
1523		while ((vw = getview(vn++, vs)) != NULL) {
1524		if (sayview)
1525	<	printview(vw);
1526	<	if (!vs[0])
1157	<	sprintf(vs, "%d", vn);
1158	<	sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1525	>	myprintview(vw, stdout);
1526	>	sprintf(picfile, "%s_%s.hdr", vval(PICTURE), vs);
1527		if (vdef(ZFILE))
1528		sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1529		else
#	Line 1176 | Line 1544 | char   *opts, *po;
1544		touch(picfile);
1545		continue;
1546		}
1547	+	/* parallel running? */
1548	+	if (do_rpiece) {
1549	+	if (rfdt < oct1date || !fdate(sfile)) {
1550	+	int     xdiv = 8+nprocs/3, ydiv = 8+nprocs/3;
1551	+	if (rfdt >= oct1date) {
1552	+	fprintf(stderr,
1553	+	"%s: partial output not created with %s\n", rawfile, c_rpiece);
1554	+	quit(1);
1555	+	}
1556	+	if (rfdt) {     /* start fresh */
1557	+	rmfile(rawfile);
1558	+	rfdt = 0;
1559	+	}
1560	+	if (!silent)
1561	+	printf("\techo %d %d > %s\n",
1562	+	xdiv, ydiv, sfile);
1563	+	if ((fp = fopen(sfile, "w")) == NULL) {
1564	+	fprintf(stderr, "%s: cannot create\n",
1565	+	sfile);
1566	+	quit(1);
1567	+	}
1568	+	fprintf(fp, "%d %d\n", xdiv, ydiv);
1569	+	fclose(fp);
1570	+	}
1571	+	} else if (next_process(0)) {
1572	+	if (pfile != NULL)
1573	+	sleep(10);
1574	+	continue;
1575	+	} else if (!inchild())
1576	+	pfile = NULL;
1577	+	/* XXX Remember to call finish_process() */
1578		/* build rpict command */
1579	<	if (rfdt >= oct1date)           /* recover */
1580	<	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1581	<	rep, po, opts, zopt, rawfile, oct1name);
1582	<	else {
1579	>	if (rfdt >= oct1date) {         /* already in progress */
1580	>	if (do_rpiece) {
1581	>	sprintf(combuf, "%s -R %s %s%s %s %s%s%s -o %s %s",
1582	>	c_rpiece, sfile, rppopt, rep, vw,
1583	>	res, opts, po, rawfile, oct1name);
1584	>	while (next_process(1)) {
1585	>	sleep(10);
1586	>	combuf[strlen(c_rpiece)+2] = 'F';
1587	>	}
1588	>	} else
1589	>	sprintf(combuf, "%s%s%s%s%s -ro %s %s", c_rpict,
1590	>	rep, opts, po, zopt, rawfile, oct1name);
1591	>	if (runcom(combuf))     /* run rpict/rpiece */
1592	>	goto rperror;
1593	>	} else {
1594		if (overture) {         /* run overture calculation */
1595		sprintf(combuf,
1596	<	"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1597	<	rep, vw, opts,
1596	>	"%s%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1597	>	c_rpict, rep, vw, opts,
1598		oct1name, overfile);
1599	<	if (runcom(combuf)) {
1600	<	fprintf(stderr,
1599	>	if (!do_rpiece || !next_process(0)) {
1600	>	if (runcom(combuf)) {
1601	>	fprintf(stderr,
1602		"%s: error in overture for view %s\n",
1603	<	progname, vs);
1604	<	quit(1);
1605	<	}
1606	<	#ifdef NIX
1607	<	rmfile(overfile);
1603	>	progname, vs);
1604	>	quit(1);
1605	>	}
1606	>	#ifndef NULL_DEVICE
1607	>	rmfile(overfile);
1608		#endif
1609	+	} else if (do_rpiece)
1610	+	sleep(20);
1611		}
1612	<	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1613	<	rep, vw, res, po, opts, zopt,
1614	<	oct1name, rawfile);
1612	>	if (do_rpiece) {
1613	>	sprintf(combuf, "%s -F %s %s%s %s %s%s%s -o %s %s",
1614	>	c_rpiece, sfile, rppopt, rep, vw,
1615	>	res, opts, po, rawfile, oct1name);
1616	>	while (next_process(1))
1617	>	sleep(10);
1618	>	} else {
1619	>	sprintf(combuf, "%s%s %s %s%s%s%s %s > %s",
1620	>	c_rpict, rep, vw, res, opts, po,
1621	>	zopt, oct1name, rawfile);
1622	>	}
1623	>	if ((pfile != NULL) & !do_rpiece) {
1624	>	if (!silent)
1625	>	printf("\t%s\n", combuf);
1626	>	fflush(stdout);
1627	>	sprintf(combuf, "%s%s %s %s%s%s %s > %s",
1628	>	c_rpict, rep, rppopt, res,
1629	>	opts, po, oct1name, rawfile);
1630	>	fp = popen(combuf, "w");
1631	>	if (fp == NULL)
1632	>	goto rperror;
1633	>	myprintview(vw, fp);
1634	>	if (pclose(fp))
1635	>	goto rperror;
1636	>	} else if (runcom(combuf))
1637	>	goto rperror;
1638		}
1639	<	if (runcom(combuf)) {           /* run rpict */
1640	<	fprintf(stderr, "%s: error rendering view %s\n",
1641	<	progname, vs);
1642	<	quit(1);
1639	>	if (do_rpiece) {                /* need to finish raw, first */
1640	>	finish_process();
1641	>	wait_process(1);
1642	>	if (!syncf_done(sfile)) {
1643	>	fprintf(stderr,
1644	>	"%s: %s did not complete rendering of view %s\n",
1645	>	progname, c_rpiece, vs);
1646	>	quit(1);
1647	>	}
1648		}
1649		if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1650		/* build pfilt command */
1651	<	if (mult > 1)
1652	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1653	<	pfopts, mult, mult, rawfile, picfile);
1651	>	if (do_rpiece)
1652	>	sprintf(combuf,
1653	>	"%s%s -x %d -y %d -p %.3f %s > %s",
1654	>	c_pfilt, pfopts, xres, yres, aspect,
1655	>	rawfile, picfile);
1656	>	else if (mult > 1)
1657	>	sprintf(combuf, "%s%s -x /%d -y /%d %s > %s",
1658	>	c_pfilt, pfopts, mult, mult,
1659	>	rawfile, picfile);
1660		else
1661	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1662	<	rawfile, picfile);
1663	<	if (runcom(combuf)) {           /* run pfilt */
1661	>	sprintf(combuf, "%s%s %s > %s", c_pfilt,
1662	>	pfopts, rawfile, picfile);
1663	>	if (runcom(combuf)) {   /* run pfilt */
1664		fprintf(stderr,
1665		"%s: error filtering view %s\n\t%s removed\n",
1666		progname, vs, picfile);
#	Line 1223 | Line 1670 | char   *opts, *po;
1670		}
1671		/* remove/rename raw file */
1672		if (vdef(RAWFILE)) {
1673	<	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1673	>	sprintf(combuf, "%s_%s.hdr", vval(RAWFILE), vs);
1674		mvfile(rawfile, combuf);
1675		} else
1676		rmfile(rawfile);
1677	+	if (do_rpiece)                  /* done with sync file */
1678	+	rmfile(sfile);
1679	+	else
1680	+	finish_process();       /* exit if child */
1681		}
1682	+	wait_process(1);                /* wait for children to finish */
1683	+	if (pfile != NULL) {            /* clean up persistent rpict */
1684	+	RT_PID  pid;
1685	+	fp = fopen(pfile, "r");
1686	+	if (fp != NULL) {
1687	+	if (fscanf(fp, "%*s %d", &pid) != 1 ||
1688	+	kill(pid, 1) < 0)
1689	+	unlink(pfile);
1690	+	fclose(fp);
1691	+	}
1692	+	}
1693	+	return;
1694	+	rperror:
1695	+	fprintf(stderr, "%s: error rendering view %s\n", progname, vs);
1696	+	quit(1);
1697	+	#undef do_rpiece
1698		}
1699
1700
1701	<	touch(fn)                       /* update a file */
1702	<	char    *fn;
1701	>	static int
1702	>	touch(                  /* update a file */
1703	>	char    *fn
1704	>	)
1705		{
1706		if (!silent)
1707		printf("\ttouch %s\n", fn);
1708	<	if (noaction)
1708	>	if (!nprocs)
1709		return(0);
1241	–	#ifdef notused
1242	–	if (access(fn, F_OK) == -1)             /* create it */
1243	–	if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
1244	–	return(-1);
1245	–	#endif
1710		return(setfdate(fn, time((time_t *)NULL)));
1711		}
1712
1713
1714	<	runcom(cs)                      /* run command */
1715	<	char    *cs;
1714	>	static int
1715	>	runcom(                 /* run command */
1716	>	char    *cs
1717	>	)
1718		{
1719		if (!silent)            /* echo it */
1720		printf("\t%s\n", cs);
1721	<	if (noaction)
1721	>	if (!nprocs)
1722		return(0);
1723	<	fflush(stdout);         /* flush output and pass to shell */
1723	>	fflush(NULL);           /* flush output and pass to shell */
1724		return(system(cs));
1725		}
1726
1727
1728	<	rmfile(fn)                      /* remove a file */
1729	<	char    *fn;
1728	>	static int
1729	>	rmfile(                 /* remove a file */
1730	>	char    *fn
1731	>	)
1732		{
1733		if (!silent)
1734	<	#ifdef MSDOS
1735	<	printf("\tdel %s\n", fn);
1268	<	#else
1269	<	printf("\trm -f %s\n", fn);
1270	<	#endif
1271	<	if (noaction)
1734	>	printf("\t%s %s\n", DELCMD, fn);
1735	>	if (!nprocs)
1736		return(0);
1737		return(unlink(fn));
1738		}
1739
1740
1741	<	mvfile(fold, fnew)              /* move a file */
1742	<	char    *fold, *fnew;
1741	>	static int
1742	>	mvfile(         /* move a file */
1743	>	char    *fold,
1744	>	char    *fnew
1745	>	)
1746		{
1747		if (!silent)
1748	<	#ifdef MSDOS
1749	<	printf("\trename %s %s\n", fold, fnew);
1283	<	#else
1284	<	printf("\tmv %s %s\n", fold, fnew);
1285	<	#endif
1286	<	if (noaction)
1748	>	printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
1749	>	if (!nprocs)
1750		return(0);
1751		return(rename(fold, fnew));
1752		}
1753
1754
1755	<	#ifdef MSDOS
1756	<	setenv(vname, value)            /* set an environment variable */
1757	<	char    *vname, *value;
1755	>	#ifdef RHAS_FORK_EXEC
1756	>	static int
1757	>	next_process(int reserve)               /* fork the next process */
1758		{
1759	<	register char   *evp;
1759	>	RT_PID  child_pid;
1760
1761	<	evp = bmalloc(strlen(vname)+strlen(value)+2);
1762	<	if (evp == NULL)
1763	<	syserr(progname);
1764	<	sprintf(evp, "%s=%s", vname, value);
1765	<	if (putenv(evp) != 0) {
1303	<	fprintf(stderr, "%s: out of environment space\n", progname);
1761	>	if (nprocs <= 1)
1762	>	return(0);              /* it's us or no one */
1763	>	if (inchild()) {
1764	>	fprintf(stderr, "%s: internal error 1 in next_process()\n",
1765	>	progname);
1766		quit(1);
1767		}
1768	<	if (!silent)
1769	<	printf("set %s\n", evp);
1768	>	if (reserve > 0 && children_running >= nprocs-reserve)
1769	>	return(0);              /* caller holding back process(es) */
1770	>	if (children_running >= nprocs)
1771	>	wait_process(0);        /* wait for someone to finish */
1772	>	fflush(NULL);                   /* flush output */
1773	>	child_pid = fork();             /* split process */
1774	>	if (child_pid == 0) {           /* we're the child */
1775	>	children_running = -1;
1776	>	nprocs = 1;
1777	>	return(0);
1778	>	}
1779	>	if (child_pid > 0) {            /* we're the parent */
1780	>	++children_running;
1781	>	return(1);
1782	>	}
1783	>	fprintf(stderr, "%s: warning -- fork() failed\n", progname);
1784	>	return(0);
1785		}
1309	–	#endif
1786
1787	+	static void
1788	+	wait_process(                   /* wait for process(es) to finish */
1789	+	int     all
1790	+	)
1791	+	{
1792	+	int     ourstatus = 0, status;
1793	+	RT_PID  pid;
1794
1795	<	badvalue(vc)                    /* report bad variable value and exit */
1796	<	int     vc;
1795	>	if (all)
1796	>	all = children_running;
1797	>	else if (children_running > 0)
1798	>	all = 1;
1799	>	while (all-- > 0) {
1800	>	pid = wait(&status);
1801	>	if (pid < 0)
1802	>	syserr(progname);
1803	>	status = status>>8 & 0xff;
1804	>	--children_running;
1805	>	if (status != 0) {      /* child's problem is our problem */
1806	>	if ((ourstatus == 0) & (children_running > 0))
1807	>	fprintf(stderr, "%s: waiting for remaining processes\n",
1808	>	progname);
1809	>	ourstatus = status;
1810	>	all = children_running;
1811	>	}
1812	>	}
1813	>	if (ourstatus != 0)
1814	>	quit(ourstatus);        /* bad status from child */
1815	>	}
1816	>	#else   /* ! RHAS_FORK_EXEC */
1817	>	static int
1818	>	next_process(int reserve)
1819		{
1820	+	return(0);                      /* cannot start new process */
1821	+	}
1822	+	static void
1823	+	wait_process(all)
1824	+	int     all;
1825	+	{
1826	+	(void)all;                      /* no one to wait for */
1827	+	}
1828	+	int
1829	+	kill(pid, sig) /* win|unix_process.c should also wait and kill */
1830	+	RT_PID pid;
1831	+	int sig;
1832	+	{
1833	+	return 0;
1834	+	}
1835	+	#endif  /* ! RHAS_FORK_EXEC */
1836	+
1837	+	static void
1838	+	finish_process(void)                    /* exit a child process */
1839	+	{
1840	+	if (!inchild())
1841	+	return;                 /* in parent -- noop */
1842	+	exit(0);
1843	+	}
1844	+
1845	+
1846	+	static void
1847	+	badvalue(                       /* report bad variable value and exit */
1848	+	int     vc
1849	+	)
1850	+	{
1851		fprintf(stderr, "%s: bad value for variable '%s'\n",
1852		progname, vnam(vc));
1853		quit(1);
1854		}
1855
1856
1857	<	syserr(s)                       /* report a system error and exit */
1858	<	char    *s;
1857	>	static void
1858	>	syserr(                 /* report a system error and exit */
1859	>	char    *s
1860	>	)
1861		{
1862		perror(s);
1863		quit(1);
1864		}
1865
1866
1867	+	void
1868		quit(ec)                        /* exit program */
1869		int     ec;
1870		{

Diff Legend

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