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.73 by greg, Sat Oct 18 04:46:24 2003 UTC vs.
Revision 2.113 by greg, Wed May 27 12:50:46 2015 UTC

#	Line 11 | Line 11 | static const char      RCSid[] = "$Id$";
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"
#	Line 21 | Line 22 | static const char      RCSid[] = "$Id$";
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) */
#	Line 32 | Line 36 | static const char      RCSid[] = "$Id$";
36		#define INDIRECT        5               /* indirection in lighting */
37		#define MATERIAL        6               /* material files */
38		#define MKILLUM         7               /* mkillum options */
39	<	#define OBJECT          8               /* object files */
40	<	#define OCONV           9               /* oconv options */
41	<	#define OCTREE          10              /* octree file name */
42	<	#define OPTFILE         11              /* rendering options file */
43	<	#define PENUMBRAS       12              /* shadow penumbras are desired */
44	<	#define PFILT           13              /* pfilt options */
45	<	#define PICTURE         14              /* picture file root name */
46	<	#define QUALITY         15              /* desired rendering quality */
47	<	#define RAWFILE         16              /* raw picture file root name */
48	<	#define RENDER          17              /* rendering options */
49	<	#define REPORT          18              /* report frequency and errfile */
50	<	#define RESOLUTION      19              /* maximum picture resolution */
51	<	#define SCENE           20              /* scene files */
52	<	#define UP              21              /* view up (X, Y or Z) */
53	<	#define VARIABILITY     22              /* level of light variability */
54	<	#define VIEWS           23              /* view(s) for picture(s) */
55	<	#define ZFILE           24              /* distance file root name */
56	<	#define ZONE            25              /* simulation zone */
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 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 = 26;
63	>	int NVARS = 31;
64
65		VARIABLE        vv[] = {                /* variable-value pairs */
66		{"AMBFILE",     3,      0,      NULL,   onevalue},
#	Line 62 | Line 71 | VARIABLE       vv[] = {                /* variable-value pairs */
71		{"INDIRECT",    3,      0,      NULL,   intvalue},
72		{"materials",   3,      0,      NULL,   catvalues},
73		{"mkillum",     3,      0,      NULL,   catvalues},
74	+	{"mkpmap",      3,      0,      NULL,   catvalues},
75		{"objects",     3,      0,      NULL,   catvalues},
76		{"oconv",       3,      0,      NULL,   catvalues},
77		{"OCTREE",      3,      0,      NULL,   onevalue},
78		{"OPTFILE",     3,      0,      NULL,   onevalue},
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},
93		{"VARIABILITY", 3,      0,      NULL,   qualvalue},
#	Line 100 | 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     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 */
#	Line 120 | Line 150 | char   radname[PATH_MAX];      /* root Radiance file name */
150
151		#define inchild()       (children_running < 0)
152
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	<	main(argc, argv)
190	<	int     argc;
191	<	char    *argv[];
189	>
190	>	int
191	>	main(
192	>	int     argc,
193	>	char    *argv[]
194	>	)
195		{
196		char    ropts[512];
197		char    popts[64];
#	Line 168 | Line 236 | char   *argv[];
236		if (i >= argc)
237		goto userr;
238		rifname = argv[i];
171	–	/* check command-line options */
172	–	if ((nprocs > 1) & (viewselect != NULL))
173	–	nprocs = 1;
239		/* assign Radiance root file name */
240		rootname(radname, rifname);
241		/* load variable values */
#	Line 193 | 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);
#	Line 208 | Line 275 | userr:
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
#	Line 226 | 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[PATH_MAX];
306		time_t  thisdate, lastdate = 0;
#	Line 237 | Line 309 | register char  *fnames;
309		return(0);
310		while ((fnames = nextword(thisfile, PATH_MAX, fnames)) != NULL) {
311		if (thisfile[0] == '!' ||
312	<	(thisfile[0] == '\\' && thisfile[1] == '!'))
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 248 | 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	<	register char   *cp;
333	<	register int    n;
332	>	char    *cp;
333	>	int     n;
334		int     suffix;
335
336		n = 0; cp = orig; suffix = -1;          /* suffix position, length */
#	Line 273 | 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 304 | 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	+	if (pgmapname == NULL && !nowarn)
405	+	fprintf(stderr, "%s: warning - '%s' assigned without '%s'\n",
406	+	progname, vnam(PCMAP), vnam(PGMAP));
407	+	}
408		matdate = checklast(vval(MATERIAL));
409		}
410
411
412	<	getoctcube(org, sizp)           /* get octree bounding cube */
413	<	double  org[3], *sizp;
412	>	static void
413	>	getoctcube(             /* get octree bounding cube */
414	>	double  org[3],
415	>	double  *sizp
416	>	)
417		{
314	–	extern FILE     *popen();
418		static double   oorg[3], osiz = 0.;
419		double  min[3], max[3];
420		char    buf[1024];
421		FILE    *fp;
422	<	register int    i;
422	>	int     i;
423
424		if (osiz <= FTINY) {
425		if (!nprocs && fdate(oct1name) <
#	Line 359 | Line 462 | double org[3], *sizp;
462		}
463
464
465	<	setdefaults()                   /* set default values for unassigned var's */
465	>	static void
466	>	setdefaults(void)                       /* set default values for unassigned var's */
467		{
468		double  org[3], lim[3], size;
469		char    buf[128];
#	Line 416 | Line 520 | setdefaults()                  /* set default values for unassigned v
520		}
521
522
523	<	oconv()                         /* run oconv and mkillum if necessary */
523	>	static void
524	>	oconv(void)                             /* run oconv and mkillum if necessary */
525		{
526		static char     illumtmp[] = "ilXXXXXX";
527	<	char    combuf[PATH_MAX], ocopts[64], mkopts[64];
527	>	char    combuf[PATH_MAX], ocopts[64], mkopts[1024];
528
529		oconvopts(ocopts);              /* get options */
530		if (octreedate < scenedate) {   /* check date on original octree */
#	Line 427 | Line 532 | oconv()                                /* run oconv and mkillum if necessary */
532		touch(vval(OCTREE));
533		else {                          /* build command */
534		if (vdef(MATERIAL))
535	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
536	<	vval(MATERIAL), vval(SCENE),
537	<	vval(OCTREE));
535	>	sprintf(combuf, "%s%s %s %s > %s", c_oconv,
536	>	ocopts, vval(MATERIAL),
537	>	vval(SCENE), vval(OCTREE));
538		else
539	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
539	>	sprintf(combuf, "%s%s %s > %s", c_oconv, ocopts,
540		vval(SCENE), vval(OCTREE));
541
542		if (runcom(combuf)) {           /* run it */
#	Line 457 | Line 562 | oconv()                                /* run oconv and mkillum if necessary */
562		touch(oct0name);
563		else {                          /* build command */
564		if (octreedate)
565	<	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
566	<	vval(OCTREE), vval(ILLUM), oct0name);
565	>	sprintf(combuf, "%s%s -i %s %s > %s", c_oconv,
566	>	ocopts, vval(OCTREE),
567	>	vval(ILLUM), oct0name);
568		else if (vdef(MATERIAL))
569	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
570	<	vval(MATERIAL), vval(ILLUM), oct0name);
465	<	else
466	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
569	>	sprintf(combuf, "%s%s %s %s > %s", c_oconv,
570	>	ocopts, vval(MATERIAL),
571		vval(ILLUM), oct0name);
572	+	else
573	+	sprintf(combuf, "%s%s %s > %s", c_oconv,
574	+	ocopts, vval(ILLUM), oct0name);
575		if (runcom(combuf)) {           /* run it */
576		fprintf(stderr,
577		"%s: error generating octree\n\t%s removed\n",
#	Line 484 | Line 591 | oconv()                                /* run oconv and mkillum if necessary */
591		else {
592		mkillumopts(mkopts);            /* build mkillum command */
593		mktemp(illumtmp);
594	<	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
594	>	sprintf(combuf, "%s%s %s \"<\" %s > %s", c_mkillum, mkopts,
595		oct0name, vval(ILLUM), illumtmp);
596		if (runcom(combuf)) {                   /* run it */
597	<	fprintf(stderr, "%s: error running mkillum\n",
598	<	progname);
597	>	fprintf(stderr, "%s: error running %s\n",
598	>	progname, c_mkillum);
599		unlink(illumtmp);
600		quit(1);
601		}
602	+	rmfile(oct0name);
603		/* make octree1 (frozen) */
604		if (octreedate)
605	<	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
606	<	vval(OCTREE), illumtmp, oct1name);
605	>	sprintf(combuf, "%s%s -f -i %s %s > %s", c_oconv,
606	>	ocopts, vval(OCTREE), illumtmp, oct1name);
607		else if (vdef(MATERIAL))
608	<	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
609	<	vval(MATERIAL), illumtmp, oct1name);
608	>	sprintf(combuf, "%s%s -f %s %s > %s", c_oconv,
609	>	ocopts, vval(MATERIAL), illumtmp, oct1name);
610		else
611	<	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
611	>	sprintf(combuf, "%s%s -f %s > %s", c_oconv, ocopts,
612		illumtmp, oct1name);
613		if (runcom(combuf)) {           /* run it */
614		fprintf(stderr,
#	Line 518 | Line 626 | oconv()                                /* run oconv and mkillum if necessary */
626		}
627
628
629	<	char *
630	<	addarg(op, arg)                         /* add argument and advance pointer */
523	<	register char   *op, *arg;
629	>	static void
630	>	mkpmap(void)                    /* run mkpmap if indicated */
631		{
632	+	char    combuf[2048], *cp;
633	+	time_t  tnow;
634	+	/* nothing to do? */
635	+	if ((pgmapname == NULL) | (pgmapdate >= oct1date) &&
636	+	(pcmapname == NULL) | (pcmapdate >= oct1date))
637	+	return;
638	+	/* just update existing file dates? */
639	+	if (touchonly && (pgmapname == NULL) | (pgmapdate > 0) &&
640	+	(pcmapname == NULL) | (pcmapdate > 0)) {
641	+	if (pgmapname != NULL)
642	+	touch(pgmapname);
643	+	if (pcmapname != NULL)
644	+	touch(pcmapname);
645	+	} else {                /* else need to (re)run pkpmap */
646	+	strcpy(combuf, c_mkpmap);
647	+	for (cp = combuf; *cp; cp++)
648	+	;
649	+	mkpmapopts(cp);
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)
679	+	unlink(pgmapname);
680	+	if (pcmapname != NULL)
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(                         /* 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		;
#	Line 529 | Line 706 | register char  *op, *arg;
706		}
707
708
709	<	oconvopts(oo)                           /* get oconv options */
710	<	register char   *oo;
709	>	static void
710	>	oconvopts(                              /* get oconv options */
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
727	<	mkillumopts(mo)                         /* get mkillum options */
728	<	register char   *mo;
727	>	static void
728	>	mkillumopts(                            /* get mkillum options */
729	>	char    *mo
730	>	)
731		{
732		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
733
734	+	if (nprocs > 1)
735	+	sprintf(mo, " -n %d", nprocs);
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		*mo = '\0';
756	<	if (vdef(MKILLUM))
757	<	addarg(mo, vval(MKILLUM));
756	>	if (!vdef(MKPMAP))
757	>	return;
758	>	if (vval(MKPMAP)[0] != '-') {
759	>	atos(c_mkpmap, sizeof(c_mkpmap), vval(MKPMAP));
760	>	mo = addarg(mo, sskip2(vval(MKPMAP), 1));
761	>	} else
762	>	mo = addarg(mo, vval(MKPMAP));
763		}
764
765
766	<	checkambfile()                  /* check date on ambient file */
766	>	static void
767	>	checkambfile(void)                      /* check date on ambient file */
768		{
769		time_t  afdate;
770
#	Line 568 | Line 781 | checkambfile()                 /* check date on ambient file */
781		}
782
783
784	<	double
785	<	ambval()                                /* compute ambient value */
784	>	static double
785	>	ambval(void)                            /* compute ambient value */
786		{
787		if (vdef(EXPOSURE)) {
788		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
#	Line 581 | Line 794 | ambval()                               /* compute ambient value */
794		if (vlet(ZONE) == 'I')
795		return(.01);
796		badvalue(ZONE);
797	+	return 0; /* pro forma return */
798		}
799
800
801	<	renderopts(op, po)                      /* set rendering options */
802	<	char    *op, *po;
801	>	static void
802	>	renderopts(                     /* set rendering options */
803	>	char    *op,
804	>	char    *po
805	>	)
806		{
807	+	char    pmapf[256], *bw;
808	+
809		switch(vscale(QUALITY)) {
810		case LOW:
811		lowqopts(op, po);
#	Line 598 | Line 817 | char   *op, *po;
817		hiqopts(op, po);
818		break;
819		}
820	+	if (vdef(PGMAP)) {
821	+	bw = sskip2(vval(PGMAP), 2);
822	+	atos(pmapf, sizeof(pmapf), vval(PGMAP));
823	+	op = addarg(addarg(op, "-ap"), pmapf);
824	+	if (atoi(bw) > 0) op = addarg(op, bw);
825	+	}
826	+	if (vdef(PCMAP)) {
827	+	bw = sskip2(vval(PCMAP), 2);
828	+	atos(pmapf, sizeof(pmapf), vval(PCMAP));
829	+	op = addarg(addarg(op, "-ap"), pmapf);
830	+	if (atoi(bw) > 0) op = addarg(op, bw);
831	+	}
832	+	if (vdef(RENDER))
833	+	op = addarg(op, vval(RENDER));
834	+	if (rvdevice != NULL) {
835	+	if (vdef(RVU))
836	+	if (vval(RVU)[0] != '-') {
837	+	atos(c_rvu, sizeof(c_rvu), vval(RVU));
838	+	po = addarg(po, sskip2(vval(RVU), 1));
839	+	} else
840	+	po = addarg(po, vval(RVU));
841	+	} else {
842	+	if (vdef(RPICT))
843	+	if (vval(RPICT)[0] != '-') {
844	+	atos(c_rpict, sizeof(c_rpict), vval(RPICT));
845	+	po = addarg(po, sskip2(vval(RPICT), 1));
846	+	} else
847	+	po = addarg(po, vval(RPICT));
848	+	}
849		}
850
851
852	<	lowqopts(op, po)                        /* low quality rendering options */
853	<	register char   *op;
854	<	char    *po;
852	>	static void
853	>	lowqopts(                       /* low quality rendering options */
854	>	char    *op,
855	>	char    *po
856	>	)
857		{
858		double  d, org[3], siz[3];
859
#	Line 642 | Line 892 | char   *po;
892		op = addarg(op, "-ds .4");
893		else
894		op = addarg(op, "-ds 0");
895	<	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5");
895	>	op = addarg(op, "-dt .2 -dc .25 -dr 0 -ss 0 -st .5");
896		if (vdef(AMBFILE)) {
897		sprintf(op, " -af %s", vval(AMBFILE));
898		op += strlen(op);
#	Line 663 | Line 913 | char   *po;
913		d = ambval();
914		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
915		op += strlen(op);
916	<	op = addarg(op, "-lr 6 -lw .01");
667	<	if (vdef(RENDER))
668	<	op = addarg(op, vval(RENDER));
916	>	op = addarg(op, "-lr 6 -lw .003");
917		}
918
919
920	<	medqopts(op, po)                        /* medium quality rendering options */
921	<	register char   *op;
922	<	char    *po;
920	>	static void
921	>	medqopts(                       /* medium quality rendering options */
922	>	char    *op,
923	>	char    *po
924	>	)
925		{
926		double  d, org[3], siz[3], asz;
927
#	Line 714 | Line 964 | char   *po;
964		}
965		po = addarg(po, "-pt .08");
966		if (vbool(PENUMBRAS))
967	<	op = addarg(op, "-ds .2 -dj .5");
967	>	op = addarg(op, "-ds .2 -dj .9");
968		else
969		op = addarg(op, "-ds .3");
970	<	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
970	>	op = addarg(op, "-dt .1 -dc .5 -dr 1 -ss 1 -st .1");
971		if ( (overture = vint(INDIRECT)) ) {
972		sprintf(op, " -ab %d", overture);
973		op += strlen(op);
#	Line 741 | Line 991 | char   *po;
991		d = ambval();
992		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
993		op += strlen(op);
994	<	op = addarg(op, "-lr 8 -lw .002");
745	<	if (vdef(RENDER))
746	<	op = addarg(op, vval(RENDER));
994	>	op = addarg(op, "-lr 8 -lw 1e-4");
995		}
996
997
998	<	hiqopts(op, po)                         /* high quality rendering options */
999	<	register char   *op;
1000	<	char    *po;
998	>	static void
999	>	hiqopts(                                /* high quality rendering options */
1000	>	char    *op,
1001	>	char    *po
1002	>	)
1003		{
1004		double  d, org[3], siz[3], asz;
1005
#	Line 792 | Line 1042 | char   *po;
1042		}
1043		po = addarg(po, "-pt .04");
1044		if (vbool(PENUMBRAS))
1045	<	op = addarg(op, "-ds .1 -dj .65");
1045	>	op = addarg(op, "-ds .1 -dj .9");
1046		else
1047		op = addarg(op, "-ds .2");
1048	<	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
1048	>	op = addarg(op, "-dt .05 -dc .75 -dr 3 -ss 16 -st .01");
1049		sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
1050		op += strlen(op);
1051		if (vdef(AMBFILE)) {
#	Line 817 | Line 1067 | char   *po;
1067		d = ambval();
1068		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
1069		op += strlen(op);
1070	<	op = addarg(op, "-lr 12 -lw .0005");
821	<	if (vdef(RENDER))
822	<	op = addarg(op, vval(RENDER));
1070	>	op = addarg(op, "-lr 12 -lw 1e-5");
1071		}
1072
1073
1074	<	xferopts(ro)                            /* transfer options if indicated */
1075	<	char    *ro;
1074	>	#ifdef _WIN32
1075	>	static void
1076	>	setenv(                 /* set an environment variable */
1077	>	char    *vname,
1078	>	char    *value
1079	>	)
1080		{
1081	+	char    *evp;
1082	+
1083	+	evp = bmalloc(strlen(vname)+strlen(value)+2);
1084	+	if (evp == NULL)
1085	+	syserr(progname);
1086	+	sprintf(evp, "%s=%s", vname, value);
1087	+	if (putenv(evp) != 0) {
1088	+	fprintf(stderr, "%s: out of environment space\n", progname);
1089	+	quit(1);
1090	+	}
1091	+	if (!silent)
1092	+	printf("set %s\n", evp);
1093	+	}
1094	+	#endif
1095	+
1096	+
1097	+	static void
1098	+	xferopts(                               /* transfer options if indicated */
1099	+	char    *ro
1100	+	)
1101	+	{
1102		int     fd, n;
1103	<	register char   *cp;
1103	>	char    *cp;
1104
1105		n = strlen(ro);
1106		if (n < 2)
#	Line 854 | Line 1127 | char   *ro;
1127		}
1128
1129
1130	<	pfiltopts(po)                           /* get pfilt options */
1131	<	register char   *po;
1130	>	static void
1131	>	pfiltopts(                              /* get pfilt options */
1132	>	char    *po
1133	>	)
1134		{
1135		*po = '\0';
1136		if (vdef(EXPOSURE)) {
#	Line 871 | Line 1146 | register char  *po;
1146		break;
1147		}
1148		if (vdef(PFILT))
1149	<	po = addarg(po, vval(PFILT));
1149	>	if (vval(PFILT)[0] != '-') {
1150	>	atos(c_pfilt, sizeof(c_pfilt), vval(PFILT));
1151	>	po = addarg(po, sskip2(vval(PFILT), 1));
1152	>	} else
1153	>	po = addarg(po, vval(PFILT));
1154		}
1155
1156
1157	<	matchword(s1, s2)                       /* match white-delimited words */
1158	<	register char   *s1, *s2;
1157	>	static int
1158	>	matchword(                      /* match white-delimited words */
1159	>	char    *s1,
1160	>	char    *s2
1161	>	)
1162		{
1163		while (isspace(*s1)) s1++;
1164		while (isspace(*s2)) s2++;
#	Line 887 | Line 1169 | register char  *s1, *s2;
1169		}
1170
1171
1172	<	char *
1173	<	specview(vs)                            /* get proper view spec from vs */
1174	<	register char   *vs;
1172	>	static char *
1173	>	specview(                               /* get proper view spec from vs */
1174	>	char    *vs
1175	>	)
1176		{
1177		static char     vup[7][12] = {"-vu 0 0 -1","-vu 0 -1 0","-vu -1 0 0",
1178		"-vu 0 0 1", "-vu 1 0 0","-vu 0 1 0","-vu 0 0 1"};
1179		static char     viewopts[128];
1180	<	register char   *cp;
1180	>	char    *cp;
1181		int     xpos, ypos, zpos, viewtype, upax;
1182	<	register int    i;
1182	>	int     i;
1183		double  cent[3], dim[3], mult, d;
1184
1185		if (vs == NULL || *vs == '-')
#	Line 929 | Line 1212 | register char  *vs;
1212		} else if (*vs == 'z') {
1213		zpos = -1; vs++;
1214		}
1215	<	viewtype = 'v';
1216	<	if((*vs == 'v') | (*vs == 'l') | (*vs == 'a') | (*vs == 'h') | (*vs == 'c'))
1215	>	switch (*vs) {
1216	>	case VT_PER:
1217	>	case VT_PAR:
1218	>	case VT_ANG:
1219	>	case VT_HEM:
1220	>	case VT_PLS:
1221	>	case VT_CYL:
1222		viewtype = *vs++;
1223	+	break;
1224	+	default:
1225	+	viewtype = VT_PER;
1226	+	break;
1227	+	}
1228		cp = viewopts;
1229		if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {       /* got one! */
1230		*cp++ = '-'; *cp++ = 'v'; *cp++ = 't'; *cp++ = viewtype;
#	Line 946 | Line 1239 | register char  *vs;
1239		cent[i] += .5*dim[i];
1240		}
1241		mult = vlet(ZONE)=='E' ? 2. : .45 ;
1242	<	sprintf(cp, " -vp %.2g %.2g %.2g -vd %.2g %.2g %.2g",
1242	>	sprintf(cp, " -vp %.3g %.3g %.3g -vd %.3g %.3g %.3g",
1243		cent[0]+xpos*mult*dim[0],
1244		cent[1]+ypos*mult*dim[1],
1245		cent[2]+zpos*mult*dim[2],
#	Line 973 | Line 1266 | register char  *vs;
1266		}
1267		cp = addarg(cp, vup[upax+3]);
1268		switch (viewtype) {
1269	<	case 'v':
1269	>	case VT_PER:
1270		cp = addarg(cp, "-vh 45 -vv 45");
1271		break;
1272	<	case 'l':
1272	>	case VT_PAR:
1273		d = sqrt(dim[0]*dim[0]+dim[1]*dim[1]+dim[2]*dim[2]);
1274	<	sprintf(cp, " -vh %.2g -vv %.2g", d, d);
1274	>	sprintf(cp, " -vh %.3g -vv %.3g", d, d);
1275		cp += strlen(cp);
1276		break;
1277	<	case 'a':
1278	<	case 'h':
1277	>	case VT_ANG:
1278	>	case VT_HEM:
1279	>	case VT_PLS:
1280		cp = addarg(cp, "-vh 180 -vv 180");
1281		break;
1282	<	case 'c':
1282	>	case VT_CYL:
1283		cp = addarg(cp, "-vh 180 -vv 90");
1284		break;
1285		}
#	Line 993 | Line 1287 | register char  *vs;
1287		while (!isspace(*vs))           /* else skip id */
1288		if (!*vs++)
1289		return(NULL);
1290	<	if (upax) {                     /* specify up vector */
1290	>	if (upax) {                     /* prepend up vector */
1291		strcpy(cp, vup[upax+3]);
1292		cp += strlen(cp);
1293		}
#	Line 1011 | Line 1305 | register char  *vs;
1305		}
1306
1307
1308	<	char *
1309	<	getview(n, vn)                          /* get view n, or NULL if none */
1310	<	int     n;
1311	<	char    *vn;            /* returned view name */
1308	>	static char *
1309	>	getview(                                /* get view n, or NULL if none */
1310	>	int     n,
1311	>	char    *vn             /* returned view name */
1312	>	)
1313		{
1314	<	register char   *mv;
1314	>	char    *mv;
1315
1316		if (viewselect != NULL) {               /* command-line selected */
1317		if (n)                          /* only do one */
1318		return(NULL);
1319	+
1320	+	if (isint(viewselect)) {        /* view number? */
1321	+	n = atoi(viewselect)-1;
1322	+	goto numview;
1323	+	}
1324		if (viewselect[0] == '-') {     /* already specified */
1325	<	if (vn != NULL) *vn = '\0';
1325	>	if (vn != NULL)
1326	>	strcpy(vn, "0");
1327		return(viewselect);
1328		}
1329		if (vn != NULL) {
#	Line 1031 | Line 1332 | char   *vn;            /* returned view name */
1332		;
1333		*vn = '\0';
1334		}
1034	–	/* view number? */
1035	–	if (isint(viewselect))
1036	–	return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
1335		/* check list */
1336		while ((mv = nvalue(VIEWS, n++)) != NULL)
1337		if (matchword(viewselect, mv))
1338		return(specview(mv));
1339	+
1340		return(specview(viewselect));   /* standard view? */
1341		}
1342	+	numview:
1343		mv = nvalue(VIEWS, n);          /* use view n */
1344	<	if ((vn != NULL) & (mv != NULL)) {
1345	<	register char   *mv2 = mv;
1346	<	if (*mv2 != '-')
1344	>	if ((vn != NULL) & (mv != NULL))
1345	>	if (*mv != '-') {
1346	>	char    *mv2 = mv;
1347		while (*mv2 && !isspace(*mv2))
1348		*vn++ = *mv2++;
1349	<	*vn = '\0';
1350	<	}
1349	>	*vn = '\0';
1350	>	} else
1351	>	sprintf(vn, "%d", n+1);
1352	>
1353		return(specview(mv));
1354		}
1355
1356
1357	<	int
1358	<	myprintview(vopts, fp)                  /* print out selected view */
1359	<	register char   *vopts;
1360	<	FILE    *fp;
1357	>	static int
1358	>	myprintview(                    /* print out selected view */
1359	>	char    *vopts,
1360	>	FILE    *fp
1361	>	)
1362		{
1363		VIEW    vwr;
1364		char    buf[128];
1365	<	register char   *cp;
1365	>	char    *cp;
1366	>	#ifdef _WIN32
1367	>	/* XXX Should we allow something like this for all platforms? */
1368	>	/* XXX Or is it still required at all? */
1369		again:
1370	+	#endif
1371		if (vopts == NULL)
1372		return(-1);
1373		#ifdef _WIN32
#	Line 1083 | Line 1390 | again:
1390		}
1391
1392
1393	<	rview(opts, po)                         /* run rview with first view */
1394	<	char    *opts, *po;
1393	>	static void
1394	>	rvu(                            /* run rvu with first view */
1395	>	char    *opts,
1396	>	char    *po
1397	>	)
1398		{
1399		char    *vw;
1400		char    combuf[PATH_MAX];
#	Line 1093 | Line 1403 | char   *opts, *po;
1403		return;
1404		if (sayview)
1405		myprintview(vw, stdout);
1406	<	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1406	>	sprintf(combuf, "%s %s%s%s -R %s ", c_rvu, vw, opts, po, rifname);
1407	>	if (nprocs > 1)
1408	>	sprintf(combuf+strlen(combuf), "-n %d ", nprocs);
1409		if (rvdevice != NULL)
1410		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1411		if (vdef(EXPOSURE))
1412		sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1413		strcat(combuf, oct1name);
1414		if (runcom(combuf)) {           /* run it */
1415	<	fprintf(stderr, "%s: error running rview\n", progname);
1415	>	fprintf(stderr, "%s: error running %s\n", progname, c_rvu);
1416		quit(1);
1417		}
1418		}
1419
1420
1421	<	rpict(opts, po)                         /* run rpict and pfilt for each view */
1422	<	char    *opts, *po;
1421	>	static int
1422	>	syncf_done(                     /* check if an rpiece sync file is complete */
1423	>	char *sfname
1424	>	)
1425		{
1426	<	char    combuf[PATH_MAX];
1426	>	FILE    *fp = fopen(sfname, "r");
1427	>	int     todo = 1;
1428	>	int     x, y;
1429	>
1430	>	if (fp == NULL)
1431	>	return(0);
1432	>	if (fscanf(fp, "%d %d", &x, &y) != 2)
1433	>	goto checked;
1434	>	todo = x*y;             /* total number of tiles */
1435	>	if (fscanf(fp, "%d %d", &x, &y) != 2 || (x != 0) | (y != 0))
1436	>	goto checked;
1437	>	/* XXX assume no redundant tiles */
1438	>	while (fscanf(fp, "%d %d", &x, &y) == 2)
1439	>	if (!--todo)
1440	>	break;
1441	>	checked:
1442	>	fclose(fp);
1443	>	return(!todo);
1444	>	}
1445	>
1446	>
1447	>	static void
1448	>	rpict(                          /* run rpict and pfilt for each view */
1449	>	char    *opts,
1450	>	char    *po
1451	>	)
1452	>	{
1453	>	#define do_rpiece       (sfile[0]!='\0')
1454	>	char    combuf[5*PATH_MAX+512];
1455		char    rawfile[PATH_MAX], picfile[PATH_MAX];
1456		char    zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
1457	<	char    rppopt[128], *pfile = NULL;
1457	>	char    rppopt[32], sfile[PATH_MAX], *pfile = NULL;
1458		char    pfopts[128];
1459		char    vs[32], *vw;
1460		int     vn, mult;
1461		FILE    *fp;
1462		time_t  rfdt, pfdt;
1463	+	int     xres, yres;
1464	+	double  aspect;
1465	+	int     n;
1466		/* get pfilt options */
1467		pfiltopts(pfopts);
1468		/* get resolution, reporting */
#	Line 1132 | Line 1477 | char   *opts, *po;
1477		mult = 3;
1478		break;
1479		}
1480	<	{
1481	<	int     xres, yres;
1482	<	double  aspect;
1483	<	int     n;
1484	<	n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect);
1485	<	if (n == 3)
1486	<	sprintf(res, "-x %d -y %d -pa %.3f",
1487	<	mult*xres, mult*yres, aspect);
1488	<	else if (n) {
1489	<	if (n == 1) yres = xres;
1145	<	sprintf(res, "-x %d -y %d", mult*xres, mult*yres);
1146	<	} else
1147	<	badvalue(RESOLUTION);
1148	<	}
1480	>	n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect);
1481	>	if (n == 3)
1482	>	sprintf(res, "-x %d -y %d -pa %.3f",
1483	>	mult*xres, mult*yres, aspect);
1484	>	else if (n) {
1485	>	aspect = 1.;
1486	>	if (n == 1) yres = xres;
1487	>	sprintf(res, "-x %d -y %d", mult*xres, mult*yres);
1488	>	} else
1489	>	badvalue(RESOLUTION);
1490		rep[0] = '\0';
1491		if (vdef(REPORT)) {
1492		double  minutes;
1152	–	int     n;
1493		n = sscanf(vval(REPORT), "%lf %s", &minutes, rawfile);
1494		if (n == 2)
1495		sprintf(rep, " -t %d -e %s", (int)(minutes*60), rawfile);
#	Line 1159 | Line 1499 | char   *opts, *po;
1499		badvalue(REPORT);
1500		}
1501		/* set up parallel rendering */
1502	<	if ((nprocs > 1) & (!vdef(ZFILE))) {
1503	<	strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1504	<	pfile = rppopt+9;
1505	<	if (mktemp(pfile) == NULL)
1502	>	sfile[0] = '\0';
1503	>	if ((nprocs > 1) & !touchonly & !vdef(ZFILE) &&
1504	>	getview(0, vs) != NULL) {
1505	>	if (!strcmp(c_rpict, DEF_RPICT_PATH) &&
1506	>	getview(1, NULL) == NULL) {
1507	>	sprintf(sfile, "%s_%s_rpsync.txt",
1508	>	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE),
1509	>	vs);
1510	>	strcpy(rppopt, "-PP pfXXXXXX");
1511	>	} else {
1512	>	strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1513	>	}
1514	>	pfile = rppopt + strlen(rppopt) - 8;
1515	>	if (mktemp(pfile) == NULL) {
1516	>	if (do_rpiece) {
1517	>	fprintf(stderr, "%s: cannot create\n", pfile);
1518	>	quit(1);
1519	>	}
1520		pfile = NULL;
1521	+	}
1522		}
1523		vn = 0;                                 /* do each view */
1524		while ((vw = getview(vn++, vs)) != NULL) {
1525		if (sayview)
1526		myprintview(vw, stdout);
1527	<	if (!vs[0])
1173	<	sprintf(vs, "%d", vn);
1174	<	sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1527	>	sprintf(picfile, "%s_%s.hdr", vval(PICTURE), vs);
1528		if (vdef(ZFILE))
1529		sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1530		else
#	Line 1192 | Line 1545 | char   *opts, *po;
1545		touch(picfile);
1546		continue;
1547		}
1548	<	if (next_process()) {           /* parallel running? */
1548	>	/* parallel running? */
1549	>	if (do_rpiece) {
1550	>	if (rfdt < oct1date || !fdate(sfile)) {
1551	>	int     xdiv = 8+nprocs/3, ydiv = 8+nprocs/3;
1552	>	if (rfdt >= oct1date) {
1553	>	fprintf(stderr,
1554	>	"%s: partial output not created with %s\n", rawfile, c_rpiece);
1555	>	quit(1);
1556	>	}
1557	>	if (rfdt) {     /* start fresh */
1558	>	rmfile(rawfile);
1559	>	rfdt = 0;
1560	>	}
1561	>	if (!silent)
1562	>	printf("\techo %d %d > %s\n",
1563	>	xdiv, ydiv, sfile);
1564	>	if ((fp = fopen(sfile, "w")) == NULL) {
1565	>	fprintf(stderr, "%s: cannot create\n",
1566	>	sfile);
1567	>	quit(1);
1568	>	}
1569	>	fprintf(fp, "%d %d\n", xdiv, ydiv);
1570	>	fclose(fp);
1571	>	}
1572	>	} else if (next_process(0)) {
1573		if (pfile != NULL)
1574	<	sleep(20);
1574	>	sleep(10);
1575		continue;
1576	<	}
1576	>	} else if (!inchild())
1577	>	pfile = NULL;
1578		/* XXX Remember to call finish_process() */
1579		/* build rpict command */
1580	<	if (rfdt >= oct1date) {         /* recover */
1581	<	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1582	<	rep, po, opts, zopt, rawfile, oct1name);
1583	<	if (runcom(combuf))     /* run rpict */
1580	>	if (rfdt >= oct1date) {         /* already in progress */
1581	>	if (do_rpiece) {
1582	>	sprintf(combuf, "%s -R %s %s%s %s %s%s%s -o %s %s",
1583	>	c_rpiece, sfile, rppopt, rep, vw,
1584	>	res, opts, po, rawfile, oct1name);
1585	>	while (next_process(1)) {
1586	>	sleep(10);
1587	>	combuf[strlen(c_rpiece)+2] = 'F';
1588	>	}
1589	>	} else
1590	>	sprintf(combuf, "%s%s%s%s%s -ro %s %s", c_rpict,
1591	>	rep, opts, po, zopt, rawfile, oct1name);
1592	>	if (runcom(combuf))     /* run rpict/rpiece */
1593		goto rperror;
1594		} else {
1595		if (overture) {         /* run overture calculation */
1596		sprintf(combuf,
1597	<	"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1598	<	rep, vw, opts,
1597	>	"%s%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1598	>	c_rpict, rep, vw, opts,
1599		oct1name, overfile);
1600	<	if (runcom(combuf)) {
1601	<	fprintf(stderr,
1600	>	if (!do_rpiece || !next_process(0)) {
1601	>	if (runcom(combuf)) {
1602	>	fprintf(stderr,
1603		"%s: error in overture for view %s\n",
1604	<	progname, vs);
1605	<	quit(1);
1606	<	}
1604	>	progname, vs);
1605	>	quit(1);
1606	>	}
1607		#ifndef NULL_DEVICE
1608	<	rmfile(overfile);
1608	>	rmfile(overfile);
1609		#endif
1610	+	} else if (do_rpiece)
1611	+	sleep(20);
1612		}
1613	<	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1614	<	rep, vw, res, po, opts,
1615	<	zopt, oct1name, rawfile);
1616	<	if (pfile != NULL && inchild()) {
1617	<	/* rpict persistent mode */
1613	>	if (do_rpiece) {
1614	>	sprintf(combuf, "%s -F %s %s%s %s %s%s%s -o %s %s",
1615	>	c_rpiece, sfile, rppopt, rep, vw,
1616	>	res, opts, po, rawfile, oct1name);
1617	>	while (next_process(1))
1618	>	sleep(10);
1619	>	} else {
1620	>	sprintf(combuf, "%s%s %s %s%s%s%s %s > %s",
1621	>	c_rpict, rep, vw, res, opts, po,
1622	>	zopt, oct1name, rawfile);
1623	>	}
1624	>	if ((pfile != NULL) & !do_rpiece) {
1625		if (!silent)
1626		printf("\t%s\n", combuf);
1230	–	sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
1231	–	rep, rppopt, res, po, opts,
1232	–	oct1name, rawfile);
1627		fflush(stdout);
1628	+	sprintf(combuf, "%s%s %s %s%s%s %s > %s",
1629	+	c_rpict, rep, rppopt, res,
1630	+	opts, po, oct1name, rawfile);
1631		fp = popen(combuf, "w");
1632		if (fp == NULL)
1633		goto rperror;
1634		myprintview(vw, fp);
1635		if (pclose(fp))
1636		goto rperror;
1637	<	} else {                /* rpict normal mode */
1638	<	if (runcom(combuf))
1639	<	goto rperror;
1637	>	} else if (runcom(combuf))
1638	>	goto rperror;
1639	>	}
1640	>	if (do_rpiece) {                /* need to finish raw, first */
1641	>	finish_process();
1642	>	wait_process(1);
1643	>	if (!syncf_done(sfile)) {
1644	>	fprintf(stderr,
1645	>	"%s: %s did not complete rendering of view %s\n",
1646	>	progname, c_rpiece, vs);
1647	>	quit(1);
1648		}
1649		}
1650		if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1651		/* build pfilt command */
1652	<	if (mult > 1)
1653	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1654	<	pfopts, mult, mult, rawfile, picfile);
1652	>	if (do_rpiece)
1653	>	sprintf(combuf,
1654	>	"%s%s -x %d -y %d -p %.3f %s > %s",
1655	>	c_pfilt, pfopts, xres, yres, aspect,
1656	>	rawfile, picfile);
1657	>	else if (mult > 1)
1658	>	sprintf(combuf, "%s%s -x /%d -y /%d %s > %s",
1659	>	c_pfilt, pfopts, mult, mult,
1660	>	rawfile, picfile);
1661		else
1662	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1663	<	rawfile, picfile);
1662	>	sprintf(combuf, "%s%s %s > %s", c_pfilt,
1663	>	pfopts, rawfile, picfile);
1664		if (runcom(combuf)) {   /* run pfilt */
1665		fprintf(stderr,
1666		"%s: error filtering view %s\n\t%s removed\n",
#	Line 1260 | Line 1671 | char   *opts, *po;
1671		}
1672		/* remove/rename raw file */
1673		if (vdef(RAWFILE)) {
1674	<	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1674	>	sprintf(combuf, "%s_%s.hdr", vval(RAWFILE), vs);
1675		mvfile(rawfile, combuf);
1676		} else
1677		rmfile(rawfile);
1678	<	finish_process();               /* exit if child */
1678	>	if (do_rpiece)                  /* done with sync file */
1679	>	rmfile(sfile);
1680	>	else
1681	>	finish_process();       /* exit if child */
1682		}
1683		wait_process(1);                /* wait for children to finish */
1684	<	if (pfile != NULL) {            /* clean up rpict persistent mode */
1685	<	int     pid;
1684	>	if (pfile != NULL) {            /* clean up persistent rpict */
1685	>	RT_PID  pid;
1686		fp = fopen(pfile, "r");
1687		if (fp != NULL) {
1688		if (fscanf(fp, "%*s %d", &pid) != 1 ||
#	Line 1281 | Line 1695 | char   *opts, *po;
1695		rperror:
1696		fprintf(stderr, "%s: error rendering view %s\n", progname, vs);
1697		quit(1);
1698	+	#undef do_rpiece
1699		}
1700
1701
1702	<	touch(fn)                       /* update a file */
1703	<	char    *fn;
1702	>	static int
1703	>	touch(                  /* update a file */
1704	>	char    *fn
1705	>	)
1706		{
1707		if (!silent)
1708		printf("\ttouch %s\n", fn);
1709		if (!nprocs)
1710		return(0);
1294	–	#ifdef notused
1295	–	if (access(fn, F_OK) == -1)             /* create it */
1296	–	if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
1297	–	return(-1);
1298	–	#endif
1711		return(setfdate(fn, time((time_t *)NULL)));
1712		}
1713
1714
1715	<	runcom(cs)                      /* run command */
1716	<	char    *cs;
1715	>	static int
1716	>	runcom(                 /* run command */
1717	>	char    *cs
1718	>	)
1719		{
1720		if (!silent)            /* echo it */
1721		printf("\t%s\n", cs);
1722		if (!nprocs)
1723		return(0);
1724	<	fflush(stdout);         /* flush output and pass to shell */
1724	>	fflush(NULL);           /* flush output and pass to shell */
1725		return(system(cs));
1726		}
1727
1728
1729	<	rmfile(fn)                      /* remove a file */
1730	<	char    *fn;
1729	>	static int
1730	>	rmfile(                 /* remove a file */
1731	>	char    *fn
1732	>	)
1733		{
1734		if (!silent)
1735		printf("\t%s %s\n", DELCMD, fn);
#	Line 1323 | Line 1739 | char   *fn;
1739		}
1740
1741
1742	<	mvfile(fold, fnew)              /* move a file */
1743	<	char    *fold, *fnew;
1742	>	static int
1743	>	mvfile(         /* move a file */
1744	>	char    *fold,
1745	>	char    *fnew
1746	>	)
1747		{
1748		if (!silent)
1749		printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
#	Line 1335 | Line 1754 | char   *fold, *fnew;
1754
1755
1756		#ifdef RHAS_FORK_EXEC
1757	<	int
1758	<	next_process()                  /* fork the next process (max. nprocs) */
1757	>	static int
1758	>	next_process(int reserve)               /* fork the next process */
1759		{
1760	<	int     child_pid;
1760	>	RT_PID  child_pid;
1761
1762		if (nprocs <= 1)
1763		return(0);              /* it's us or no one */
#	Line 1347 | Line 1766 | next_process()                 /* fork the next process (max. nprocs
1766		progname);
1767		quit(1);
1768		}
1769	+	if (reserve > 0 && children_running >= nprocs-reserve)
1770	+	return(0);              /* caller holding back process(es) */
1771		if (children_running >= nprocs)
1772		wait_process(0);        /* wait for someone to finish */
1773	<	fflush(stdout);
1773	>	fflush(NULL);                   /* flush output */
1774		child_pid = fork();             /* split process */
1775		if (child_pid == 0) {           /* we're the child */
1776		children_running = -1;
1777	+	nprocs = 1;
1778		return(0);
1779		}
1780		if (child_pid > 0) {            /* we're the parent */
#	Line 1363 | Line 1785 | next_process()                 /* fork the next process (max. nprocs
1785		return(0);
1786		}
1787
1788	<	wait_process(all)                       /* wait for process(es) to finish */
1789	<	int     all;
1788	>	static void
1789	>	wait_process(                   /* wait for process(es) to finish */
1790	>	int     all
1791	>	)
1792		{
1793	<	int     ourstatus = 0;
1794	<	int     pid, status;
1793	>	int     ourstatus = 0, status;
1794	>	RT_PID  pid;
1795
1796		if (all)
1797		all = children_running;
#	Line 1391 | Line 1815 | int    all;
1815		quit(ourstatus);        /* bad status from child */
1816		}
1817		#else   /* ! RHAS_FORK_EXEC */
1818	<	int
1819	<	next_process()
1818	>	static int
1819	>	next_process(int reserve)
1820		{
1821		return(0);                      /* cannot start new process */
1822		}
1823	+	static void
1824		wait_process(all)
1825		int     all;
1826		{
#	Line 1403 | Line 1828 | int    all;
1828		}
1829		int
1830		kill(pid, sig) /* win|unix_process.c should also wait and kill */
1831	<	int pid, sig;
1831	>	RT_PID pid;
1832	>	int sig;
1833		{
1834		return 0;
1835		}
1836		#endif  /* ! RHAS_FORK_EXEC */
1837
1838	<	finish_process()                        /* exit a child process */
1838	>	static void
1839	>	finish_process(void)                    /* exit a child process */
1840		{
1841		if (!inchild())
1842		return;                 /* in parent -- noop */
1843		exit(0);
1844		}
1845
1419	–	#ifdef _WIN32
1420	–	setenv(vname, value)            /* set an environment variable */
1421	–	char    *vname, *value;
1422	–	{
1423	–	register char   *evp;
1846
1847	<	evp = bmalloc(strlen(vname)+strlen(value)+2);
1848	<	if (evp == NULL)
1849	<	syserr(progname);
1850	<	sprintf(evp, "%s=%s", vname, value);
1429	<	if (putenv(evp) != 0) {
1430	<	fprintf(stderr, "%s: out of environment space\n", progname);
1431	<	quit(1);
1432	<	}
1433	<	if (!silent)
1434	<	printf("set %s\n", evp);
1435	<	}
1436	<	#endif
1437	<
1438	<
1439	<	badvalue(vc)                    /* report bad variable value and exit */
1440	<	int     vc;
1847	>	static void
1848	>	badvalue(                       /* report bad variable value and exit */
1849	>	int     vc
1850	>	)
1851		{
1852		fprintf(stderr, "%s: bad value for variable '%s'\n",
1853		progname, vnam(vc));
#	Line 1445 | Line 1855 | int    vc;
1855		}
1856
1857
1858	<	syserr(s)                       /* report a system error and exit */
1859	<	char    *s;
1858	>	static void
1859	>	syserr(                 /* report a system error and exit */
1860	>	char    *s
1861	>	)
1862		{
1863		perror(s);
1864		quit(1);

Diff Legend

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