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.108 by greg, Mon Aug 12 21:01:00 2013 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	+	rmfile(oct0name);
562		/* make octree1 (frozen) */
563		if (octreedate)
564	<	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
565	<	vval(OCTREE), illumtmp, oct1name);
564	>	sprintf(combuf, "%s%s -f -i %s %s > %s", c_oconv,
565	>	ocopts, vval(OCTREE), illumtmp, oct1name);
566		else if (vdef(MATERIAL))
567	<	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
568	<	vval(MATERIAL), illumtmp, oct1name);
567	>	sprintf(combuf, "%s%s -f %s %s > %s", c_oconv,
568	>	ocopts, vval(MATERIAL), illumtmp, oct1name);
569		else
570	<	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
570	>	sprintf(combuf, "%s%s -f %s > %s", c_oconv, ocopts,
571		illumtmp, oct1name);
572		if (runcom(combuf)) {           /* run it */
573		fprintf(stderr,
#	Line 504 | Line 585 | oconv()                                /* run oconv and mkillum if necessary */
585		}
586
587
588	<	char *
589	<	addarg(op, arg)                         /* add argument and advance pointer */
590	<	register char   *op, *arg;
588	>	static char *
589	>	addarg(                         /* append argument and advance pointer */
590	>	register char   *op,
591	>	register char   *arg
592	>	)
593		{
594	+	while (*op)
595	+	op++;
596		*op = ' ';
597	<	while (*++op = *arg++)
597	>	while ( (*++op = *arg++) )
598		;
599		return(op);
600		}
601
602
603	<	oconvopts(oo)                           /* get oconv options */
604	<	register char   *oo;
603	>	static void
604	>	oconvopts(                              /* get oconv options */
605	>	register char   *oo
606	>	)
607		{
608		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
609
610		*oo = '\0';
611		if (vdef(OCONV))
612	<	addarg(oo, vval(OCONV));
612	>	if (vval(OCONV)[0] != '-') {
613	>	atos(c_oconv, sizeof(c_oconv), vval(OCONV));
614	>	oo = addarg(oo, sskip2(vval(OCONV), 1));
615	>	} else
616	>	oo = addarg(oo, vval(OCONV));
617		}
618
619
620	<	mkillumopts(mo)                         /* get mkillum options */
621	<	register char   *mo;
620	>	static void
621	>	mkillumopts(                            /* get mkillum options */
622	>	char    *mo
623	>	)
624		{
625		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
626
627	<	*mo = '\0';
627	>	if (nprocs > 1)
628	>	sprintf(mo, " -n %d", nprocs);
629	>	else
630	>	*mo = '\0';
631		if (vdef(MKILLUM))
632	<	addarg(mo, vval(MKILLUM));
632	>	if (vval(MKILLUM)[0] != '-') {
633	>	atos(c_mkillum, sizeof(c_mkillum), vval(MKILLUM));
634	>	mo = addarg(mo, sskip2(vval(MKILLUM), 1));
635	>	} else
636	>	mo = addarg(mo, vval(MKILLUM));
637		}
638
639
640	<	checkambfile()                  /* check date on ambient file */
640	>	static void
641	>	checkambfile(void)                      /* check date on ambient file */
642		{
643		time_t  afdate;
644
#	Line 545 | Line 646 | checkambfile()                 /* check date on ambient file */
646		return;
647		if (!(afdate = fdate(vval(AMBFILE))))
648		return;
649	<	if (oct1date > afdate)
649	>	if (oct1date > afdate) {
650		if (touchonly)
651		touch(vval(AMBFILE));
652		else
653		rmfile(vval(AMBFILE));
654	+	}
655		}
656
657
658	<	double
659	<	ambval()                                /* compute ambient value */
658	>	static double
659	>	ambval(void)                            /* compute ambient value */
660		{
661		if (vdef(EXPOSURE)) {
662		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
#	Line 566 | Line 668 | ambval()                               /* compute ambient value */
668		if (vlet(ZONE) == 'I')
669		return(.01);
670		badvalue(ZONE);
671	+	return 0; /* pro forma return */
672		}
673
674
675	<	renderopts(op, po)                      /* set rendering options */
676	<	char    *op, *po;
675	>	static void
676	>	renderopts(                     /* set rendering options */
677	>	char    *op,
678	>	char    *po
679	>	)
680		{
681		switch(vscale(QUALITY)) {
682		case LOW:
#	Line 583 | Line 689 | char   *op, *po;
689		hiqopts(op, po);
690		break;
691		}
692	+	if (vdef(RENDER))
693	+	op = addarg(op, vval(RENDER));
694	+	if (rvdevice != NULL) {
695	+	if (vdef(RVU))
696	+	if (vval(RVU)[0] != '-') {
697	+	atos(c_rvu, sizeof(c_rvu), vval(RVU));
698	+	po = addarg(po, sskip2(vval(RVU), 1));
699	+	} else
700	+	po = addarg(po, vval(RVU));
701	+	} else {
702	+	if (vdef(RPICT))
703	+	if (vval(RPICT)[0] != '-') {
704	+	atos(c_rpict, sizeof(c_rpict), vval(RPICT));
705	+	po = addarg(po, sskip2(vval(RPICT), 1));
706	+	} else
707	+	po = addarg(po, vval(RPICT));
708	+	}
709		}
710
711
712	<	lowqopts(op, po)                        /* low quality rendering options */
713	<	register char   *op;
714	<	char    *po;
712	>	static void
713	>	lowqopts(                       /* low quality rendering options */
714	>	register char   *op,
715	>	char    *po
716	>	)
717		{
718		double  d, org[3], siz[3];
719
#	Line 598 | Line 723 | char   *po;
723		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
724		badvalue(ZONE);
725		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
726	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
726	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
727		badvalue(ZONE);
728		getoctcube(org, &d);
729		d *= 3./(siz[0]+siz[1]+siz[2]);
#	Line 606 | Line 731 | char   *po;
731		case LOW:
732		po = addarg(po, "-ps 16");
733		op = addarg(op, "-dp 64");
734	<	sprintf(op, " -ar %d", (int)(4*d));
734	>	sprintf(op, " -ar %d", (int)(8*d));
735		op += strlen(op);
736		break;
737		case MEDIUM:
738		po = addarg(po, "-ps 8");
739		op = addarg(op, "-dp 128");
740	<	sprintf(op, " -ar %d", (int)(8*d));
740	>	sprintf(op, " -ar %d", (int)(16*d));
741		op += strlen(op);
742		break;
743		case HIGH:
744		po = addarg(po, "-ps 4");
745		op = addarg(op, "-dp 256");
746	<	sprintf(op, " -ar %d", (int)(16*d));
746	>	sprintf(op, " -ar %d", (int)(32*d));
747		op += strlen(op);
748		break;
749		}
#	Line 627 | Line 752 | char   *po;
752		op = addarg(op, "-ds .4");
753		else
754		op = addarg(op, "-ds 0");
755	<	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5");
755	>	op = addarg(op, "-dt .2 -dc .25 -dr 0 -ss 0 -st .5");
756		if (vdef(AMBFILE)) {
757		sprintf(op, " -af %s", vval(AMBFILE));
758		op += strlen(op);
#	Line 635 | Line 760 | char   *po;
760		overture = 0;
761		switch (vscale(VARIABILITY)) {
762		case LOW:
763	<	op = addarg(op, "-aa .4 -ad 64");
763	>	op = addarg(op, "-aa .3 -ad 256");
764		break;
765		case MEDIUM:
766	<	op = addarg(op, "-aa .3 -ad 128");
766	>	op = addarg(op, "-aa .25 -ad 512");
767		break;
768		case HIGH:
769	<	op = addarg(op, "-aa .25 -ad 256");
769	>	op = addarg(op, "-aa .2 -ad 1024");
770		break;
771		}
772		op = addarg(op, "-as 0");
773		d = ambval();
774		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
775		op += strlen(op);
776	<	op = addarg(op, "-lr 3 -lw .02");
652	<	if (vdef(RENDER))
653	<	op = addarg(op, vval(RENDER));
776	>	op = addarg(op, "-lr 6 -lw .003");
777		}
778
779
780	<	medqopts(op, po)                        /* medium quality rendering options */
781	<	register char   *op;
782	<	char    *po;
780	>	static void
781	>	medqopts(                       /* medium quality rendering options */
782	>	register char   *op,
783	>	char    *po
784	>	)
785		{
786		double  d, org[3], siz[3], asz;
787
#	Line 666 | Line 791 | char   *po;
791		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
792		badvalue(ZONE);
793		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
794	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
794	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
795		badvalue(ZONE);
796		getoctcube(org, &d);
797		asz = (siz[0]+siz[1]+siz[2])/3.;
#	Line 675 | Line 800 | char   *po;
800		case LOW:
801		po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
802		op = addarg(op, "-dp 256");
803	<	sprintf(op, " -ar %d", (int)(8*d));
803	>	sprintf(op, " -ar %d", (int)(16*d));
804		op += strlen(op);
805		sprintf(op, " -ms %.2g", asz/20.);
806		op += strlen(op);
#	Line 683 | Line 808 | char   *po;
808		case MEDIUM:
809		po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
810		op = addarg(op, "-dp 512");
811	<	sprintf(op, " -ar %d", (int)(16*d));
811	>	sprintf(op, " -ar %d", (int)(32*d));
812		op += strlen(op);
813		sprintf(op, " -ms %.2g", asz/40.);
814		op += strlen(op);
#	Line 691 | Line 816 | char   *po;
816		case HIGH:
817		po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
818		op = addarg(op, "-dp 1024");
819	<	sprintf(op, " -ar %d", (int)(32*d));
819	>	sprintf(op, " -ar %d", (int)(64*d));
820		op += strlen(op);
821		sprintf(op, " -ms %.2g", asz/80.);
822		op += strlen(op);
#	Line 699 | Line 824 | char   *po;
824		}
825		po = addarg(po, "-pt .08");
826		if (vbool(PENUMBRAS))
827	<	op = addarg(op, "-ds .2 -dj .5");
827	>	op = addarg(op, "-ds .2 -dj .9");
828		else
829		op = addarg(op, "-ds .3");
830	<	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
831	<	if (overture = vint(INDIRECT)) {
830	>	op = addarg(op, "-dt .1 -dc .5 -dr 1 -ss 1 -st .1");
831	>	if ( (overture = vint(INDIRECT)) ) {
832		sprintf(op, " -ab %d", overture);
833		op += strlen(op);
834		}
#	Line 714 | Line 839 | char   *po;
839		overture = 0;
840		switch (vscale(VARIABILITY)) {
841		case LOW:
842	<	op = addarg(op, "-aa .25 -ad 196 -as 0");
842	>	op = addarg(op, "-aa .2 -ad 329 -as 42");
843		break;
844		case MEDIUM:
845	<	op = addarg(op, "-aa .2 -ad 400 -as 64");
845	>	op = addarg(op, "-aa .15 -ad 800 -as 128");
846		break;
847		case HIGH:
848	<	op = addarg(op, "-aa .15 -ad 768 -as 196");
848	>	op = addarg(op, "-aa .1 -ad 1536 -as 392");
849		break;
850		}
851		d = ambval();
852		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
853		op += strlen(op);
854	<	op = addarg(op, "-lr 6 -lw .002");
730	<	if (vdef(RENDER))
731	<	op = addarg(op, vval(RENDER));
854	>	op = addarg(op, "-lr 8 -lw 1e-4");
855		}
856
857
858	<	hiqopts(op, po)                         /* high quality rendering options */
859	<	register char   *op;
860	<	char    *po;
858	>	static void
859	>	hiqopts(                                /* high quality rendering options */
860	>	register char   *op,
861	>	char    *po
862	>	)
863		{
864		double  d, org[3], siz[3], asz;
865
#	Line 744 | Line 869 | char   *po;
869		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
870		badvalue(ZONE);
871		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
872	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
872	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
873		badvalue(ZONE);
874		getoctcube(org, &d);
875		asz = (siz[0]+siz[1]+siz[2])/3.;
#	Line 753 | Line 878 | char   *po;
878		case LOW:
879		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
880		op = addarg(op, "-dp 1024");
881	<	sprintf(op, " -ar %d", (int)(16*d));
881	>	sprintf(op, " -ar %d", (int)(32*d));
882		op += strlen(op);
883		sprintf(op, " -ms %.2g", asz/40.);
884		op += strlen(op);
#	Line 761 | Line 886 | char   *po;
886		case MEDIUM:
887		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
888		op = addarg(op, "-dp 2048");
889	<	sprintf(op, " -ar %d", (int)(32*d));
889	>	sprintf(op, " -ar %d", (int)(64*d));
890		op += strlen(op);
891		sprintf(op, " -ms %.2g", asz/80.);
892		op += strlen(op);
#	Line 769 | Line 894 | char   *po;
894		case HIGH:
895		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
896		op = addarg(op, "-dp 4096");
897	<	sprintf(op, " -ar %d", (int)(64*d));
897	>	sprintf(op, " -ar %d", (int)(128*d));
898		op += strlen(op);
899		sprintf(op, " -ms %.2g", asz/160.);
900		op += strlen(op);
#	Line 777 | Line 902 | char   *po;
902		}
903		po = addarg(po, "-pt .04");
904		if (vbool(PENUMBRAS))
905	<	op = addarg(op, "-ds .1 -dj .65");
905	>	op = addarg(op, "-ds .1 -dj .9");
906		else
907		op = addarg(op, "-ds .2");
908	<	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
908	>	op = addarg(op, "-dt .05 -dc .75 -dr 3 -ss 16 -st .01");
909		sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
910		op += strlen(op);
911		if (vdef(AMBFILE)) {
#	Line 790 | Line 915 | char   *po;
915		overture = 0;
916		switch (vscale(VARIABILITY)) {
917		case LOW:
918	<	op = addarg(op, "-aa .15 -ad 256 -as 0");
918	>	op = addarg(op, "-aa .125 -ad 512 -as 64");
919		break;
920		case MEDIUM:
921	<	op = addarg(op, "-aa .125 -ad 512 -as 256");
921	>	op = addarg(op, "-aa .1 -ad 1536 -as 768");
922		break;
923		case HIGH:
924	<	op = addarg(op, "-aa .08 -ad 1024 -as 512");
924	>	op = addarg(op, "-aa .075 -ad 4096 -as 2048");
925		break;
926		}
927		d = ambval();
928		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
929		op += strlen(op);
930	<	op = addarg(op, "-lr 12 -lw .0005");
806	<	if (vdef(RENDER))
807	<	op = addarg(op, vval(RENDER));
930	>	op = addarg(op, "-lr 12 -lw 1e-5");
931		}
932
933
934	<	xferopts(ro)                            /* transfer options if indicated */
935	<	char    *ro;
934	>	static void
935	>	xferopts(                               /* transfer options if indicated */
936	>	char    *ro
937	>	)
938		{
939		int     fd, n;
940		register char   *cp;
#	Line 839 | Line 964 | char   *ro;
964		}
965
966
967	<	pfiltopts(po)                           /* get pfilt options */
968	<	register char   *po;
967	>	static void
968	>	pfiltopts(                              /* get pfilt options */
969	>	register char   *po
970	>	)
971		{
972		*po = '\0';
973		if (vdef(EXPOSURE)) {
#	Line 856 | Line 983 | register char  *po;
983		break;
984		}
985		if (vdef(PFILT))
986	<	po = addarg(po, vval(PFILT));
986	>	if (vval(PFILT)[0] != '-') {
987	>	atos(c_pfilt, sizeof(c_pfilt), vval(PFILT));
988	>	po = addarg(po, sskip2(vval(PFILT), 1));
989	>	} else
990	>	po = addarg(po, vval(PFILT));
991		}
992
993
994	<	matchword(s1, s2)                       /* match white-delimited words */
995	<	register char   *s1, *s2;
994	>	static int
995	>	matchword(                      /* match white-delimited words */
996	>	register char   *s1,
997	>	register char   *s2
998	>	)
999		{
1000		while (isspace(*s1)) s1++;
1001		while (isspace(*s2)) s2++;
#	Line 872 | Line 1006 | register char  *s1, *s2;
1006		}
1007
1008
1009	<	char *
1010	<	specview(vs)                            /* get proper view spec from vs */
1011	<	register char   *vs;
1009	>	static char *
1010	>	specview(                               /* get proper view spec from vs */
1011	>	register char   *vs
1012	>	)
1013		{
1014		static char     vup[7][12] = {"-vu 0 0 -1","-vu 0 -1 0","-vu -1 0 0",
1015		"-vu 0 0 1", "-vu 1 0 0","-vu 0 1 0","-vu 0 0 1"};
#	Line 892 | Line 1027 | register char  *vs;
1027		upax = 1-'X'+UPPER(vval(UP)[1]);
1028		else
1029		upax = 1-'X'+vlet(UP);
1030	<	if (upax < 1 | upax > 3)
1030	>	if ((upax < 1) | (upax > 3))
1031		badvalue(UP);
1032		if (vval(UP)[0] == '-')
1033		upax = -upax;
#	Line 914 | Line 1049 | register char  *vs;
1049		} else if (*vs == 'z') {
1050		zpos = -1; vs++;
1051		}
1052	<	viewtype = 'v';
1053	<	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c')
1052	>	switch (*vs) {
1053	>	case VT_PER:
1054	>	case VT_PAR:
1055	>	case VT_ANG:
1056	>	case VT_HEM:
1057	>	case VT_PLS:
1058	>	case VT_CYL:
1059		viewtype = *vs++;
1060	+	break;
1061	+	default:
1062	+	viewtype = VT_PER;
1063	+	break;
1064	+	}
1065		cp = viewopts;
1066		if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {       /* got one! */
1067		*cp++ = '-'; *cp++ = 'v'; *cp++ = 't'; *cp++ = viewtype;
#	Line 958 | Line 1103 | register char  *vs;
1103		}
1104		cp = addarg(cp, vup[upax+3]);
1105		switch (viewtype) {
1106	<	case 'v':
1106	>	case VT_PER:
1107		cp = addarg(cp, "-vh 45 -vv 45");
1108		break;
1109	<	case 'l':
1109	>	case VT_PAR:
1110		d = sqrt(dim[0]*dim[0]+dim[1]*dim[1]+dim[2]*dim[2]);
1111		sprintf(cp, " -vh %.2g -vv %.2g", d, d);
1112		cp += strlen(cp);
1113		break;
1114	<	case 'a':
1115	<	case 'h':
1114	>	case VT_ANG:
1115	>	case VT_HEM:
1116	>	case VT_PLS:
1117		cp = addarg(cp, "-vh 180 -vv 180");
1118		break;
1119	<	case 'c':
1119	>	case VT_CYL:
1120		cp = addarg(cp, "-vh 180 -vv 90");
1121		break;
1122		}
#	Line 978 | Line 1124 | register char  *vs;
1124		while (!isspace(*vs))           /* else skip id */
1125		if (!*vs++)
1126		return(NULL);
1127	<	if (upax) {                     /* specify up vector */
1127	>	if (upax) {                     /* prepend up vector */
1128		strcpy(cp, vup[upax+3]);
1129		cp += strlen(cp);
1130		}
#	Line 996 | Line 1142 | register char  *vs;
1142		}
1143
1144
1145	<	char *
1146	<	getview(n, vn)                          /* get view n, or NULL if none */
1147	<	int     n;
1148	<	char    *vn;            /* returned view name */
1145	>	static char *
1146	>	getview(                                /* get view n, or NULL if none */
1147	>	int     n,
1148	>	char    *vn             /* returned view name */
1149	>	)
1150		{
1151		register char   *mv;
1152
1153		if (viewselect != NULL) {               /* command-line selected */
1154		if (n)                          /* only do one */
1155		return(NULL);
1156	+
1157	+	if (isint(viewselect)) {        /* view number? */
1158	+	n = atoi(viewselect)-1;
1159	+	goto numview;
1160	+	}
1161		if (viewselect[0] == '-') {     /* already specified */
1162	<	if (vn != NULL) *vn = '\0';
1162	>	if (vn != NULL)
1163	>	strcpy(vn, "0");
1164		return(viewselect);
1165		}
1166		if (vn != NULL) {
#	Line 1016 | Line 1169 | char   *vn;            /* returned view name */
1169		;
1170		*vn = '\0';
1171		}
1019	–	/* view number? */
1020	–	if (isint(viewselect))
1021	–	return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
1172		/* check list */
1173		while ((mv = nvalue(VIEWS, n++)) != NULL)
1174		if (matchword(viewselect, mv))
1175		return(specview(mv));
1176	+
1177		return(specview(viewselect));   /* standard view? */
1178		}
1179	+	numview:
1180		mv = nvalue(VIEWS, n);          /* use view n */
1181	<	if (vn != NULL & mv != NULL) {
1182	<	register char   *mv2 = mv;
1183	<	if (*mv2 != '-')
1181	>	if ((vn != NULL) & (mv != NULL))
1182	>	if (*mv != '-') {
1183	>	register char   *mv2 = mv;
1184		while (*mv2 && !isspace(*mv2))
1185		*vn++ = *mv2++;
1186	<	*vn = '\0';
1187	<	}
1186	>	*vn = '\0';
1187	>	} else
1188	>	sprintf(vn, "%d", n+1);
1189	>
1190		return(specview(mv));
1191		}
1192
1193
1194	<	printview(vopts)                        /* print out selected view */
1195	<	register char   *vopts;
1194	>	static int
1195	>	myprintview(                    /* print out selected view */
1196	>	register char   *vopts,
1197	>	FILE    *fp
1198	>	)
1199		{
1200		VIEW    vwr;
1201		char    buf[128];
1202		register char   *cp;
1203	+	#ifdef _WIN32
1204	+	/* XXX Should we allow something like this for all platforms? */
1205	+	/* XXX Or is it still required at all? */
1206		again:
1207	+	#endif
1208		if (vopts == NULL)
1209		return(-1);
1210		#ifdef _WIN32
#	Line 1052 | Line 1213 | again:
1213		goto again;
1214		}
1215		#endif
1216	<	copystruct(&vwr, &stdview);
1216	>	vwr = stdview;
1217		sscanview(&vwr, cp=vopts);              /* set initial options */
1218		while ((cp = strstr(cp, "-vf ")) != NULL &&
1219		*atos(buf, sizeof(buf), cp += 4)) {
1220		viewfile(buf, &vwr, NULL);      /* load -vf file */
1221		sscanview(&vwr, cp);            /* reset tail */
1222		}
1223	<	fputs(VIEWSTR, stdout);
1224	<	fprintview(&vwr, stdout);               /* print full spec. */
1225	<	fputc('\n', stdout);
1223	>	fputs(VIEWSTR, fp);
1224	>	fprintview(&vwr, fp);                   /* print full spec. */
1225	>	fputc('\n', fp);
1226		return(0);
1227		}
1228
1229
1230	<	rview(opts, po)                         /* run rview with first view */
1231	<	char    *opts, *po;
1230	>	static void
1231	>	rvu(                            /* run rvu with first view */
1232	>	char    *opts,
1233	>	char    *po
1234	>	)
1235		{
1236		char    *vw;
1237		char    combuf[PATH_MAX];
#	Line 1075 | Line 1239 | char   *opts, *po;
1239		if (touchonly || (vw = getview(0, NULL)) == NULL)
1240		return;
1241		if (sayview)
1242	<	printview(vw);
1243	<	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1242	>	myprintview(vw, stdout);
1243	>	sprintf(combuf, "%s %s%s%s -R %s ", c_rvu, vw, opts, po, rifname);
1244	>	if (nprocs > 1)
1245	>	sprintf(combuf+strlen(combuf), "-n %d ", nprocs);
1246		if (rvdevice != NULL)
1247		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1248		if (vdef(EXPOSURE))
1249		sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1250		strcat(combuf, oct1name);
1251		if (runcom(combuf)) {           /* run it */
1252	<	fprintf(stderr, "%s: error running rview\n", progname);
1252	>	fprintf(stderr, "%s: error running %s\n", progname, c_rvu);
1253		quit(1);
1254		}
1255		}
1256
1257
1258	<	rpict(opts, po)                         /* run rpict and pfilt for each view */
1259	<	char    *opts, *po;
1258	>	static int
1259	>	syncf_done(                     /* check if an rpiece sync file is complete */
1260	>	char *sfname
1261	>	)
1262		{
1263	<	char    combuf[PATH_MAX];
1263	>	FILE    *fp = fopen(sfname, "r");
1264	>	int     todo = 1;
1265	>	int     x, y;
1266	>
1267	>	if (fp == NULL)
1268	>	return(0);
1269	>	if (fscanf(fp, "%d %d", &x, &y) != 2)
1270	>	goto checked;
1271	>	todo = x*y;             /* total number of tiles */
1272	>	if (fscanf(fp, "%d %d", &x, &y) != 2 || (x != 0) | (y != 0))
1273	>	goto checked;
1274	>	/* XXX assume no redundant tiles */
1275	>	while (fscanf(fp, "%d %d", &x, &y) == 2)
1276	>	if (!--todo)
1277	>	break;
1278	>	checked:
1279	>	fclose(fp);
1280	>	return(!todo);
1281	>	}
1282	>
1283	>
1284	>	static void
1285	>	rpict(                          /* run rpict and pfilt for each view */
1286	>	char    *opts,
1287	>	char    *po
1288	>	)
1289	>	{
1290	>	#define do_rpiece       (sfile[0]!='\0')
1291	>	char    combuf[5*PATH_MAX+512];
1292		char    rawfile[PATH_MAX], picfile[PATH_MAX];
1293		char    zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
1294	+	char    rppopt[32], sfile[PATH_MAX], *pfile = NULL;
1295		char    pfopts[128];
1296		char    vs[32], *vw;
1297		int     vn, mult;
1298	+	FILE    *fp;
1299		time_t  rfdt, pfdt;
1300	+	int     xres, yres;
1301	+	double  aspect;
1302	+	int     n;
1303		/* get pfilt options */
1304		pfiltopts(pfopts);
1305		/* get resolution, reporting */
#	Line 1113 | Line 1314 | char   *opts, *po;
1314		mult = 3;
1315		break;
1316		}
1317	<	{
1318	<	int     xres, yres;
1319	<	double  aspect;
1320	<	int     n;
1321	<	n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect);
1322	<	if (n == 3)
1323	<	sprintf(res, "-x %d -y %d -pa %.3f",
1324	<	mult*xres, mult*yres, aspect);
1325	<	else if (n) {
1326	<	if (n == 1) yres = xres;
1126	<	sprintf(res, "-x %d -y %d", mult*xres, mult*yres);
1127	<	} else
1128	<	badvalue(RESOLUTION);
1129	<	}
1317	>	n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect);
1318	>	if (n == 3)
1319	>	sprintf(res, "-x %d -y %d -pa %.3f",
1320	>	mult*xres, mult*yres, aspect);
1321	>	else if (n) {
1322	>	aspect = 1.;
1323	>	if (n == 1) yres = xres;
1324	>	sprintf(res, "-x %d -y %d", mult*xres, mult*yres);
1325	>	} else
1326	>	badvalue(RESOLUTION);
1327		rep[0] = '\0';
1328		if (vdef(REPORT)) {
1329		double  minutes;
1133	–	int     n;
1330		n = sscanf(vval(REPORT), "%lf %s", &minutes, rawfile);
1331		if (n == 2)
1332		sprintf(rep, " -t %d -e %s", (int)(minutes*60), rawfile);
#	Line 1139 | Line 1335 | char   *opts, *po;
1335		else
1336		badvalue(REPORT);
1337		}
1338	+	/* set up parallel rendering */
1339	+	sfile[0] = '\0';
1340	+	if ((nprocs > 1) & !touchonly & !vdef(ZFILE) &&
1341	+	getview(0, vs) != NULL) {
1342	+	if (!strcmp(c_rpict, DEF_RPICT_PATH) &&
1343	+	getview(1, NULL) == NULL) {
1344	+	sprintf(sfile, "%s_%s_rpsync.txt",
1345	+	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE),
1346	+	vs);
1347	+	strcpy(rppopt, "-PP pfXXXXXX");
1348	+	} else {
1349	+	strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1350	+	}
1351	+	pfile = rppopt + strlen(rppopt) - 8;
1352	+	if (mktemp(pfile) == NULL) {
1353	+	if (do_rpiece) {
1354	+	fprintf(stderr, "%s: cannot create\n", pfile);
1355	+	quit(1);
1356	+	}
1357	+	pfile = NULL;
1358	+	}
1359	+	}
1360		vn = 0;                                 /* do each view */
1361		while ((vw = getview(vn++, vs)) != NULL) {
1362		if (sayview)
1363	<	printview(vw);
1364	<	if (!vs[0])
1147	<	sprintf(vs, "%d", vn);
1148	<	sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1363	>	myprintview(vw, stdout);
1364	>	sprintf(picfile, "%s_%s.hdr", vval(PICTURE), vs);
1365		if (vdef(ZFILE))
1366		sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1367		else
#	Line 1166 | Line 1382 | char   *opts, *po;
1382		touch(picfile);
1383		continue;
1384		}
1385	<	if (next_process())             /* parallel running? */
1385	>	/* parallel running? */
1386	>	if (do_rpiece) {
1387	>	if (rfdt < oct1date || !fdate(sfile)) {
1388	>	int     xdiv = 8+nprocs/3, ydiv = 8+nprocs/3;
1389	>	if (rfdt >= oct1date) {
1390	>	fprintf(stderr,
1391	>	"%s: partial output not created with %s\n", rawfile, c_rpiece);
1392	>	quit(1);
1393	>	}
1394	>	if (rfdt) {     /* start fresh */
1395	>	rmfile(rawfile);
1396	>	rfdt = 0;
1397	>	}
1398	>	if (!silent)
1399	>	printf("\techo %d %d > %s\n",
1400	>	xdiv, ydiv, sfile);
1401	>	if ((fp = fopen(sfile, "w")) == NULL) {
1402	>	fprintf(stderr, "%s: cannot create\n",
1403	>	sfile);
1404	>	quit(1);
1405	>	}
1406	>	fprintf(fp, "%d %d\n", xdiv, ydiv);
1407	>	fclose(fp);
1408	>	}
1409	>	} else if (next_process(0)) {
1410	>	if (pfile != NULL)
1411	>	sleep(10);
1412		continue;
1413	+	} else if (!inchild())
1414	+	pfile = NULL;
1415		/* XXX Remember to call finish_process() */
1416		/* build rpict command */
1417	<	if (rfdt >= oct1date)           /* recover */
1418	<	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1419	<	rep, po, opts, zopt, rawfile, oct1name);
1420	<	else {
1417	>	if (rfdt >= oct1date) {         /* already in progress */
1418	>	if (do_rpiece) {
1419	>	sprintf(combuf, "%s -R %s %s%s %s %s%s%s -o %s %s",
1420	>	c_rpiece, sfile, rppopt, rep, vw,
1421	>	res, opts, po, rawfile, oct1name);
1422	>	while (next_process(1)) {
1423	>	sleep(10);
1424	>	combuf[strlen(c_rpiece)+2] = 'F';
1425	>	}
1426	>	} else
1427	>	sprintf(combuf, "%s%s%s%s%s -ro %s %s", c_rpict,
1428	>	rep, opts, po, zopt, rawfile, oct1name);
1429	>	if (runcom(combuf))     /* run rpict/rpiece */
1430	>	goto rperror;
1431	>	} else {
1432		if (overture) {         /* run overture calculation */
1433		sprintf(combuf,
1434	<	"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1435	<	rep, vw, opts,
1434	>	"%s%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1435	>	c_rpict, rep, vw, opts,
1436		oct1name, overfile);
1437	<	if (runcom(combuf)) {
1438	<	fprintf(stderr,
1437	>	if (!do_rpiece || !next_process(0)) {
1438	>	if (runcom(combuf)) {
1439	>	fprintf(stderr,
1440		"%s: error in overture for view %s\n",
1441	<	progname, vs);
1442	<	quit(1);
1443	<	}
1441	>	progname, vs);
1442	>	quit(1);
1443	>	}
1444		#ifndef NULL_DEVICE
1445	<	rmfile(overfile);
1445	>	rmfile(overfile);
1446		#endif
1447	+	} else if (do_rpiece)
1448	+	sleep(20);
1449		}
1450	<	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1451	<	rep, vw, res, po, opts, zopt,
1452	<	oct1name, rawfile);
1450	>	if (do_rpiece) {
1451	>	sprintf(combuf, "%s -F %s %s%s %s %s%s%s -o %s %s",
1452	>	c_rpiece, sfile, rppopt, rep, vw,
1453	>	res, opts, po, rawfile, oct1name);
1454	>	while (next_process(1))
1455	>	sleep(10);
1456	>	} else {
1457	>	sprintf(combuf, "%s%s %s %s%s%s%s %s > %s",
1458	>	c_rpict, rep, vw, res, opts, po,
1459	>	zopt, oct1name, rawfile);
1460	>	}
1461	>	if ((pfile != NULL) & !do_rpiece) {
1462	>	if (!silent)
1463	>	printf("\t%s\n", combuf);
1464	>	fflush(stdout);
1465	>	sprintf(combuf, "%s%s %s %s%s%s %s > %s",
1466	>	c_rpict, rep, rppopt, res,
1467	>	opts, po, oct1name, rawfile);
1468	>	fp = popen(combuf, "w");
1469	>	if (fp == NULL)
1470	>	goto rperror;
1471	>	myprintview(vw, fp);
1472	>	if (pclose(fp))
1473	>	goto rperror;
1474	>	} else if (runcom(combuf))
1475	>	goto rperror;
1476		}
1477	<	if (runcom(combuf)) {           /* run rpict */
1478	<	fprintf(stderr, "%s: error rendering view %s\n",
1479	<	progname, vs);
1480	<	quit(1);
1477	>	if (do_rpiece) {                /* need to finish raw, first */
1478	>	finish_process();
1479	>	wait_process(1);
1480	>	if (!syncf_done(sfile)) {
1481	>	fprintf(stderr,
1482	>	"%s: %s did not complete rendering of view %s\n",
1483	>	progname, c_rpiece, vs);
1484	>	quit(1);
1485	>	}
1486		}
1487		if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1488		/* build pfilt command */
1489	<	if (mult > 1)
1490	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1491	<	pfopts, mult, mult, rawfile, picfile);
1489	>	if (do_rpiece)
1490	>	sprintf(combuf,
1491	>	"%s%s -x %d -y %d -p %.3f %s > %s",
1492	>	c_pfilt, pfopts, xres, yres, aspect,
1493	>	rawfile, picfile);
1494	>	else if (mult > 1)
1495	>	sprintf(combuf, "%s%s -x /%d -y /%d %s > %s",
1496	>	c_pfilt, pfopts, mult, mult,
1497	>	rawfile, picfile);
1498		else
1499	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1500	<	rawfile, picfile);
1501	<	if (runcom(combuf)) {           /* run pfilt */
1499	>	sprintf(combuf, "%s%s %s > %s", c_pfilt,
1500	>	pfopts, rawfile, picfile);
1501	>	if (runcom(combuf)) {   /* run pfilt */
1502		fprintf(stderr,
1503		"%s: error filtering view %s\n\t%s removed\n",
1504		progname, vs, picfile);
#	Line 1216 | Line 1508 | char   *opts, *po;
1508		}
1509		/* remove/rename raw file */
1510		if (vdef(RAWFILE)) {
1511	<	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1511	>	sprintf(combuf, "%s_%s.hdr", vval(RAWFILE), vs);
1512		mvfile(rawfile, combuf);
1513		} else
1514		rmfile(rawfile);
1515	<	finish_process();               /* leave if child */
1515	>	if (do_rpiece)                  /* done with sync file */
1516	>	rmfile(sfile);
1517	>	else
1518	>	finish_process();       /* exit if child */
1519		}
1520		wait_process(1);                /* wait for children to finish */
1521	+	if (pfile != NULL) {            /* clean up persistent rpict */
1522	+	RT_PID  pid;
1523	+	fp = fopen(pfile, "r");
1524	+	if (fp != NULL) {
1525	+	if (fscanf(fp, "%*s %d", &pid) != 1 ||
1526	+	kill(pid, 1) < 0)
1527	+	unlink(pfile);
1528	+	fclose(fp);
1529	+	}
1530	+	}
1531	+	return;
1532	+	rperror:
1533	+	fprintf(stderr, "%s: error rendering view %s\n", progname, vs);
1534	+	quit(1);
1535	+	#undef do_rpiece
1536		}
1537
1538
1539	<	touch(fn)                       /* update a file */
1540	<	char    *fn;
1539	>	static int
1540	>	touch(                  /* update a file */
1541	>	char    *fn
1542	>	)
1543		{
1544		if (!silent)
1545		printf("\ttouch %s\n", fn);
1546		if (!nprocs)
1547		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
1548		return(setfdate(fn, time((time_t *)NULL)));
1549		}
1550
1551
1552	<	runcom(cs)                      /* run command */
1553	<	char    *cs;
1552	>	static int
1553	>	runcom(                 /* run command */
1554	>	char    *cs
1555	>	)
1556		{
1557		if (!silent)            /* echo it */
1558		printf("\t%s\n", cs);
1559		if (!nprocs)
1560		return(0);
1561	<	fflush(stdout);         /* flush output and pass to shell */
1561	>	fflush(NULL);           /* flush output and pass to shell */
1562		return(system(cs));
1563		}
1564
1565
1566	<	rmfile(fn)                      /* remove a file */
1567	<	char    *fn;
1566	>	static int
1567	>	rmfile(                 /* remove a file */
1568	>	char    *fn
1569	>	)
1570		{
1571		if (!silent)
1572	<	#ifdef _WIN32
1262	<	printf("\tdel %s\n", fn);
1263	<	#else
1264	<	printf("\trm -f %s\n", fn);
1265	<	#endif
1572	>	printf("\t%s %s\n", DELCMD, fn);
1573		if (!nprocs)
1574		return(0);
1575		return(unlink(fn));
1576		}
1577
1578
1579	<	mvfile(fold, fnew)              /* move a file */
1580	<	char    *fold, *fnew;
1579	>	static int
1580	>	mvfile(         /* move a file */
1581	>	char    *fold,
1582	>	char    *fnew
1583	>	)
1584		{
1585		if (!silent)
1586	<	#ifdef _WIN32
1277	<	printf("\trename %s %s\n", fold, fnew);
1278	<	#else
1279	<	printf("\tmv %s %s\n", fold, fnew);
1280	<	#endif
1586	>	printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
1587		if (!nprocs)
1588		return(0);
1589		return(rename(fold, fnew));
#	Line 1285 | Line 1591 | char   *fold, *fnew;
1591
1592
1593		#ifdef RHAS_FORK_EXEC
1594	<	int
1595	<	next_process()                  /* fork the next process (max. nprocs) */
1594	>	static int
1595	>	next_process(int reserve)               /* fork the next process */
1596		{
1597	<	int     child_pid;
1597	>	RT_PID  child_pid;
1598
1599		if (nprocs <= 1)
1600		return(0);              /* it's us or no one */
1601	<	if (children_running < 0) {
1602	<	fprintf(stderr, "%s: internal error 1 in spawn_process()\n",
1601	>	if (inchild()) {
1602	>	fprintf(stderr, "%s: internal error 1 in next_process()\n",
1603		progname);
1604		quit(1);
1605		}
1606	+	if (reserve > 0 && children_running >= nprocs-reserve)
1607	+	return(0);              /* caller holding back process(es) */
1608		if (children_running >= nprocs)
1609		wait_process(0);        /* wait for someone to finish */
1610	<	fflush(stdout);
1610	>	fflush(NULL);                   /* flush output */
1611		child_pid = fork();             /* split process */
1612		if (child_pid == 0) {           /* we're the child */
1613		children_running = -1;
1614	+	nprocs = 1;
1615		return(0);
1616		}
1617		if (child_pid > 0) {            /* we're the parent */
#	Line 1313 | Line 1622 | next_process()                 /* fork the next process (max. nprocs
1622		return(0);
1623		}
1624
1625	<	wait_process(all)                       /* wait for process(es) to finish */
1626	<	int     all;
1625	>	static void
1626	>	wait_process(                   /* wait for process(es) to finish */
1627	>	int     all
1628	>	)
1629		{
1630	<	int     ourstatus = 0;
1631	<	int     pid, status;
1630	>	int     ourstatus = 0, status;
1631	>	RT_PID  pid;
1632
1633		if (all)
1634		all = children_running;
#	Line 1330 | Line 1641 | int    all;
1641		status = status>>8 & 0xff;
1642		--children_running;
1643		if (status != 0) {      /* child's problem is our problem */
1644	<	if (ourstatus == 0 & children_running > 0)
1644	>	if ((ourstatus == 0) & (children_running > 0))
1645		fprintf(stderr, "%s: waiting for remaining processes\n",
1646		progname);
1647		ourstatus = status;
#	Line 1341 | Line 1652 | int    all;
1652		quit(ourstatus);        /* bad status from child */
1653		}
1654		#else   /* ! RHAS_FORK_EXEC */
1655	<	int
1656	<	next_process()
1655	>	static int
1656	>	next_process(int reserve)
1657		{
1658		return(0);                      /* cannot start new process */
1659		}
1660	+	static void
1661		wait_process(all)
1662		int     all;
1663		{
1664		(void)all;                      /* no one to wait for */
1665		}
1666	+	int
1667	+	kill(pid, sig) /* win|unix_process.c should also wait and kill */
1668	+	RT_PID pid;
1669	+	int sig;
1670	+	{
1671	+	return 0;
1672	+	}
1673		#endif  /* ! RHAS_FORK_EXEC */
1674
1675	<	finish_process()                        /* exit a child process */
1675	>	static void
1676	>	finish_process(void)                    /* exit a child process */
1677		{
1678	<	if (children_running >= 0)
1678	>	if (!inchild())
1679		return;                 /* in parent -- noop */
1680		exit(0);
1681		}
#	Line 1380 | Line 1700 | char   *vname, *value;
1700		#endif
1701
1702
1703	<	badvalue(vc)                    /* report bad variable value and exit */
1704	<	int     vc;
1703	>	static void
1704	>	badvalue(                       /* report bad variable value and exit */
1705	>	int     vc
1706	>	)
1707		{
1708		fprintf(stderr, "%s: bad value for variable '%s'\n",
1709		progname, vnam(vc));
#	Line 1389 | Line 1711 | int    vc;
1711		}
1712
1713
1714	<	syserr(s)                       /* report a system error and exit */
1715	<	char    *s;
1714	>	static void
1715	>	syserr(                 /* report a system error and exit */
1716	>	char    *s
1717	>	)
1718		{
1719		perror(s);
1720		quit(1);

Diff Legend

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