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.66 by greg, Thu Jul 3 15:00:19 2003 UTC vs.
Revision 2.105 by greg, Fri Feb 25 06:51:51 2011 UTC

#	Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
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"
18
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	+	#endif
28	+
29		/* variables (alphabetical by name) */
30		#define AMBFILE         0               /* ambient file name */
31		#define DETAIL          1               /* level of scene detail */
#	Line 35 | Line 47 | static const char      RCSid[] = "$Id$";
47		#define RENDER          17              /* rendering options */
48		#define REPORT          18              /* report frequency and errfile */
49		#define RESOLUTION      19              /* maximum picture resolution */
50	<	#define SCENE           20              /* scene files */
51	<	#define UP              21              /* view up (X, Y or Z) */
52	<	#define VARIABILITY     22              /* level of light variability */
53	<	#define VIEWS           23              /* view(s) for picture(s) */
54	<	#define ZFILE           24              /* distance file root name */
55	<	#define ZONE            25              /* simulation zone */
50	>	#define RPICT           20              /* rpict parameters */
51	>	#define RVU             21              /* rvu parameters */
52	>	#define SCENE           22              /* scene files */
53	>	#define UP              23              /* view up (X, Y or Z) */
54	>	#define VARIABILITY     24              /* level of light variability */
55	>	#define VIEWS           25              /* view(s) for picture(s) */
56	>	#define ZFILE           26              /* distance file root name */
57	>	#define ZONE            27              /* simulation zone */
58		/* total number of variables */
59	<	int NVARS = 26;
59	>	int NVARS = 28;
60
61		VARIABLE        vv[] = {                /* variable-value pairs */
62		{"AMBFILE",     3,      0,      NULL,   onevalue},
#	Line 65 | Line 79 | VARIABLE       vv[] = {                /* variable-value pairs */
79		{"render",      3,      0,      NULL,   catvalues},
80		{"REPORT",      3,      0,      NULL,   onevalue},
81		{"RESOLUTION",  3,      0,      NULL,   onevalue},
82	+	{"rpict",       3,      0,      NULL,   catvalues},
83	+	{"rvu",         3,      0,      NULL,   catvalues},
84		{"scene",       3,      0,      NULL,   catvalues},
85		{"UP",          2,      0,      NULL,   onevalue},
86		{"VARIABILITY", 3,      0,      NULL,   qualvalue},
#	Line 80 | Line 96 | char   overfile[] = NULL_DEVICE;
96		char    overfile[] = "overture.unf";
97		#endif
98
83	–	extern time_t   time();
99
100		time_t  scenedate;              /* date of latest scene or object file */
101		time_t  octreedate;             /* date of octree */
#	Line 98 | Line 113 | int    silent = 0;             /* do work silently */
113		int     touchonly = 0;          /* touch files only */
114		int     nprocs = 1;             /* maximum executing processes */
115		int     sayview = 0;            /* print view out */
116	<	char    *rvdevice = NULL;       /* rview output device */
116	>	char    *rvdevice = NULL;       /* rvu output device */
117		char    *viewselect = NULL;     /* specific view only */
118
119	+	#define DEF_RPICT_PATH  "rpict"         /* default rpict path */
120	+
121	+	/* command paths */
122	+	char    c_oconv[256] = "oconv";
123	+	char    c_mkillum[256] = "mkillum";
124	+	char    c_rvu[256] = "rvu";
125	+	char    c_rpict[256] = DEF_RPICT_PATH;
126	+	char    c_rpiece[] = "rpiece";
127	+	char    c_pfilt[256] = "pfilt";
128	+
129		int     overture = 0;           /* overture calculation needed */
130
131		int     children_running = 0;   /* set negative in children */
#	Line 110 | Line 135 | char   *rifname;               /* global rad input file name */
135
136		char    radname[PATH_MAX];      /* root Radiance file name */
137
138	+	#define inchild()       (children_running < 0)
139
140	<	main(argc, argv)
141	<	int     argc;
142	<	char    *argv[];
140	>	static void rootname(char       *rn, char       *fn);
141	>	static time_t checklast(char    *fnames);
142	>	static char * newfname(char     *orig, int      pred);
143	>	static void checkfiles(void);
144	>	static void getoctcube(double   org[3], double  *sizp);
145	>	static void setdefaults(void);
146	>	static void oconv(void);
147	>	static char * addarg(char       *op, char       *arg);
148	>	static void oconvopts(char      *oo);
149	>	static void mkillumopts(char    *mo);
150	>	static void checkambfile(void);
151	>	static double ambval(void);
152	>	static void renderopts(char     *op, char       *po);
153	>	static void lowqopts(char       *op, char       *po);
154	>	static void medqopts(char       *op, char       *po);
155	>	static void hiqopts(char        *op, char       *po);
156	>	static void xferopts(char       *ro);
157	>	static void pfiltopts(char      *po);
158	>	static int matchword(char       *s1, char       *s2);
159	>	static char * specview(char     *vs);
160	>	static char * getview(int       n, char *vn);
161	>	static int myprintview(char     *vopts, FILE    *fp);
162	>	static void rvu(char    *opts, char     *po);
163	>	static void rpict(char  *opts, char     *po);
164	>	static int touch(char   *fn);
165	>	static int runcom(char  *cs);
166	>	static int rmfile(char  *fn);
167	>	static int mvfile(char  *fold, char     *fnew);
168	>	static int next_process(int     reserve);
169	>	static void wait_process(int    all);
170	>	static void finish_process(void);
171	>	static void badvalue(int        vc);
172	>	static void syserr(char *s);
173	>
174	>
175	>	int
176	>	main(
177	>	int     argc,
178	>	char    *argv[]
179	>	)
180		{
181		char    ropts[512];
182		char    popts[64];
#	Line 186 | Line 249 | char   *argv[];
249		renderopts(ropts, popts);
250		xferopts(ropts);
251		if (rvdevice != NULL)
252	<	rview(ropts, popts);
252	>	rvu(ropts, popts);
253		else
254		rpict(ropts, popts);
255		quit(0);
#	Line 195 | Line 258 | userr:
258		"Usage: %s [-w][-s][-n|-N npr][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
259		progname);
260		quit(1);
261	+	return 1; /* pro forma return */
262		}
263
264
265	<	rootname(rn, fn)                /* remove tail from end of fn */
266	<	register char   *rn, *fn;
265	>	static void
266	>	rootname(               /* remove tail from end of fn */
267	>	register char   *rn,
268	>	register char   *fn
269	>	)
270		{
271		char    *tp, *dp;
272
273	<	for (tp = NULL, dp = rn; *rn = *fn++; rn++)
273	>	for (tp = NULL, dp = rn; (*rn = *fn++); rn++)
274		if (ISDIRSEP(*rn))
275		dp = rn;
276		else if (*rn == '.')
#	Line 213 | Line 280 | register char  *rn, *fn;
280		}
281
282
283	<	time_t
284	<	checklast(fnames)                       /* check files and find most recent */
285	<	register char   *fnames;
283	>	static time_t
284	>	checklast(                      /* check files and find most recent */
285	>	register char   *fnames
286	>	)
287		{
288		char    thisfile[PATH_MAX];
289		time_t  thisdate, lastdate = 0;
#	Line 224 | Line 292 | register char  *fnames;
292		return(0);
293		while ((fnames = nextword(thisfile, PATH_MAX, fnames)) != NULL) {
294		if (thisfile[0] == '!' ||
295	<	(thisfile[0] == '\\' && thisfile[1] == '!'))
295	>	(thisfile[0] == '\\' && thisfile[1] == '!')) {
296	>	if (!lastdate)
297	>	lastdate = 1;
298		continue;
299	+	}
300		if (!(thisdate = fdate(thisfile)))
301		syserr(thisfile);
302		if (thisdate > lastdate)
#	Line 235 | Line 306 | register char  *fnames;
306		}
307
308
309	<	char *
310	<	newfname(orig, pred)            /* create modified file name */
311	<	char    *orig;
312	<	int     pred;
309	>	static char *
310	>	newfname(               /* create modified file name */
311	>	char    *orig,
312	>	int     pred
313	>	)
314		{
315		register char   *cp;
316		register int    n;
#	Line 260 | Line 332 | int    pred;
332		}
333
334
335	<	checkfiles()                    /* check for existence and modified times */
335	>	static void
336	>	checkfiles(void)                        /* check for existence and modified times */
337		{
338		time_t  objdate;
339
#	Line 295 | Line 368 | checkfiles()                   /* check for existence and modified tim
368		}
369
370
371	<	getoctcube(org, sizp)           /* get octree bounding cube */
372	<	double  org[3], *sizp;
371	>	static void
372	>	getoctcube(             /* get octree bounding cube */
373	>	double  org[3],
374	>	double  *sizp
375	>	)
376		{
301	–	extern FILE     *popen();
377		static double   oorg[3], osiz = 0.;
378		double  min[3], max[3];
379		char    buf[1024];
380		FILE    *fp;
381		register int    i;
382
383	<	if (osiz <= FTINY)
383	>	if (osiz <= FTINY) {
384		if (!nprocs && fdate(oct1name) <
385		(scenedate>illumdate?scenedate:illumdate)) {
386		/* run getbbox */
#	Line 341 | Line 416 | double org[3], *sizp;
416		}
417		pclose(fp);
418		}
419	+	}
420		org[0] = oorg[0]; org[1] = oorg[1]; org[2] = oorg[2]; *sizp = osiz;
421		}
422
423
424	<	setdefaults()                   /* set default values for unassigned var's */
424	>	static void
425	>	setdefaults(void)                       /* set default values for unassigned var's */
426		{
427		double  org[3], lim[3], size;
428		char    buf[128];
#	Line 402 | Line 479 | setdefaults()                  /* set default values for unassigned v
479		}
480
481
482	<	oconv()                         /* run oconv and mkillum if necessary */
482	>	static void
483	>	oconv(void)                             /* run oconv and mkillum if necessary */
484		{
485		static char     illumtmp[] = "ilXXXXXX";
486	<	char    combuf[PATH_MAX], ocopts[64], mkopts[64];
486	>	char    combuf[PATH_MAX], ocopts[64], mkopts[1024];
487
488		oconvopts(ocopts);              /* get options */
489		if (octreedate < scenedate) {   /* check date on original octree */
#	Line 413 | Line 491 | oconv()                                /* run oconv and mkillum if necessary */
491		touch(vval(OCTREE));
492		else {                          /* build command */
493		if (vdef(MATERIAL))
494	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
495	<	vval(MATERIAL), vval(SCENE),
496	<	vval(OCTREE));
494	>	sprintf(combuf, "%s%s %s %s > %s", c_oconv,
495	>	ocopts, vval(MATERIAL),
496	>	vval(SCENE), vval(OCTREE));
497		else
498	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
498	>	sprintf(combuf, "%s%s %s > %s", c_oconv, ocopts,
499		vval(SCENE), vval(OCTREE));
500
501		if (runcom(combuf)) {           /* run it */
#	Line 434 | Line 512 | oconv()                                /* run oconv and mkillum if necessary */
512		}
513		if (oct1name == vval(OCTREE))           /* no mkillum? */
514		oct1date = octreedate > matdate ? octreedate : matdate;
515	<	if (oct1date >= octreedate & oct1date >= matdate
516	<	& oct1date >= illumdate)        /* all done */
515	>	if ((oct1date >= octreedate) & (oct1date >= matdate)
516	>	& (oct1date >= illumdate))      /* all done */
517		return;
518		/* make octree0 */
519	<	if (oct0date < scenedate | oct0date < illumdate) {
519	>	if ((oct0date < scenedate) | (oct0date < illumdate)) {
520		if (touchonly && oct0date)
521		touch(oct0name);
522		else {                          /* build command */
523		if (octreedate)
524	<	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
525	<	vval(OCTREE), vval(ILLUM), oct0name);
524	>	sprintf(combuf, "%s%s -i %s %s > %s", c_oconv,
525	>	ocopts, vval(OCTREE),
526	>	vval(ILLUM), oct0name);
527		else if (vdef(MATERIAL))
528	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
529	<	vval(MATERIAL), vval(ILLUM), oct0name);
451	<	else
452	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
528	>	sprintf(combuf, "%s%s %s %s > %s", c_oconv,
529	>	ocopts, vval(MATERIAL),
530		vval(ILLUM), oct0name);
531	+	else
532	+	sprintf(combuf, "%s%s %s > %s", c_oconv,
533	+	ocopts, vval(ILLUM), oct0name);
534		if (runcom(combuf)) {           /* run it */
535		fprintf(stderr,
536		"%s: error generating octree\n\t%s removed\n",
#	Line 470 | Line 550 | oconv()                                /* run oconv and mkillum if necessary */
550		else {
551		mkillumopts(mkopts);            /* build mkillum command */
552		mktemp(illumtmp);
553	<	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
553	>	sprintf(combuf, "%s%s %s \"<\" %s > %s", c_mkillum, mkopts,
554		oct0name, vval(ILLUM), illumtmp);
555		if (runcom(combuf)) {                   /* run it */
556	<	fprintf(stderr, "%s: error running mkillum\n",
557	<	progname);
556	>	fprintf(stderr, "%s: error running %s\n",
557	>	progname, c_mkillum);
558		unlink(illumtmp);
559		quit(1);
560		}
561		/* make octree1 (frozen) */
562		if (octreedate)
563	<	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
564	<	vval(OCTREE), illumtmp, oct1name);
563	>	sprintf(combuf, "%s%s -f -i %s %s > %s", c_oconv,
564	>	ocopts, vval(OCTREE), illumtmp, oct1name);
565		else if (vdef(MATERIAL))
566	<	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
567	<	vval(MATERIAL), illumtmp, oct1name);
566	>	sprintf(combuf, "%s%s -f %s %s > %s", c_oconv,
567	>	ocopts, vval(MATERIAL), illumtmp, oct1name);
568		else
569	<	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
569	>	sprintf(combuf, "%s%s -f %s > %s", c_oconv, ocopts,
570		illumtmp, oct1name);
571		if (runcom(combuf)) {           /* run it */
572		fprintf(stderr,
#	Line 504 | Line 584 | oconv()                                /* run oconv and mkillum if necessary */
584		}
585
586
587	<	char *
588	<	addarg(op, arg)                         /* add argument and advance pointer */
589	<	register char   *op, *arg;
587	>	static char *
588	>	addarg(                         /* append argument and advance pointer */
589	>	register char   *op,
590	>	register char   *arg
591	>	)
592		{
593	+	while (*op)
594	+	op++;
595		*op = ' ';
596	<	while (*++op = *arg++)
596	>	while ( (*++op = *arg++) )
597		;
598		return(op);
599		}
600
601
602	<	oconvopts(oo)                           /* get oconv options */
603	<	register char   *oo;
602	>	static void
603	>	oconvopts(                              /* get oconv options */
604	>	register char   *oo
605	>	)
606		{
607		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
608
609		*oo = '\0';
610		if (vdef(OCONV))
611	<	addarg(oo, vval(OCONV));
611	>	if (vval(OCONV)[0] != '-') {
612	>	atos(c_oconv, sizeof(c_oconv), vval(OCONV));
613	>	oo = addarg(oo, sskip2(vval(OCONV), 1));
614	>	} else
615	>	oo = addarg(oo, vval(OCONV));
616		}
617
618
619	<	mkillumopts(mo)                         /* get mkillum options */
620	<	register char   *mo;
619	>	static void
620	>	mkillumopts(                            /* get mkillum options */
621	>	char    *mo
622	>	)
623		{
624		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
625
626	<	*mo = '\0';
626	>	if (nprocs > 1)
627	>	sprintf(mo, " -n %d", nprocs);
628	>	else
629	>	*mo = '\0';
630		if (vdef(MKILLUM))
631	<	addarg(mo, vval(MKILLUM));
631	>	if (vval(MKILLUM)[0] != '-') {
632	>	atos(c_mkillum, sizeof(c_mkillum), vval(MKILLUM));
633	>	mo = addarg(mo, sskip2(vval(MKILLUM), 1));
634	>	} else
635	>	mo = addarg(mo, vval(MKILLUM));
636		}
637
638
639	<	checkambfile()                  /* check date on ambient file */
639	>	static void
640	>	checkambfile(void)                      /* check date on ambient file */
641		{
642		time_t  afdate;
643
#	Line 545 | Line 645 | checkambfile()                 /* check date on ambient file */
645		return;
646		if (!(afdate = fdate(vval(AMBFILE))))
647		return;
648	<	if (oct1date > afdate)
648	>	if (oct1date > afdate) {
649		if (touchonly)
650		touch(vval(AMBFILE));
651		else
652		rmfile(vval(AMBFILE));
653	+	}
654		}
655
656
657	<	double
658	<	ambval()                                /* compute ambient value */
657	>	static double
658	>	ambval(void)                            /* compute ambient value */
659		{
660		if (vdef(EXPOSURE)) {
661		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
#	Line 566 | Line 667 | ambval()                               /* compute ambient value */
667		if (vlet(ZONE) == 'I')
668		return(.01);
669		badvalue(ZONE);
670	+	return 0; /* pro forma return */
671		}
672
673
674	<	renderopts(op, po)                      /* set rendering options */
675	<	char    *op, *po;
674	>	static void
675	>	renderopts(                     /* set rendering options */
676	>	char    *op,
677	>	char    *po
678	>	)
679		{
680		switch(vscale(QUALITY)) {
681		case LOW:
#	Line 583 | Line 688 | char   *op, *po;
688		hiqopts(op, po);
689		break;
690		}
691	+	if (vdef(RENDER))
692	+	op = addarg(op, vval(RENDER));
693	+	if (rvdevice != NULL) {
694	+	if (vdef(RVU))
695	+	if (vval(RVU)[0] != '-') {
696	+	atos(c_rvu, sizeof(c_rvu), vval(RVU));
697	+	po = addarg(po, sskip2(vval(RVU), 1));
698	+	} else
699	+	po = addarg(po, vval(RVU));
700	+	} else {
701	+	if (vdef(RPICT))
702	+	if (vval(RPICT)[0] != '-') {
703	+	atos(c_rpict, sizeof(c_rpict), vval(RPICT));
704	+	po = addarg(po, sskip2(vval(RPICT), 1));
705	+	} else
706	+	po = addarg(po, vval(RPICT));
707	+	}
708		}
709
710
711	<	lowqopts(op, po)                        /* low quality rendering options */
712	<	register char   *op;
713	<	char    *po;
711	>	static void
712	>	lowqopts(                       /* low quality rendering options */
713	>	register char   *op,
714	>	char    *po
715	>	)
716		{
717		double  d, org[3], siz[3];
718
#	Line 598 | Line 722 | char   *po;
722		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
723		badvalue(ZONE);
724		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
725	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
725	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
726		badvalue(ZONE);
727		getoctcube(org, &d);
728		d *= 3./(siz[0]+siz[1]+siz[2]);
#	Line 606 | Line 730 | char   *po;
730		case LOW:
731		po = addarg(po, "-ps 16");
732		op = addarg(op, "-dp 64");
733	<	sprintf(op, " -ar %d", (int)(4*d));
733	>	sprintf(op, " -ar %d", (int)(8*d));
734		op += strlen(op);
735		break;
736		case MEDIUM:
737		po = addarg(po, "-ps 8");
738		op = addarg(op, "-dp 128");
739	<	sprintf(op, " -ar %d", (int)(8*d));
739	>	sprintf(op, " -ar %d", (int)(16*d));
740		op += strlen(op);
741		break;
742		case HIGH:
743		po = addarg(po, "-ps 4");
744		op = addarg(op, "-dp 256");
745	<	sprintf(op, " -ar %d", (int)(16*d));
745	>	sprintf(op, " -ar %d", (int)(32*d));
746		op += strlen(op);
747		break;
748		}
#	Line 627 | Line 751 | char   *po;
751		op = addarg(op, "-ds .4");
752		else
753		op = addarg(op, "-ds 0");
754	<	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5");
754	>	op = addarg(op, "-dt .2 -dc .25 -dr 0 -ss 0 -st .5");
755		if (vdef(AMBFILE)) {
756		sprintf(op, " -af %s", vval(AMBFILE));
757		op += strlen(op);
#	Line 635 | Line 759 | char   *po;
759		overture = 0;
760		switch (vscale(VARIABILITY)) {
761		case LOW:
762	<	op = addarg(op, "-aa .4 -ad 64");
762	>	op = addarg(op, "-aa .3 -ad 256");
763		break;
764		case MEDIUM:
765	<	op = addarg(op, "-aa .3 -ad 128");
765	>	op = addarg(op, "-aa .25 -ad 512");
766		break;
767		case HIGH:
768	<	op = addarg(op, "-aa .25 -ad 256");
768	>	op = addarg(op, "-aa .2 -ad 1024");
769		break;
770		}
771		op = addarg(op, "-as 0");
772		d = ambval();
773		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
774		op += strlen(op);
775	<	op = addarg(op, "-lr 3 -lw .02");
652	<	if (vdef(RENDER))
653	<	op = addarg(op, vval(RENDER));
775	>	op = addarg(op, "-lr 6 -lw .003");
776		}
777
778
779	<	medqopts(op, po)                        /* medium quality rendering options */
780	<	register char   *op;
781	<	char    *po;
779	>	static void
780	>	medqopts(                       /* medium quality rendering options */
781	>	register char   *op,
782	>	char    *po
783	>	)
784		{
785		double  d, org[3], siz[3], asz;
786
#	Line 666 | Line 790 | char   *po;
790		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
791		badvalue(ZONE);
792		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
793	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
793	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
794		badvalue(ZONE);
795		getoctcube(org, &d);
796		asz = (siz[0]+siz[1]+siz[2])/3.;
#	Line 675 | Line 799 | char   *po;
799		case LOW:
800		po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
801		op = addarg(op, "-dp 256");
802	<	sprintf(op, " -ar %d", (int)(8*d));
802	>	sprintf(op, " -ar %d", (int)(16*d));
803		op += strlen(op);
804		sprintf(op, " -ms %.2g", asz/20.);
805		op += strlen(op);
#	Line 683 | Line 807 | char   *po;
807		case MEDIUM:
808		po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
809		op = addarg(op, "-dp 512");
810	<	sprintf(op, " -ar %d", (int)(16*d));
810	>	sprintf(op, " -ar %d", (int)(32*d));
811		op += strlen(op);
812		sprintf(op, " -ms %.2g", asz/40.);
813		op += strlen(op);
#	Line 691 | Line 815 | char   *po;
815		case HIGH:
816		po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
817		op = addarg(op, "-dp 1024");
818	<	sprintf(op, " -ar %d", (int)(32*d));
818	>	sprintf(op, " -ar %d", (int)(64*d));
819		op += strlen(op);
820		sprintf(op, " -ms %.2g", asz/80.);
821		op += strlen(op);
#	Line 699 | Line 823 | char   *po;
823		}
824		po = addarg(po, "-pt .08");
825		if (vbool(PENUMBRAS))
826	<	op = addarg(op, "-ds .2 -dj .5");
826	>	op = addarg(op, "-ds .2 -dj .9");
827		else
828		op = addarg(op, "-ds .3");
829	<	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
830	<	if (overture = vint(INDIRECT)) {
829	>	op = addarg(op, "-dt .1 -dc .5 -dr 1 -ss 1 -st .1");
830	>	if ( (overture = vint(INDIRECT)) ) {
831		sprintf(op, " -ab %d", overture);
832		op += strlen(op);
833		}
#	Line 714 | Line 838 | char   *po;
838		overture = 0;
839		switch (vscale(VARIABILITY)) {
840		case LOW:
841	<	op = addarg(op, "-aa .25 -ad 196 -as 0");
841	>	op = addarg(op, "-aa .2 -ad 329 -as 42");
842		break;
843		case MEDIUM:
844	<	op = addarg(op, "-aa .2 -ad 400 -as 64");
844	>	op = addarg(op, "-aa .15 -ad 800 -as 128");
845		break;
846		case HIGH:
847	<	op = addarg(op, "-aa .15 -ad 768 -as 196");
847	>	op = addarg(op, "-aa .1 -ad 1536 -as 392");
848		break;
849		}
850		d = ambval();
851		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
852		op += strlen(op);
853	<	op = addarg(op, "-lr 6 -lw .002");
730	<	if (vdef(RENDER))
731	<	op = addarg(op, vval(RENDER));
853	>	op = addarg(op, "-lr 8 -lw 1e-4");
854		}
855
856
857	<	hiqopts(op, po)                         /* high quality rendering options */
858	<	register char   *op;
859	<	char    *po;
857	>	static void
858	>	hiqopts(                                /* high quality rendering options */
859	>	register char   *op,
860	>	char    *po
861	>	)
862		{
863		double  d, org[3], siz[3], asz;
864
#	Line 744 | Line 868 | char   *po;
868		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
869		badvalue(ZONE);
870		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
871	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
871	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
872		badvalue(ZONE);
873		getoctcube(org, &d);
874		asz = (siz[0]+siz[1]+siz[2])/3.;
#	Line 753 | Line 877 | char   *po;
877		case LOW:
878		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
879		op = addarg(op, "-dp 1024");
880	<	sprintf(op, " -ar %d", (int)(16*d));
880	>	sprintf(op, " -ar %d", (int)(32*d));
881		op += strlen(op);
882		sprintf(op, " -ms %.2g", asz/40.);
883		op += strlen(op);
#	Line 761 | Line 885 | char   *po;
885		case MEDIUM:
886		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
887		op = addarg(op, "-dp 2048");
888	<	sprintf(op, " -ar %d", (int)(32*d));
888	>	sprintf(op, " -ar %d", (int)(64*d));
889		op += strlen(op);
890		sprintf(op, " -ms %.2g", asz/80.);
891		op += strlen(op);
#	Line 769 | Line 893 | char   *po;
893		case HIGH:
894		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
895		op = addarg(op, "-dp 4096");
896	<	sprintf(op, " -ar %d", (int)(64*d));
896	>	sprintf(op, " -ar %d", (int)(128*d));
897		op += strlen(op);
898		sprintf(op, " -ms %.2g", asz/160.);
899		op += strlen(op);
#	Line 777 | Line 901 | char   *po;
901		}
902		po = addarg(po, "-pt .04");
903		if (vbool(PENUMBRAS))
904	<	op = addarg(op, "-ds .1 -dj .65");
904	>	op = addarg(op, "-ds .1 -dj .9");
905		else
906		op = addarg(op, "-ds .2");
907	<	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
907	>	op = addarg(op, "-dt .05 -dc .75 -dr 3 -ss 16 -st .01");
908		sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
909		op += strlen(op);
910		if (vdef(AMBFILE)) {
#	Line 790 | Line 914 | char   *po;
914		overture = 0;
915		switch (vscale(VARIABILITY)) {
916		case LOW:
917	<	op = addarg(op, "-aa .15 -ad 256 -as 0");
917	>	op = addarg(op, "-aa .125 -ad 512 -as 64");
918		break;
919		case MEDIUM:
920	<	op = addarg(op, "-aa .125 -ad 512 -as 256");
920	>	op = addarg(op, "-aa .1 -ad 1536 -as 768");
921		break;
922		case HIGH:
923	<	op = addarg(op, "-aa .08 -ad 1024 -as 512");
923	>	op = addarg(op, "-aa .075 -ad 4096 -as 2048");
924		break;
925		}
926		d = ambval();
927		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
928		op += strlen(op);
929	<	op = addarg(op, "-lr 12 -lw .0005");
806	<	if (vdef(RENDER))
807	<	op = addarg(op, vval(RENDER));
929	>	op = addarg(op, "-lr 12 -lw 1e-5");
930		}
931
932
933	<	xferopts(ro)                            /* transfer options if indicated */
934	<	char    *ro;
933	>	static void
934	>	xferopts(                               /* transfer options if indicated */
935	>	char    *ro
936	>	)
937		{
938		int     fd, n;
939		register char   *cp;
#	Line 839 | Line 963 | char   *ro;
963		}
964
965
966	<	pfiltopts(po)                           /* get pfilt options */
967	<	register char   *po;
966	>	static void
967	>	pfiltopts(                              /* get pfilt options */
968	>	register char   *po
969	>	)
970		{
971		*po = '\0';
972		if (vdef(EXPOSURE)) {
#	Line 856 | Line 982 | register char  *po;
982		break;
983		}
984		if (vdef(PFILT))
985	<	po = addarg(po, vval(PFILT));
985	>	if (vval(PFILT)[0] != '-') {
986	>	atos(c_pfilt, sizeof(c_pfilt), vval(PFILT));
987	>	po = addarg(po, sskip2(vval(PFILT), 1));
988	>	} else
989	>	po = addarg(po, vval(PFILT));
990		}
991
992
993	<	matchword(s1, s2)                       /* match white-delimited words */
994	<	register char   *s1, *s2;
993	>	static int
994	>	matchword(                      /* match white-delimited words */
995	>	register char   *s1,
996	>	register char   *s2
997	>	)
998		{
999		while (isspace(*s1)) s1++;
1000		while (isspace(*s2)) s2++;
#	Line 872 | Line 1005 | register char  *s1, *s2;
1005		}
1006
1007
1008	<	char *
1009	<	specview(vs)                            /* get proper view spec from vs */
1010	<	register char   *vs;
1008	>	static char *
1009	>	specview(                               /* get proper view spec from vs */
1010	>	register char   *vs
1011	>	)
1012		{
1013		static char     vup[7][12] = {"-vu 0 0 -1","-vu 0 -1 0","-vu -1 0 0",
1014		"-vu 0 0 1", "-vu 1 0 0","-vu 0 1 0","-vu 0 0 1"};
#	Line 892 | Line 1026 | register char  *vs;
1026		upax = 1-'X'+UPPER(vval(UP)[1]);
1027		else
1028		upax = 1-'X'+vlet(UP);
1029	<	if (upax < 1 | upax > 3)
1029	>	if ((upax < 1) | (upax > 3))
1030		badvalue(UP);
1031		if (vval(UP)[0] == '-')
1032		upax = -upax;
#	Line 914 | Line 1048 | register char  *vs;
1048		} else if (*vs == 'z') {
1049		zpos = -1; vs++;
1050		}
1051	<	viewtype = 'v';
1052	<	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c')
1051	>	switch (*vs) {
1052	>	case VT_PER:
1053	>	case VT_PAR:
1054	>	case VT_ANG:
1055	>	case VT_HEM:
1056	>	case VT_PLS:
1057	>	case VT_CYL:
1058		viewtype = *vs++;
1059	+	break;
1060	+	default:
1061	+	viewtype = VT_PER;
1062	+	break;
1063	+	}
1064		cp = viewopts;
1065		if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {       /* got one! */
1066		*cp++ = '-'; *cp++ = 'v'; *cp++ = 't'; *cp++ = viewtype;
#	Line 958 | Line 1102 | register char  *vs;
1102		}
1103		cp = addarg(cp, vup[upax+3]);
1104		switch (viewtype) {
1105	<	case 'v':
1105	>	case VT_PER:
1106		cp = addarg(cp, "-vh 45 -vv 45");
1107		break;
1108	<	case 'l':
1108	>	case VT_PAR:
1109		d = sqrt(dim[0]*dim[0]+dim[1]*dim[1]+dim[2]*dim[2]);
1110		sprintf(cp, " -vh %.2g -vv %.2g", d, d);
1111		cp += strlen(cp);
1112		break;
1113	<	case 'a':
1114	<	case 'h':
1113	>	case VT_ANG:
1114	>	case VT_HEM:
1115	>	case VT_PLS:
1116		cp = addarg(cp, "-vh 180 -vv 180");
1117		break;
1118	<	case 'c':
1118	>	case VT_CYL:
1119		cp = addarg(cp, "-vh 180 -vv 90");
1120		break;
1121		}
#	Line 978 | Line 1123 | register char  *vs;
1123		while (!isspace(*vs))           /* else skip id */
1124		if (!*vs++)
1125		return(NULL);
1126	<	if (upax) {                     /* specify up vector */
1126	>	if (upax) {                     /* prepend up vector */
1127		strcpy(cp, vup[upax+3]);
1128		cp += strlen(cp);
1129		}
#	Line 996 | Line 1141 | register char  *vs;
1141		}
1142
1143
1144	<	char *
1145	<	getview(n, vn)                          /* get view n, or NULL if none */
1146	<	int     n;
1147	<	char    *vn;            /* returned view name */
1144	>	static char *
1145	>	getview(                                /* get view n, or NULL if none */
1146	>	int     n,
1147	>	char    *vn             /* returned view name */
1148	>	)
1149		{
1150		register char   *mv;
1151
1152		if (viewselect != NULL) {               /* command-line selected */
1153		if (n)                          /* only do one */
1154		return(NULL);
1155	+
1156	+	if (isint(viewselect)) {        /* view number? */
1157	+	n = atoi(viewselect)-1;
1158	+	goto numview;
1159	+	}
1160		if (viewselect[0] == '-') {     /* already specified */
1161	<	if (vn != NULL) *vn = '\0';
1161	>	if (vn != NULL)
1162	>	strcpy(vn, "0");
1163		return(viewselect);
1164		}
1165		if (vn != NULL) {
#	Line 1016 | Line 1168 | char   *vn;            /* returned view name */
1168		;
1169		*vn = '\0';
1170		}
1019	–	/* view number? */
1020	–	if (isint(viewselect))
1021	–	return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
1171		/* check list */
1172		while ((mv = nvalue(VIEWS, n++)) != NULL)
1173		if (matchword(viewselect, mv))
1174		return(specview(mv));
1175	+
1176		return(specview(viewselect));   /* standard view? */
1177		}
1178	+	numview:
1179		mv = nvalue(VIEWS, n);          /* use view n */
1180	<	if (vn != NULL & mv != NULL) {
1181	<	register char   *mv2 = mv;
1182	<	if (*mv2 != '-')
1180	>	if ((vn != NULL) & (mv != NULL))
1181	>	if (*mv != '-') {
1182	>	register char   *mv2 = mv;
1183		while (*mv2 && !isspace(*mv2))
1184		*vn++ = *mv2++;
1185	<	*vn = '\0';
1186	<	}
1185	>	*vn = '\0';
1186	>	} else
1187	>	sprintf(vn, "%d", n+1);
1188	>
1189		return(specview(mv));
1190		}
1191
1192
1193	<	printview(vopts)                        /* print out selected view */
1194	<	register char   *vopts;
1193	>	static int
1194	>	myprintview(                    /* print out selected view */
1195	>	register char   *vopts,
1196	>	FILE    *fp
1197	>	)
1198		{
1199		VIEW    vwr;
1200		char    buf[128];
1201		register char   *cp;
1202	+	#ifdef _WIN32
1203	+	/* XXX Should we allow something like this for all platforms? */
1204	+	/* XXX Or is it still required at all? */
1205		again:
1206	+	#endif
1207		if (vopts == NULL)
1208		return(-1);
1209		#ifdef _WIN32
#	Line 1052 | Line 1212 | again:
1212		goto again;
1213		}
1214		#endif
1215	<	copystruct(&vwr, &stdview);
1215	>	vwr = stdview;
1216		sscanview(&vwr, cp=vopts);              /* set initial options */
1217		while ((cp = strstr(cp, "-vf ")) != NULL &&
1218		*atos(buf, sizeof(buf), cp += 4)) {
1219		viewfile(buf, &vwr, NULL);      /* load -vf file */
1220		sscanview(&vwr, cp);            /* reset tail */
1221		}
1222	<	fputs(VIEWSTR, stdout);
1223	<	fprintview(&vwr, stdout);               /* print full spec. */
1224	<	fputc('\n', stdout);
1222	>	fputs(VIEWSTR, fp);
1223	>	fprintview(&vwr, fp);                   /* print full spec. */
1224	>	fputc('\n', fp);
1225		return(0);
1226		}
1227
1228
1229	<	rview(opts, po)                         /* run rview with first view */
1230	<	char    *opts, *po;
1229	>	static void
1230	>	rvu(                            /* run rvu with first view */
1231	>	char    *opts,
1232	>	char    *po
1233	>	)
1234		{
1235		char    *vw;
1236		char    combuf[PATH_MAX];
#	Line 1075 | Line 1238 | char   *opts, *po;
1238		if (touchonly || (vw = getview(0, NULL)) == NULL)
1239		return;
1240		if (sayview)
1241	<	printview(vw);
1242	<	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1241	>	myprintview(vw, stdout);
1242	>	sprintf(combuf, "%s %s%s%s -R %s ", c_rvu, vw, opts, po, rifname);
1243	>	if (nprocs > 1)
1244	>	sprintf(combuf+strlen(combuf), "-n %d ", nprocs);
1245		if (rvdevice != NULL)
1246		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1247		if (vdef(EXPOSURE))
1248		sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1249		strcat(combuf, oct1name);
1250		if (runcom(combuf)) {           /* run it */
1251	<	fprintf(stderr, "%s: error running rview\n", progname);
1251	>	fprintf(stderr, "%s: error running %s\n", progname, c_rvu);
1252		quit(1);
1253		}
1254		}
1255
1256
1257	<	rpict(opts, po)                         /* run rpict and pfilt for each view */
1258	<	char    *opts, *po;
1257	>	static void
1258	>	rpict(                          /* run rpict and pfilt for each view */
1259	>	char    *opts,
1260	>	char    *po
1261	>	)
1262		{
1263	<	char    combuf[PATH_MAX];
1263	>	#define do_rpiece       (sfile[0]!='\0')
1264	>	char    combuf[5*PATH_MAX+512];
1265		char    rawfile[PATH_MAX], picfile[PATH_MAX];
1266		char    zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
1267	+	char    rppopt[32], sfile[PATH_MAX], *pfile = NULL;
1268		char    pfopts[128];
1269		char    vs[32], *vw;
1270		int     vn, mult;
1271	+	FILE    *fp;
1272		time_t  rfdt, pfdt;
1273	+	int     xres, yres;
1274	+	double  aspect;
1275	+	int     n;
1276		/* get pfilt options */
1277		pfiltopts(pfopts);
1278		/* get resolution, reporting */
#	Line 1113 | Line 1287 | char   *opts, *po;
1287		mult = 3;
1288		break;
1289		}
1290	<	{
1291	<	int     xres, yres;
1292	<	double  aspect;
1293	<	int     n;
1294	<	n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect);
1295	<	if (n == 3)
1296	<	sprintf(res, "-x %d -y %d -pa %.3f",
1297	<	mult*xres, mult*yres, aspect);
1298	<	else if (n) {
1299	<	if (n == 1) yres = xres;
1126	<	sprintf(res, "-x %d -y %d", mult*xres, mult*yres);
1127	<	} else
1128	<	badvalue(RESOLUTION);
1129	<	}
1290	>	n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect);
1291	>	if (n == 3)
1292	>	sprintf(res, "-x %d -y %d -pa %.3f",
1293	>	mult*xres, mult*yres, aspect);
1294	>	else if (n) {
1295	>	aspect = 1.;
1296	>	if (n == 1) yres = xres;
1297	>	sprintf(res, "-x %d -y %d", mult*xres, mult*yres);
1298	>	} else
1299	>	badvalue(RESOLUTION);
1300		rep[0] = '\0';
1301		if (vdef(REPORT)) {
1302		double  minutes;
1133	–	int     n;
1303		n = sscanf(vval(REPORT), "%lf %s", &minutes, rawfile);
1304		if (n == 2)
1305		sprintf(rep, " -t %d -e %s", (int)(minutes*60), rawfile);
#	Line 1139 | Line 1308 | char   *opts, *po;
1308		else
1309		badvalue(REPORT);
1310		}
1311	+	/* set up parallel rendering */
1312	+	sfile[0] = '\0';
1313	+	if ((nprocs > 1) & !touchonly & !vdef(ZFILE) &&
1314	+	getview(0, vs) != NULL) {
1315	+	if (!strcmp(c_rpict, DEF_RPICT_PATH) &&
1316	+	getview(1, NULL) == NULL) {
1317	+	sprintf(sfile, "%s_%s_rpsync.txt",
1318	+	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE),
1319	+	vs);
1320	+	strcpy(rppopt, "-PP pfXXXXXX");
1321	+	} else {
1322	+	strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1323	+	}
1324	+	pfile = rppopt + strlen(rppopt) - 8;
1325	+	if (mktemp(pfile) == NULL) {
1326	+	if (do_rpiece) {
1327	+	fprintf(stderr, "%s: cannot create\n", pfile);
1328	+	quit(1);
1329	+	}
1330	+	pfile = NULL;
1331	+	}
1332	+	}
1333		vn = 0;                                 /* do each view */
1334		while ((vw = getview(vn++, vs)) != NULL) {
1335		if (sayview)
1336	<	printview(vw);
1337	<	if (!vs[0])
1147	<	sprintf(vs, "%d", vn);
1148	<	sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1336	>	myprintview(vw, stdout);
1337	>	sprintf(picfile, "%s_%s.hdr", vval(PICTURE), vs);
1338		if (vdef(ZFILE))
1339		sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1340		else
#	Line 1166 | Line 1355 | char   *opts, *po;
1355		touch(picfile);
1356		continue;
1357		}
1358	<	if (next_process())             /* parallel running? */
1358	>	/* parallel running? */
1359	>	if (do_rpiece) {
1360	>	if (rfdt < oct1date || !fdate(sfile)) {
1361	>	int     xdiv = 8+nprocs/3, ydiv = 8+nprocs/3;
1362	>	if (rfdt >= oct1date) {
1363	>	fprintf(stderr,
1364	>	"%s: partial output not created with rpiece\n", rawfile);
1365	>	quit(1);
1366	>	}
1367	>	if (rfdt) {     /* start fresh */
1368	>	rmfile(rawfile);
1369	>	rfdt = 0;
1370	>	}
1371	>	if (!silent)
1372	>	printf("\techo %d %d > %s\n",
1373	>	xdiv, ydiv, sfile);
1374	>	if ((fp = fopen(sfile, "w")) == NULL) {
1375	>	fprintf(stderr, "%s: cannot create\n",
1376	>	sfile);
1377	>	quit(1);
1378	>	}
1379	>	fprintf(fp, "%d %d\n", xdiv, ydiv);
1380	>	fclose(fp);
1381	>	}
1382	>	} else if (next_process(0)) {
1383	>	if (pfile != NULL)
1384	>	sleep(10);
1385		continue;
1386	+	} else if (!inchild())
1387	+	pfile = NULL;
1388		/* XXX Remember to call finish_process() */
1389		/* build rpict command */
1390	<	if (rfdt >= oct1date)           /* recover */
1391	<	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1392	<	rep, po, opts, zopt, rawfile, oct1name);
1393	<	else {
1390	>	if (rfdt >= oct1date) {         /* already in progress */
1391	>	if (do_rpiece) {
1392	>	sprintf(combuf, "%s -R %s %s%s %s %s%s%s -o %s %s",
1393	>	c_rpiece, sfile, rppopt, rep, vw,
1394	>	res, opts, po, rawfile, oct1name);
1395	>	while (next_process(1)) {
1396	>	sleep(10);
1397	>	combuf[strlen(c_rpiece)+2] = 'F';
1398	>	}
1399	>	} else
1400	>	sprintf(combuf, "%s%s%s%s%s -ro %s %s", c_rpict,
1401	>	rep, opts, po, zopt, rawfile, oct1name);
1402	>	if (runcom(combuf))     /* run rpict/rpiece */
1403	>	goto rperror;
1404	>	} else {
1405		if (overture) {         /* run overture calculation */
1406		sprintf(combuf,
1407	<	"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1408	<	rep, vw, opts,
1407	>	"%s%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1408	>	c_rpict, rep, vw, opts,
1409		oct1name, overfile);
1410	<	if (runcom(combuf)) {
1411	<	fprintf(stderr,
1410	>	if (!do_rpiece || !next_process(0)) {
1411	>	if (runcom(combuf)) {
1412	>	fprintf(stderr,
1413		"%s: error in overture for view %s\n",
1414	<	progname, vs);
1415	<	quit(1);
1416	<	}
1414	>	progname, vs);
1415	>	quit(1);
1416	>	}
1417		#ifndef NULL_DEVICE
1418	<	rmfile(overfile);
1418	>	rmfile(overfile);
1419		#endif
1420	+	} else if (do_rpiece)
1421	+	sleep(20);
1422		}
1423	<	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1424	<	rep, vw, res, po, opts, zopt,
1425	<	oct1name, rawfile);
1423	>	if (do_rpiece) {
1424	>	sprintf(combuf, "%s -F %s %s%s %s %s%s%s -o %s %s",
1425	>	c_rpiece, sfile, rppopt, rep, vw,
1426	>	res, opts, po, rawfile, oct1name);
1427	>	while (next_process(1))
1428	>	sleep(10);
1429	>	} else {
1430	>	sprintf(combuf, "%s%s %s %s%s%s%s %s > %s",
1431	>	c_rpict, rep, vw, res, opts, po,
1432	>	zopt, oct1name, rawfile);
1433	>	}
1434	>	if ((pfile != NULL) & !do_rpiece) {
1435	>	if (!silent)
1436	>	printf("\t%s\n", combuf);
1437	>	fflush(stdout);
1438	>	sprintf(combuf, "%s%s %s %s%s%s %s > %s",
1439	>	c_rpict, rep, rppopt, res,
1440	>	opts, po, oct1name, rawfile);
1441	>	fp = popen(combuf, "w");
1442	>	if (fp == NULL)
1443	>	goto rperror;
1444	>	myprintview(vw, fp);
1445	>	if (pclose(fp))
1446	>	goto rperror;
1447	>	} else if (runcom(combuf))
1448	>	goto rperror;
1449		}
1450	<	if (runcom(combuf)) {           /* run rpict */
1451	<	fprintf(stderr, "%s: error rendering view %s\n",
1452	<	progname, vs);
1453	<	quit(1);
1450	>	if (do_rpiece) {                /* need to finish raw, first */
1451	>	finish_process();
1452	>	wait_process(1);
1453	>	/* XXX should check sync file to see if really done? */
1454		}
1455		if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1456		/* build pfilt command */
1457	<	if (mult > 1)
1458	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1459	<	pfopts, mult, mult, rawfile, picfile);
1457	>	if (do_rpiece)
1458	>	sprintf(combuf,
1459	>	"%s%s -x %d -y %d -p %.3f %s > %s",
1460	>	c_pfilt, pfopts, xres, yres, aspect,
1461	>	rawfile, picfile);
1462	>	else if (mult > 1)
1463	>	sprintf(combuf, "%s%s -x /%d -y /%d %s > %s",
1464	>	c_pfilt, pfopts, mult, mult,
1465	>	rawfile, picfile);
1466		else
1467	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1468	<	rawfile, picfile);
1469	<	if (runcom(combuf)) {           /* run pfilt */
1467	>	sprintf(combuf, "%s%s %s > %s", c_pfilt,
1468	>	pfopts, rawfile, picfile);
1469	>	if (runcom(combuf)) {   /* run pfilt */
1470		fprintf(stderr,
1471		"%s: error filtering view %s\n\t%s removed\n",
1472		progname, vs, picfile);
#	Line 1216 | Line 1476 | char   *opts, *po;
1476		}
1477		/* remove/rename raw file */
1478		if (vdef(RAWFILE)) {
1479	<	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1479	>	sprintf(combuf, "%s_%s.hdr", vval(RAWFILE), vs);
1480		mvfile(rawfile, combuf);
1481		} else
1482		rmfile(rawfile);
1483	<	finish_process();               /* leave if child */
1483	>	if (do_rpiece)                  /* done with sync file */
1484	>	rmfile(sfile);
1485	>	else
1486	>	finish_process();       /* exit if child */
1487		}
1488		wait_process(1);                /* wait for children to finish */
1489	+	if (pfile != NULL) {            /* clean up persistent rpict */
1490	+	RT_PID  pid;
1491	+	fp = fopen(pfile, "r");
1492	+	if (fp != NULL) {
1493	+	if (fscanf(fp, "%*s %d", &pid) != 1 ||
1494	+	kill(pid, 1) < 0)
1495	+	unlink(pfile);
1496	+	fclose(fp);
1497	+	}
1498	+	}
1499	+	return;
1500	+	rperror:
1501	+	fprintf(stderr, "%s: error rendering view %s\n", progname, vs);
1502	+	quit(1);
1503	+	#undef do_rpiece
1504		}
1505
1506
1507	<	touch(fn)                       /* update a file */
1508	<	char    *fn;
1507	>	static int
1508	>	touch(                  /* update a file */
1509	>	char    *fn
1510	>	)
1511		{
1512		if (!silent)
1513		printf("\ttouch %s\n", fn);
1514		if (!nprocs)
1515		return(0);
1236	–	#ifdef notused
1237	–	if (access(fn, F_OK) == -1)             /* create it */
1238	–	if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
1239	–	return(-1);
1240	–	#endif
1516		return(setfdate(fn, time((time_t *)NULL)));
1517		}
1518
1519
1520	<	runcom(cs)                      /* run command */
1521	<	char    *cs;
1520	>	static int
1521	>	runcom(                 /* run command */
1522	>	char    *cs
1523	>	)
1524		{
1525		if (!silent)            /* echo it */
1526		printf("\t%s\n", cs);
1527		if (!nprocs)
1528		return(0);
1529	<	fflush(stdout);         /* flush output and pass to shell */
1529	>	fflush(NULL);           /* flush output and pass to shell */
1530		return(system(cs));
1531		}
1532
1533
1534	<	rmfile(fn)                      /* remove a file */
1535	<	char    *fn;
1534	>	static int
1535	>	rmfile(                 /* remove a file */
1536	>	char    *fn
1537	>	)
1538		{
1539		if (!silent)
1540	<	#ifdef _WIN32
1262	<	printf("\tdel %s\n", fn);
1263	<	#else
1264	<	printf("\trm -f %s\n", fn);
1265	<	#endif
1540	>	printf("\t%s %s\n", DELCMD, fn);
1541		if (!nprocs)
1542		return(0);
1543		return(unlink(fn));
1544		}
1545
1546
1547	<	mvfile(fold, fnew)              /* move a file */
1548	<	char    *fold, *fnew;
1547	>	static int
1548	>	mvfile(         /* move a file */
1549	>	char    *fold,
1550	>	char    *fnew
1551	>	)
1552		{
1553		if (!silent)
1554	<	#ifdef _WIN32
1277	<	printf("\trename %s %s\n", fold, fnew);
1278	<	#else
1279	<	printf("\tmv %s %s\n", fold, fnew);
1280	<	#endif
1554	>	printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
1555		if (!nprocs)
1556		return(0);
1557		return(rename(fold, fnew));
#	Line 1285 | Line 1559 | char   *fold, *fnew;
1559
1560
1561		#ifdef RHAS_FORK_EXEC
1562	<	int
1563	<	next_process()                  /* fork the next process (max. nprocs) */
1562	>	static int
1563	>	next_process(int reserve)               /* fork the next process */
1564		{
1565	<	int     child_pid;
1565	>	RT_PID  child_pid;
1566
1567		if (nprocs <= 1)
1568		return(0);              /* it's us or no one */
1569	<	if (children_running < 0) {
1570	<	fprintf(stderr, "%s: internal error 1 in spawn_process()\n",
1569	>	if (inchild()) {
1570	>	fprintf(stderr, "%s: internal error 1 in next_process()\n",
1571		progname);
1572		quit(1);
1573		}
1574	+	if (reserve > 0 && children_running >= nprocs-reserve)
1575	+	return(0);              /* caller holding back process(es) */
1576		if (children_running >= nprocs)
1577		wait_process(0);        /* wait for someone to finish */
1578	<	fflush(stdout);
1578	>	fflush(NULL);                   /* flush output */
1579		child_pid = fork();             /* split process */
1580		if (child_pid == 0) {           /* we're the child */
1581		children_running = -1;
1582	+	nprocs = 1;
1583		return(0);
1584		}
1585		if (child_pid > 0) {            /* we're the parent */
#	Line 1313 | Line 1590 | next_process()                 /* fork the next process (max. nprocs
1590		return(0);
1591		}
1592
1593	<	wait_process(all)                       /* wait for process(es) to finish */
1594	<	int     all;
1593	>	static void
1594	>	wait_process(                   /* wait for process(es) to finish */
1595	>	int     all
1596	>	)
1597		{
1598	<	int     ourstatus = 0;
1599	<	int     pid, status;
1598	>	int     ourstatus = 0, status;
1599	>	RT_PID  pid;
1600
1601		if (all)
1602		all = children_running;
#	Line 1330 | Line 1609 | int    all;
1609		status = status>>8 & 0xff;
1610		--children_running;
1611		if (status != 0) {      /* child's problem is our problem */
1612	<	if (ourstatus == 0 & children_running > 0)
1612	>	if ((ourstatus == 0) & (children_running > 0))
1613		fprintf(stderr, "%s: waiting for remaining processes\n",
1614		progname);
1615		ourstatus = status;
#	Line 1341 | Line 1620 | int    all;
1620		quit(ourstatus);        /* bad status from child */
1621		}
1622		#else   /* ! RHAS_FORK_EXEC */
1623	<	int
1624	<	next_process()
1623	>	static int
1624	>	next_process(int reserve)
1625		{
1626		return(0);                      /* cannot start new process */
1627		}
1628	+	static void
1629		wait_process(all)
1630		int     all;
1631		{
1632		(void)all;                      /* no one to wait for */
1633		}
1634	+	int
1635	+	kill(pid, sig) /* win|unix_process.c should also wait and kill */
1636	+	RT_PID pid;
1637	+	int sig;
1638	+	{
1639	+	return 0;
1640	+	}
1641		#endif  /* ! RHAS_FORK_EXEC */
1642
1643	<	finish_process()                        /* exit a child process */
1643	>	static void
1644	>	finish_process(void)                    /* exit a child process */
1645		{
1646	<	if (children_running >= 0)
1646	>	if (!inchild())
1647		return;                 /* in parent -- noop */
1648		exit(0);
1649		}
#	Line 1380 | Line 1668 | char   *vname, *value;
1668		#endif
1669
1670
1671	<	badvalue(vc)                    /* report bad variable value and exit */
1672	<	int     vc;
1671	>	static void
1672	>	badvalue(                       /* report bad variable value and exit */
1673	>	int     vc
1674	>	)
1675		{
1676		fprintf(stderr, "%s: bad value for variable '%s'\n",
1677		progname, vnam(vc));
#	Line 1389 | Line 1679 | int    vc;
1679		}
1680
1681
1682	<	syserr(s)                       /* report a system error and exit */
1683	<	char    *s;
1682	>	static void
1683	>	syserr(                 /* report a system error and exit */
1684	>	char    *s
1685	>	)
1686		{
1687		perror(s);
1688		quit(1);

Diff Legend

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