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.8 by greg, Tue May 18 13:07:56 1993 UTC vs.
Revision 2.122 by greg, Thu Oct 22 18:09:37 2015 UTC

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

Diff Legend

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