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.68 by schorsch, Thu Jul 3 22:41:45 2003 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
12	+	#include "platform.h"
13	+	#include "view.h"
14	+	#include "paths.h"
15	+	#include "vars.h"
16
17	<	typedef struct {
18	<	char    *name;          /* variable name */
19	<	short   nick;           /* # characters required for nickname */
20	<	short   nass;           /* # assignments made */
21	<	char    *value;         /* assigned value(s) */
22	<	int     (*fixval)();    /* assignment checking function */
23	<	} VARIABLE;
24	<
25	<	int     onevalue(), catvalues();
26	<
27	<	/* variables */
28	<	#define OBJECT          0               /* object files */
29	<	#define SCENE           1               /* scene files */
30	<	#define MATERIAL        2               /* material files */
31	<	#define RENDER          3               /* rendering options */
32	<	#define OCONV           4               /* oconv options */
33	<	#define PFILT           5               /* pfilt options */
34	<	#define VIEW            6               /* view(s) for picture(s) */
35	<	#define ZONE            7               /* simulation zone */
36	<	#define QUALITY         8               /* desired rendering quality */
37	<	#define OCTREE          9               /* octree file name */
38	<	#define PICTURE         10              /* picture file name */
39	<	#define AMBFILE         11              /* ambient file name */
40	<	#define OPTFILE         12              /* rendering options file */
41	<	#define EXPOSURE        13              /* picture exposure setting */
42	<	#define RESOLUTION      14              /* maximum picture resolution */
43	<	#define UP              15              /* view up (X, Y or Z) */
43	<	#define INDIRECT        16              /* indirection in lighting */
44	<	#define DETAIL          17              /* level of scene detail */
45	<	#define PENUMBRAS       18              /* shadow penumbras are desired */
46	<	#define VARIABILITY     19              /* level of light variability */
47	<	#define REPORT          20              /* report frequency and errfile */
17	>	/* variables (alphabetical by name) */
18	>	#define AMBFILE         0               /* ambient file name */
19	>	#define DETAIL          1               /* level of scene detail */
20	>	#define EXPOSURE        2               /* picture exposure setting */
21	>	#define EYESEP          3               /* interocular distance */
22	>	#define ILLUM           4               /* mkillum input files */
23	>	#define INDIRECT        5               /* indirection in lighting */
24	>	#define MATERIAL        6               /* material files */
25	>	#define MKILLUM         7               /* mkillum options */
26	>	#define OBJECT          8               /* object files */
27	>	#define OCONV           9               /* oconv options */
28	>	#define OCTREE          10              /* octree file name */
29	>	#define OPTFILE         11              /* rendering options file */
30	>	#define PENUMBRAS       12              /* shadow penumbras are desired */
31	>	#define PFILT           13              /* pfilt options */
32	>	#define PICTURE         14              /* picture file root name */
33	>	#define QUALITY         15              /* desired rendering quality */
34	>	#define RAWFILE         16              /* raw picture file root name */
35	>	#define RENDER          17              /* rendering options */
36	>	#define REPORT          18              /* report frequency and errfile */
37	>	#define RESOLUTION      19              /* maximum picture resolution */
38	>	#define SCENE           20              /* scene files */
39	>	#define UP              21              /* view up (X, Y or Z) */
40	>	#define VARIABILITY     22              /* level of light variability */
41	>	#define VIEWS           23              /* view(s) for picture(s) */
42	>	#define ZFILE           24              /* distance file root name */
43	>	#define ZONE            25              /* simulation zone */
44		/* total number of variables */
45	<	#define NVARS           21
45	>	int NVARS = 26;
46
47	<	VARIABLE        vv[NVARS] = {           /* variable-value pairs */
48	<	{"objects",     3,      0,      NULL,   catvalues},
49	<	{"scene",       3,      0,      NULL,   catvalues},
47	>	VARIABLE        vv[] = {                /* variable-value pairs */
48	>	{"AMBFILE",     3,      0,      NULL,   onevalue},
49	>	{"DETAIL",      3,      0,      NULL,   qualvalue},
50	>	{"EXPOSURE",    3,      0,      NULL,   fltvalue},
51	>	{"EYESEP",      3,      0,      NULL,   fltvalue},
52	>	{"illum",       3,      0,      NULL,   catvalues},
53	>	{"INDIRECT",    3,      0,      NULL,   intvalue},
54		{"materials",   3,      0,      NULL,   catvalues},
55	<	{"render",      3,      0,      NULL,   catvalues},
55	>	{"mkillum",     3,      0,      NULL,   catvalues},
56	>	{"objects",     3,      0,      NULL,   catvalues},
57		{"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},
58		{"OCTREE",      3,      0,      NULL,   onevalue},
62	–	{"PICTURE",     3,      0,      NULL,   onevalue},
63	–	{"AMBFILE",     3,      0,      NULL,   onevalue},
59		{"OPTFILE",     3,      0,      NULL,   onevalue},
60	<	{"EXPOSURE",    3,      0,      NULL,   onevalue},
60	>	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
61	>	{"pfilt",       2,      0,      NULL,   catvalues},
62	>	{"PICTURE",     3,      0,      NULL,   onevalue},
63	>	{"QUALITY",     3,      0,      NULL,   qualvalue},
64	>	{"RAWFILE",     3,      0,      NULL,   onevalue},
65	>	{"render",      3,      0,      NULL,   catvalues},
66	>	{"REPORT",      3,      0,      NULL,   onevalue},
67		{"RESOLUTION",  3,      0,      NULL,   onevalue},
68	+	{"scene",       3,      0,      NULL,   catvalues},
69		{"UP",          2,      0,      NULL,   onevalue},
70	<	{"INDIRECT",    3,      0,      NULL,   onevalue},
71	<	{"DETAIL",      3,      0,      NULL,   onevalue},
72	<	{"PENUMBRAS",   3,      0,      NULL,   onevalue},
73	<	{"VARIABILITY", 3,      0,      NULL,   onevalue},
72	<	{"REPORT",      3,      0,      NULL,   onevalue},
70	>	{"VARIABILITY", 3,      0,      NULL,   qualvalue},
71	>	{"view",        2,      0,      NULL,   NULL},
72	>	{"ZFILE",       2,      0,      NULL,   onevalue},
73	>	{"ZONE",        2,      0,      NULL,   onevalue},
74		};
75
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	–
76		/* overture calculation file */
77	<	#ifdef NIX
78	<	char    overfile[] = "overture.raw";
77	>	#ifdef NULL_DEVICE
78	>	char    overfile[] = NULL_DEVICE;
79		#else
80	<	char    overfile[] = "/dev/null";
80	>	char    overfile[] = "overture.unf";
81		#endif
82
83	<	extern long     fdate(), time();
83	>	extern time_t   time();
84
85	<	long    scenedate;              /* date of latest scene or object file */
86	<	long    octreedate;             /* date of octree */
85	>	time_t  scenedate;              /* date of latest scene or object file */
86	>	time_t  octreedate;             /* date of octree */
87	>	time_t  matdate;                /* date of latest material file */
88	>	time_t  illumdate;              /* date of last illum file */
89
90	+	char    *oct0name;              /* name of pre-mkillum octree */
91	+	time_t  oct0date;               /* date of pre-mkillum octree */
92	+	char    *oct1name;              /* name of post-mkillum octree */
93	+	time_t  oct1date;               /* date of post-mkillum octree (>= matdate) */
94	+
95	+	int     nowarn = 0;             /* no warnings */
96		int     explicate = 0;          /* explicate variables */
97		int     silent = 0;             /* do work silently */
98	<	int     noaction = 0;           /* don't do anything */
98	>	int     touchonly = 0;          /* touch files only */
99	>	int     nprocs = 1;             /* maximum executing processes */
100	>	int     sayview = 0;            /* print view out */
101		char    *rvdevice = NULL;       /* rview output device */
102		char    *viewselect = NULL;     /* specific view only */
103
104		int     overture = 0;           /* overture calculation needed */
105
106	+	int     children_running = 0;   /* set negative in children */
107	+
108		char    *progname;              /* global argv[0] */
109	+	char    *rifname;               /* global rad input file name */
110
111	<	char    radname[MAXPATH];       /* root Radiance file name */
111	>	char    radname[PATH_MAX];      /* root Radiance file name */
112
113	+	#define inchild()       (children_running < 0)
114
115	+
116		main(argc, argv)
117		int     argc;
118		char    *argv[];
119		{
120		char    ropts[512];
121	+	char    popts[64];
122		int     i;
123
124		progname = argv[0];
#	Line 134 | Line 129 | char   *argv[];
129		silent++;
130		break;
131		case 'n':
132	<	noaction++;
132	>	nprocs = 0;
133		break;
134	+	case 'N':
135	+	nprocs = atoi(argv[++i]);
136	+	if (nprocs < 0)
137	+	nprocs = 0;
138	+	break;
139	+	case 't':
140	+	touchonly++;
141	+	break;
142		case 'e':
143		explicate++;
144		break;
145		case 'o':
146		rvdevice = argv[++i];
147		break;
148	+	case 'V':
149	+	sayview++;
150	+	break;
151		case 'v':
152		viewselect = argv[++i];
153		break;
154	+	case 'w':
155	+	nowarn++;
156	+	break;
157		default:
158		goto userr;
159		}
160		if (i >= argc)
161		goto userr;
162	+	rifname = argv[i];
163	+	/* check command-line options */
164	+	if (nprocs > 1 & viewselect != NULL)
165	+	nprocs = 1;
166		/* assign Radiance root file name */
167	<	rootname(radname, argv[i]);
167	>	rootname(radname, rifname);
168		/* load variable values */
169	<	load(argv[i]);
169	>	loadvars(rifname);
170		/* get any additional assignments */
171		for (i++; i < argc; i++)
172	<	setvariable(argv[i]);
172	>	if (setvariable(argv[i], matchvar) < 0) {
173	>	fprintf(stderr, "%s: unknown variable: %s\n",
174	>	progname, argv[i]);
175	>	quit(1);
176	>	}
177		/* check assignments */
178		checkvalues();
179		/* check files and dates */
#	Line 165 | Line 182 | char   *argv[];
182		setdefaults();
183		/* print all values if requested */
184		if (explicate)
185	<	printvals();
186	<	/* build octree */
185	>	printvars(stdout);
186	>	/* build octree (and run mkillum) */
187		oconv();
188		/* check date on ambient file */
189		checkambfile();
190		/* run simulation */
191	<	renderopts(ropts);
191	>	renderopts(ropts, popts);
192		xferopts(ropts);
193		if (rvdevice != NULL)
194	<	rview(ropts);
194	>	rview(ropts, popts);
195		else
196	<	rpict(ropts);
197	<	exit(0);
196	>	rpict(ropts, popts);
197	>	quit(0);
198		userr:
199		fprintf(stderr,
200	<	"Usage: %s [-s][-n][-e][-v view][-o dev] rfile [VAR=value ..]\n",
200	>	"Usage: %s [-w][-s][-n|-N npr][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
201		progname);
202	<	exit(1);
202	>	quit(1);
203		}
204
205
#	Line 201 | Line 218 | register char  *rn, *fn;
218		}
219
220
221	<	load(rfname)                    /* load Radiance simulation file */
222	<	char    *rfname;
221	>	time_t
222	>	checklast(fnames)                       /* check files and find most recent */
223	>	register char   *fnames;
224		{
225	<	FILE    *fp;
226	<	char    buf[512];
209	<	register char   *cp;
225	>	char    thisfile[PATH_MAX];
226	>	time_t  thisdate, lastdate = 0;
227
228	<	if (rfname == NULL)
229	<	fp = stdin;
230	<	else if ((fp = fopen(rfname, "r")) == NULL)
231	<	syserr(rfname);
232	<	while (fgetline(buf, sizeof(buf), fp) != NULL) {
233	<	for (cp = buf; *cp; cp++) {
234	<	switch (*cp) {
235	<	case '\\':
236	<	case '\n':
237	<	*cp = ' ';
221	<	continue;
222	<	case '#':
223	<	*cp = '\0';
224	<	break;
225	<	default:
226	<	continue;
227	<	}
228	<	break;
229	<	}
230	<	setvariable(buf);
228	>	if (fnames == NULL)
229	>	return(0);
230	>	while ((fnames = nextword(thisfile, PATH_MAX, fnames)) != NULL) {
231	>	if (thisfile[0] == '!' ||
232	>	(thisfile[0] == '\\' && thisfile[1] == '!'))
233	>	continue;
234	>	if (!(thisdate = fdate(thisfile)))
235	>	syserr(thisfile);
236	>	if (thisdate > lastdate)
237	>	lastdate = thisdate;
238		}
239	<	fclose(fp);
239	>	return(lastdate);
240		}
241
242
243	<	setvariable(ass)                /* assign variable according to string */
244	<	register char   *ass;
243	>	char *
244	>	newfname(orig, pred)            /* create modified file name */
245	>	char    *orig;
246	>	int     pred;
247		{
239	–	char    varname[32];
248		register char   *cp;
249	<	register VARIABLE       *vp;
250	<	register int    i;
243	<	int     n;
249	>	register int    n;
250	>	int     suffix;
251
252	<	while (isspace(*ass))           /* skip leading space */
253	<	ass++;
254	<	cp = varname;                   /* extract name */
255	<	while (cp < varname+sizeof(varname)-1
256	<	&& *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;
252	>	n = 0; cp = orig; suffix = -1;          /* suffix position, length */
253	>	while (*cp) {
254	>	if (*cp == '.') suffix = n;
255	>	else if (ISDIRSEP(*cp)) suffix = -1;
256	>	cp++; n++;
257		}
258	<	/* match variable from list */
259	<	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)
258	>	if (suffix == -1) suffix = n;
259	>	if ((cp = bmalloc(n+2)) == NULL)
260		syserr(progname);
261	<	strcpy(vp->value+i, ass);
262	<	vp->nass++;
263	<	}
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	<	;
261	>	strncpy(cp, orig, suffix);
262	>	cp[suffix] = pred;                      /* root name + pred + suffix */
263	>	strcpy(cp+suffix+1, orig+suffix);
264		return(cp);
265		}
266
267
322	–	int
323	–	vscale(vc)                      /* return scale for variable vc */
324	–	int     vc;
325	–	{
326	–	switch(vlet(vc)) {
327	–	case 'H':
328	–	return(HIGH);
329	–	case 'M':
330	–	return(MEDIUM);
331	–	case 'L':
332	–	return(LOW);
333	–	}
334	–	badvalue(vc);
335	–	}
336	–
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	–
268		checkfiles()                    /* check for existence and modified times */
269		{
270	<	char    *cp;
402	<	long    objdate;
270	>	time_t  objdate;
271
272		if (!vdef(OCTREE)) {
273	<	if ((cp = bmalloc(strlen(radname)+5)) == NULL)
273	>	if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL)
274		syserr(progname);
275	<	sprintf(cp, "%s.oct", radname);
408	<	vval(OCTREE) = cp;
275	>	sprintf(vval(OCTREE), "%s.oct", radname);
276		vdef(OCTREE)++;
277	+	} else if (vval(OCTREE)[0] == '!') {
278	+	fprintf(stderr, "%s: illegal '%s' specification\n",
279	+	progname, vnam(OCTREE));
280	+	quit(1);
281		}
282		octreedate = fdate(vval(OCTREE));
283	<	scenedate = -1;
284	<	if (vdef(SCENE)) {
285	<	scenedate = checklast(vval(SCENE));
286	<	if (vdef(OBJECT)) {
287	<	objdate = checklast(vval(OBJECT));
288	<	if (objdate > scenedate)
289	<	scenedate = objdate;
290	<	}
283	>	if (vdef(ILLUM)) {              /* illum requires secondary octrees */
284	>	oct0name = newfname(vval(OCTREE), '0');
285	>	oct1name = newfname(vval(OCTREE), '1');
286	>	oct0date = fdate(oct0name);
287	>	oct1date = fdate(oct1name);
288	>	} else
289	>	oct0name = oct1name = vval(OCTREE);
290	>	if ((scenedate = checklast(vval(SCENE))) &&
291	>	(objdate = checklast(vval(OBJECT))) > scenedate)
292	>	scenedate = objdate;
293	>	illumdate = checklast(vval(ILLUM));
294	>	if (!octreedate & !scenedate & !illumdate) {
295	>	fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname,
296	>	vnam(OCTREE), vnam(SCENE), vnam(ILLUM));
297	>	quit(1);
298		}
299	<	if (octreedate < 0 & scenedate < 0) {
422	<	fprintf(stderr, "%s: need '%s' or '%s'\n", progname,
423	<	vnam(OCTREE), vnam(SCENE));
424	<	exit(1);
425	<	}
299	>	matdate = checklast(vval(MATERIAL));
300		}
301
302
#	Line 431 | Line 305 | double org[3], *sizp;
305		{
306		extern FILE     *popen();
307		static double   oorg[3], osiz = 0.;
308	<	char    buf[MAXPATH+16];
308	>	double  min[3], max[3];
309	>	char    buf[1024];
310		FILE    *fp;
311	+	register int    i;
312
313	<	if (osiz <= FTINY) {
314	<	oconv();                /* does nothing if done already */
315	<	sprintf(buf, "getinfo -d < %s", vval(OCTREE));
316	<	if ((fp = popen(buf, "r")) == NULL)
317	<	syserr("getinfo");
318	<	if (fscanf(fp, "%lf %lf %lf %lf", &oorg[0], &oorg[1],
319	<	&oorg[2], &osiz) != 4) {
320	<	fprintf(stderr,
313	>	if (osiz <= FTINY)
314	>	if (!nprocs && fdate(oct1name) <
315	>	(scenedate>illumdate?scenedate:illumdate)) {
316	>	/* run getbbox */
317	>	sprintf(buf, "getbbox -w -h %s",
318	>	vdef(SCENE) ? vval(SCENE) : vval(ILLUM));
319	>	if ((fp = popen(buf, "r")) == NULL)
320	>	syserr("getbbox");
321	>	if (fscanf(fp, "%lf %lf %lf %lf %lf %lf",
322	>	&min[0], &max[0], &min[1], &max[1],
323	>	&min[2], &max[2]) != 6) {
324	>	fprintf(stderr,
325	>	"%s: error reading bounding box from getbbox\n",
326	>	progname);
327	>	quit(1);
328	>	}
329	>	for (i = 0; i < 3; i++)
330	>	if (max[i] - min[i] > osiz)
331	>	osiz = max[i] - min[i];
332	>	for (i = 0; i < 3; i++)
333	>	oorg[i] = (max[i]+min[i]-osiz)*.5;
334	>	pclose(fp);
335	>	} else {                                /* from octree */
336	>	oconv();        /* does nothing if done already */
337	>	sprintf(buf, "getinfo -d < %s", oct1name);
338	>	if ((fp = popen(buf, "r")) == NULL)
339	>	syserr("getinfo");
340	>	if (fscanf(fp, "%lf %lf %lf %lf", &oorg[0], &oorg[1],
341	>	&oorg[2], &osiz) != 4) {
342	>	fprintf(stderr,
343		"%s: error reading bounding cube from getinfo\n",
344	<	progname);
345	<	exit(1);
344	>	progname);
345	>	quit(1);
346	>	}
347	>	pclose(fp);
348		}
449	–	pclose(fp);
450	–	}
349		org[0] = oorg[0]; org[1] = oorg[1]; org[2] = oorg[2]; *sizp = osiz;
350		}
351
352
353		setdefaults()                   /* set default values for unassigned var's */
354		{
355	<	double  org[3], size;
355	>	double  org[3], lim[3], size;
356		char    buf[128];
357
358		if (!vdef(ZONE)) {
#	Line 464 | Line 362 | setdefaults()                  /* set default values for unassigned v
362		vval(ZONE) = savqstr(buf);
363		vdef(ZONE)++;
364		}
365	+	if (!vdef(EYESEP)) {
366	+	if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf",
367	+	&org[0], &lim[0], &org[1], &lim[1],
368	+	&org[2], &lim[2]) != 6)
369	+	badvalue(ZONE);
370	+	sprintf(buf, "%f",
371	+	0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2]));
372	+	vval(EYESEP) = savqstr(buf);
373	+	vdef(EYESEP)++;
374	+	}
375		if (!vdef(INDIRECT)) {
376		vval(INDIRECT) = "0";
377		vdef(INDIRECT)++;
#	Line 480 | Line 388 | setdefaults()                  /* set default values for unassigned v
388		vval(PICTURE) = radname;
389		vdef(PICTURE)++;
390		}
391	<	if (!vdef(VIEW)) {
392	<	vval(VIEW) = "X";
393	<	vdef(VIEW)++;
391	>	if (!vdef(VIEWS)) {
392	>	vval(VIEWS) = "X";
393	>	vdef(VIEWS)++;
394		}
395		if (!vdef(DETAIL)) {
396		vval(DETAIL) = "M";
#	Line 499 | Line 407 | setdefaults()                  /* set default values for unassigned v
407		}
408
409
410	<	printvals()                     /* print variable values */
410	>	oconv()                         /* run oconv and mkillum if necessary */
411		{
412	<	register int    i, j;
412	>	static char     illumtmp[] = "ilXXXXXX";
413	>	char    combuf[PATH_MAX], ocopts[64], mkopts[64];
414
415	<	for (i = 0; i < NVARS; i++)
416	<	for (j = 0; j < vdef(i); j++)
417	<	printf("%s= %s\n", vnam(i), nvalue(vv+i, j));
418	<	fflush(stdout);
419	<	}
420	<
421	<
422	<	oconv()                         /* run oconv if necessary */
423	<	{
424	<	char    combuf[512], ocopts[64];
425	<
426	<	if (octreedate >= scenedate)    /* check dates */
415	>	oconvopts(ocopts);              /* get options */
416	>	if (octreedate < scenedate) {   /* check date on original octree */
417	>	if (touchonly && octreedate)
418	>	touch(vval(OCTREE));
419	>	else {                          /* build command */
420	>	if (vdef(MATERIAL))
421	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
422	>	vval(MATERIAL), vval(SCENE),
423	>	vval(OCTREE));
424	>	else
425	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
426	>	vval(SCENE), vval(OCTREE));
427	>
428	>	if (runcom(combuf)) {           /* run it */
429	>	fprintf(stderr,
430	>	"%s: error generating octree\n\t%s removed\n",
431	>	progname, vval(OCTREE));
432	>	unlink(vval(OCTREE));
433	>	quit(1);
434	>	}
435	>	}
436	>	octreedate = time((time_t *)NULL);
437	>	if (octreedate < scenedate)     /* in case clock is off */
438	>	octreedate = scenedate;
439	>	}
440	>	if (oct1name == vval(OCTREE))           /* no mkillum? */
441	>	oct1date = octreedate > matdate ? octreedate : matdate;
442	>	if (oct1date >= octreedate & oct1date >= matdate
443	>	& oct1date >= illumdate)        /* all done */
444		return;
445	<	/* build command */
446	<	oconvopts(ocopts);
447	<	if (vdef(MATERIAL))
448	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
449	<	vval(MATERIAL), vval(SCENE), vval(OCTREE));
450	<	else
451	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
452	<	vval(SCENE), vval(OCTREE));
453	<
454	<	if (runcom(combuf)) {           /* run it */
455	<	fprintf(stderr, "%s: error generating octree\n\t%s removed\n",
456	<	progname, vval(OCTREE));
457	<	unlink(vval(OCTREE));
458	<	exit(1);
445	>	/* make octree0 */
446	>	if (oct0date < scenedate | oct0date < illumdate) {
447	>	if (touchonly && oct0date)
448	>	touch(oct0name);
449	>	else {                          /* build command */
450	>	if (octreedate)
451	>	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
452	>	vval(OCTREE), vval(ILLUM), oct0name);
453	>	else if (vdef(MATERIAL))
454	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
455	>	vval(MATERIAL), vval(ILLUM), oct0name);
456	>	else
457	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
458	>	vval(ILLUM), oct0name);
459	>	if (runcom(combuf)) {           /* run it */
460	>	fprintf(stderr,
461	>	"%s: error generating octree\n\t%s removed\n",
462	>	progname, oct0name);
463	>	unlink(oct0name);
464	>	quit(1);
465	>	}
466	>	}
467	>	oct0date = time((time_t *)NULL);
468	>	if (oct0date < octreedate)      /* in case clock is off */
469	>	oct0date = octreedate;
470	>	if (oct0date < illumdate)       /* ditto */
471	>	oct0date = illumdate;
472	>	}
473	>	if (touchonly && oct1date)
474	>	touch(oct1name);
475	>	else {
476	>	mkillumopts(mkopts);            /* build mkillum command */
477	>	mktemp(illumtmp);
478	>	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
479	>	oct0name, vval(ILLUM), illumtmp);
480	>	if (runcom(combuf)) {                   /* run it */
481	>	fprintf(stderr, "%s: error running mkillum\n",
482	>	progname);
483	>	unlink(illumtmp);
484	>	quit(1);
485	>	}
486	>	/* make octree1 (frozen) */
487	>	if (octreedate)
488	>	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
489	>	vval(OCTREE), illumtmp, oct1name);
490	>	else if (vdef(MATERIAL))
491	>	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
492	>	vval(MATERIAL), illumtmp, oct1name);
493	>	else
494	>	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
495	>	illumtmp, oct1name);
496	>	if (runcom(combuf)) {           /* run it */
497	>	fprintf(stderr,
498	>	"%s: error generating octree\n\t%s removed\n",
499	>	progname, oct1name);
500	>	unlink(oct1name);
501	>	unlink(illumtmp);
502	>	quit(1);
503	>	}
504	>	rmfile(illumtmp);
505		}
506	<	octreedate = time(0);
506	>	oct1date = time((time_t *)NULL);
507	>	if (oct1date < oct0date)        /* in case clock is off */
508	>	oct1date = oct0date;
509		}
510
511
#	Line 557 | Line 531 | register char  *oo;
531		}
532
533
534	+	mkillumopts(mo)                         /* get mkillum options */
535	+	register char   *mo;
536	+	{
537	+	/* BEWARE:  This may be called via setdefaults(), so no assumptions */
538	+
539	+	*mo = '\0';
540	+	if (vdef(MKILLUM))
541	+	addarg(mo, vval(MKILLUM));
542	+	}
543	+
544	+
545		checkambfile()                  /* check date on ambient file */
546		{
547	<	long    afdate;
547	>	time_t  afdate;
548
549	<	if (vdef(AMBFILE)) {
550	<	afdate = fdate(vval(AMBFILE));
551	<	if (afdate >= 0 & octreedate > afdate)
549	>	if (!vdef(AMBFILE))
550	>	return;
551	>	if (!(afdate = fdate(vval(AMBFILE))))
552	>	return;
553	>	if (oct1date > afdate)
554	>	if (touchonly)
555	>	touch(vval(AMBFILE));
556	>	else
557		rmfile(vval(AMBFILE));
568	–	}
558		}
559
560
#	Line 574 | Line 563 | ambval()                               /* compute ambient value */
563		{
564		if (vdef(EXPOSURE)) {
565		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
566	<	return(.5/pow(2.,atof(vval(EXPOSURE))));
567	<	if (isdigit(vval(EXPOSURE)[0]) || vval(EXPOSURE)[0] == '.')
579	<	return(.5/atof(vval(EXPOSURE)));
580	<	badvalue(EXPOSURE);
566	>	return(.5/pow(2.,vflt(EXPOSURE)));
567	>	return(.5/vflt(EXPOSURE));
568		}
569		if (vlet(ZONE) == 'E')
570		return(10.);
#	Line 587 | Line 574 | ambval()                               /* compute ambient value */
574		}
575
576
577	<	lowqopts(op)                            /* low quality rendering options */
577	>	renderopts(op, po)                      /* set rendering options */
578	>	char    *op, *po;
579	>	{
580	>	switch(vscale(QUALITY)) {
581	>	case LOW:
582	>	lowqopts(op, po);
583	>	break;
584	>	case MEDIUM:
585	>	medqopts(op, po);
586	>	break;
587	>	case HIGH:
588	>	hiqopts(op, po);
589	>	break;
590	>	}
591	>	}
592	>
593	>
594	>	lowqopts(op, po)                        /* low quality rendering options */
595		register char   *op;
596	+	char    *po;
597		{
598		double  d, org[3], siz[3];
599
600		*op = '\0';
601	+	*po = '\0';
602		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
603		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
604		badvalue(ZONE);
605		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
606	+	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
607	+	badvalue(ZONE);
608		getoctcube(org, &d);
609		d *= 3./(siz[0]+siz[1]+siz[2]);
610		switch (vscale(DETAIL)) {
611		case LOW:
612	<	op = addarg(op, "-ps 16 -dp 16");
612	>	po = addarg(po, "-ps 16");
613	>	op = addarg(op, "-dp 64");
614		sprintf(op, " -ar %d", (int)(4*d));
615		op += strlen(op);
616		break;
617		case MEDIUM:
618	<	op = addarg(op, "-ps 8 -dp 32");
618	>	po = addarg(po, "-ps 8");
619	>	op = addarg(op, "-dp 128");
620		sprintf(op, " -ar %d", (int)(8*d));
621		op += strlen(op);
622		break;
623		case HIGH:
624	<	op = addarg(op, "-ps 4 -dp 64");
624	>	po = addarg(po, "-ps 4");
625	>	op = addarg(op, "-dp 256");
626		sprintf(op, " -ar %d", (int)(16*d));
627		op += strlen(op);
628		break;
629		}
630	<	op = addarg(op, "-pt .16");
630	>	po = addarg(po, "-pt .16");
631		if (vbool(PENUMBRAS))
632		op = addarg(op, "-ds .4");
633		else
634		op = addarg(op, "-ds 0");
635	<	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .7");
635	>	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5");
636		if (vdef(AMBFILE)) {
637		sprintf(op, " -af %s", vval(AMBFILE));
638		op += strlen(op);
#	Line 629 | Line 640 | register char  *op;
640		overture = 0;
641		switch (vscale(VARIABILITY)) {
642		case LOW:
643	<	op = addarg(op, "-aa .4 -ad 32");
643	>	op = addarg(op, "-aa .4 -ad 64");
644		break;
645		case MEDIUM:
646	<	op = addarg(op, "-aa .3 -ad 64");
646	>	op = addarg(op, "-aa .3 -ad 128");
647		break;
648		case HIGH:
649	<	op = addarg(op, "-aa .25 -ad 128");
649	>	op = addarg(op, "-aa .25 -ad 256");
650		break;
651		}
652		op = addarg(op, "-as 0");
#	Line 648 | Line 659 | register char  *op;
659		}
660
661
662	<	medqopts(op)                            /* medium quality rendering options */
662	>	medqopts(op, po)                        /* medium quality rendering options */
663		register char   *op;
664	+	char    *po;
665		{
666	<	double  d, org[3], siz[3];
666	>	double  d, org[3], siz[3], asz;
667
668		*op = '\0';
669	+	*po = '\0';
670		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
671		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
672		badvalue(ZONE);
673		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
674	+	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
675	+	badvalue(ZONE);
676		getoctcube(org, &d);
677	<	d *= 3./(siz[0]+siz[1]+siz[2]);
677	>	asz = (siz[0]+siz[1]+siz[2])/3.;
678	>	d /= asz;
679		switch (vscale(DETAIL)) {
680		case LOW:
681	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
682	<	op = addarg(op, "-dp 64");
681	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
682	>	op = addarg(op, "-dp 256");
683		sprintf(op, " -ar %d", (int)(8*d));
684		op += strlen(op);
685	+	sprintf(op, " -ms %.2g", asz/20.);
686	+	op += strlen(op);
687		break;
688		case MEDIUM:
689	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
690	<	op = addarg(op, "-dp 128");
689	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
690	>	op = addarg(op, "-dp 512");
691		sprintf(op, " -ar %d", (int)(16*d));
692		op += strlen(op);
693	+	sprintf(op, " -ms %.2g", asz/40.);
694	+	op += strlen(op);
695		break;
696		case HIGH:
697	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
698	<	op = addarg(op, "-dp 256");
697	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
698	>	op = addarg(op, "-dp 1024");
699		sprintf(op, " -ar %d", (int)(32*d));
700		op += strlen(op);
701	+	sprintf(op, " -ms %.2g", asz/80.);
702	+	op += strlen(op);
703		break;
704		}
705	<	op = addarg(op, "-pt .08");
705	>	po = addarg(po, "-pt .08");
706		if (vbool(PENUMBRAS))
707	<	op = addarg(op, "-ds .2 -dj .35");
707	>	op = addarg(op, "-ds .2 -dj .5");
708		else
709		op = addarg(op, "-ds .3");
710	<	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .15");
710	>	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
711		if (overture = vint(INDIRECT)) {
712		sprintf(op, " -ab %d", overture);
713		op += strlen(op);
#	Line 697 | Line 719 | register char  *op;
719		overture = 0;
720		switch (vscale(VARIABILITY)) {
721		case LOW:
722	<	op = addarg(op, "-aa .25 -ad 128 -as 0");
722	>	op = addarg(op, "-aa .25 -ad 196 -as 0");
723		break;
724		case MEDIUM:
725	<	op = addarg(op, "-aa .2 -ad 300 -as 64");
725	>	op = addarg(op, "-aa .2 -ad 400 -as 64");
726		break;
727		case HIGH:
728	<	op = addarg(op, "-aa .15 -ad 500 -as 128");
728	>	op = addarg(op, "-aa .15 -ad 768 -as 196");
729		break;
730		}
731		d = ambval();
#	Line 715 | Line 737 | register char  *op;
737		}
738
739
740	<	hiqopts(op)                             /* high quality rendering options */
740	>	hiqopts(op, po)                         /* high quality rendering options */
741		register char   *op;
742	+	char    *po;
743		{
744	<	double  d, org[3], siz[3];
744	>	double  d, org[3], siz[3], asz;
745
746		*op = '\0';
747	+	*po = '\0';
748		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
749		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
750		badvalue(ZONE);
751		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
752	+	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
753	+	badvalue(ZONE);
754		getoctcube(org, &d);
755	<	d *= 3./(siz[0]+siz[1]+siz[2]);
755	>	asz = (siz[0]+siz[1]+siz[2])/3.;
756	>	d /= asz;
757		switch (vscale(DETAIL)) {
758		case LOW:
759	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
760	<	op = addarg(op, "-dp 256");
759	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
760	>	op = addarg(op, "-dp 1024");
761		sprintf(op, " -ar %d", (int)(16*d));
762		op += strlen(op);
763	+	sprintf(op, " -ms %.2g", asz/40.);
764	+	op += strlen(op);
765		break;
766		case MEDIUM:
767	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
768	<	op = addarg(op, "-dp 512");
767	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
768	>	op = addarg(op, "-dp 2048");
769		sprintf(op, " -ar %d", (int)(32*d));
770		op += strlen(op);
771	+	sprintf(op, " -ms %.2g", asz/80.);
772	+	op += strlen(op);
773		break;
774		case HIGH:
775	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
776	<	op = addarg(op, "-dp 1024");
775	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
776	>	op = addarg(op, "-dp 4096");
777		sprintf(op, " -ar %d", (int)(64*d));
778		op += strlen(op);
779	+	sprintf(op, " -ms %.2g", asz/160.);
780	+	op += strlen(op);
781		break;
782		}
783	<	op = addarg(op, "-pt .04");
783	>	po = addarg(po, "-pt .04");
784		if (vbool(PENUMBRAS))
785	<	op = addarg(op, "-ds .1 -dj .7");
785	>	op = addarg(op, "-ds .1 -dj .65");
786		else
787		op = addarg(op, "-ds .2");
788	<	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .03");
788	>	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
789		sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
790		op += strlen(op);
791		if (vdef(AMBFILE)) {
#	Line 762 | Line 795 | register char  *op;
795		overture = 0;
796		switch (vscale(VARIABILITY)) {
797		case LOW:
798	<	op = addarg(op, "-aa .15 -ad 200 -as 0");
798	>	op = addarg(op, "-aa .15 -ad 256 -as 0");
799		break;
800		case MEDIUM:
801	<	op = addarg(op, "-aa .125 -ad 512 -as 128");
801	>	op = addarg(op, "-aa .125 -ad 512 -as 256");
802		break;
803		case HIGH:
804	<	op = addarg(op, "-aa .08 -ad 850 -as 256");
804	>	op = addarg(op, "-aa .08 -ad 1024 -as 512");
805		break;
806		}
807		d = ambval();
#	Line 784 | Line 817 | xferopts(ro)                           /* transfer options if indicated */
817		char    *ro;
818		{
819		int     fd, n;
820	+	register char   *cp;
821
822		n = strlen(ro);
823		if (n < 2)
824		return;
825		if (vdef(OPTFILE)) {
826	<	if ((fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666)) == -1)
826	>	for (cp = ro; cp[1]; cp++)
827	>	if (isspace(cp[1]) && (cp[2] == '@' ||
828	>	(cp[2] == '-' && isalpha(cp[3]))))
829	>	*cp = '\n';
830	>	else
831	>	*cp = cp[1];
832	>	*cp = '\n';
833	>	fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666);
834	>	if (fd < 0 || write(fd, ro, n) != n || close(fd) < 0)
835		syserr(vval(OPTFILE));
836	<	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));
836	>	sprintf(ro, " @%s", vval(OPTFILE));
837		}
838	<	#ifdef MSDOS
838	>	#ifdef _WIN32
839		else if (n > 50) {
840		setenv("ROPT", ro+1);
841		strcpy(ro, " $ROPT");
#	Line 814 | Line 852 | register char  *po;
852		po = addarg(po, "-1 -e");
853		po = addarg(po, vval(EXPOSURE));
854		}
855	<	if (vscale(QUALITY) == HIGH)
856	<	po = addarg(po, "-r .65");
855	>	switch (vscale(QUALITY)) {
856	>	case MEDIUM:
857	>	po = addarg(po, "-r .6");
858	>	break;
859	>	case HIGH:
860	>	po = addarg(po, "-m .25");
861	>	break;
862	>	}
863		if (vdef(PFILT))
864		po = addarg(po, vval(PFILT));
865		}
#	Line 845 | Line 889 | register char  *vs;
889		register int    i;
890		double  cent[3], dim[3], mult, d;
891
892	<	if (*vs == '-')
892	>	if (vs == NULL || *vs == '-')
893		return(vs);
894		upax = 0;                       /* get the up vector */
895		if (vdef(UP)) {
#	Line 876 | Line 920 | register char  *vs;
920		zpos = -1; vs++;
921		}
922		viewtype = 'v';
923	<	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h')
923	>	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c')
924		viewtype = *vs++;
925		cp = viewopts;
926		if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {       /* got one! */
#	Line 887 | Line 931 | register char  *vs;
931		badvalue(ZONE);
932		for (i = 0; i < 3; i++) {
933		dim[i] -= cent[i];
934	+	if (dim[i] <= FTINY)
935	+	badvalue(ZONE);
936		cent[i] += .5*dim[i];
937		}
938		mult = vlet(ZONE)=='E' ? 2. : .45 ;
#	Line 929 | Line 975 | register char  *vs;
975		case 'h':
976		cp = addarg(cp, "-vh 180 -vv 180");
977		break;
978	+	case 'c':
979	+	cp = addarg(cp, "-vh 180 -vv 90");
980	+	break;
981		}
982		} else {
983		while (!isspace(*vs))           /* else skip id */
#	Line 939 | Line 988 | register char  *vs;
988		cp += strlen(cp);
989		}
990		}
991	<	strcpy(cp, vs);                 /* append any additional options */
992	<	#ifdef MSDOS
991	>	if (cp == viewopts)             /* append any additional options */
992	>	vs++;           /* skip prefixed space if unneeded */
993	>	strcpy(cp, vs);
994	>	#ifdef _WIN32
995		if (strlen(viewopts) > 40) {
996		setenv("VIEW", viewopts);
997		return("$VIEW");
#	Line 955 | Line 1006 | getview(n, vn)                         /* get view n, or NULL if none */
1006		int     n;
1007		char    *vn;            /* returned view name */
1008		{
1009	<	register char   *mv = NULL;
1009	>	register char   *mv;
1010
1011		if (viewselect != NULL) {               /* command-line selected */
1012		if (n)                          /* only do one */
#	Line 970 | Line 1021 | char   *vn;            /* returned view name */
1021		;
1022		*vn = '\0';
1023		}
1024	+	/* view number? */
1025	+	if (isint(viewselect))
1026	+	return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
1027		/* check list */
1028	<	while ((mv = nvalue(vv+VIEW, n++)) != NULL)
1028	>	while ((mv = nvalue(VIEWS, n++)) != NULL)
1029		if (matchword(viewselect, mv))
1030		return(specview(mv));
1031		return(specview(viewselect));   /* standard view? */
1032		}
1033	<	mv = nvalue(vv+VIEW, n);                /* use view n */
1033	>	mv = nvalue(VIEWS, n);          /* use view n */
1034		if (vn != NULL & mv != NULL) {
1035	<	if (*mv != '-')
1036	<	while (*mv && !isspace(*mv))
1037	<	*vn++ = *mv++;
1035	>	register char   *mv2 = mv;
1036	>	if (*mv2 != '-')
1037	>	while (*mv2 && !isspace(*mv2))
1038	>	*vn++ = *mv2++;
1039		*vn = '\0';
1040		}
1041		return(specview(mv));
1042		}
1043
1044
1045	<	rview(opts)                             /* run rview with first view */
1046	<	char    *opts;
1045	>	int
1046	>	myprintview(vopts, fp)                  /* print out selected view */
1047	>	register char   *vopts;
1048	>	FILE    *fp;
1049		{
1050	<	char    combuf[512];
1050	>	VIEW    vwr;
1051	>	char    buf[128];
1052	>	register char   *cp;
1053	>	again:
1054	>	if (vopts == NULL)
1055	>	return(-1);
1056	>	#ifdef _WIN32
1057	>	if (vopts[0] == '$') {
1058	>	vopts = getenv(vopts+1);
1059	>	goto again;
1060	>	}
1061	>	#endif
1062	>	copystruct(&vwr, &stdview);
1063	>	sscanview(&vwr, cp=vopts);              /* set initial options */
1064	>	while ((cp = strstr(cp, "-vf ")) != NULL &&
1065	>	*atos(buf, sizeof(buf), cp += 4)) {
1066	>	viewfile(buf, &vwr, NULL);      /* load -vf file */
1067	>	sscanview(&vwr, cp);            /* reset tail */
1068	>	}
1069	>	fputs(VIEWSTR, fp);
1070	>	fprintview(&vwr, fp);                   /* print full spec. */
1071	>	fputc('\n', fp);
1072	>	return(0);
1073	>	}
1074	>
1075	>
1076	>	rview(opts, po)                         /* run rview with first view */
1077	>	char    *opts, *po;
1078	>	{
1079	>	char    *vw;
1080	>	char    combuf[PATH_MAX];
1081		/* build command */
1082	<	sprintf(combuf, "rview %s%s ", getview(0, NULL), opts);
1082	>	if (touchonly || (vw = getview(0, NULL)) == NULL)
1083	>	return;
1084	>	if (sayview)
1085	>	myprintview(vw, stdout);
1086	>	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1087		if (rvdevice != NULL)
1088		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1089	<	strcat(combuf, vval(OCTREE));
1089	>	if (vdef(EXPOSURE))
1090	>	sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1091	>	strcat(combuf, oct1name);
1092		if (runcom(combuf)) {           /* run it */
1093		fprintf(stderr, "%s: error running rview\n", progname);
1094	<	exit(1);
1094	>	quit(1);
1095		}
1096		}
1097
1098
1099	<	rpict(opts)                             /* run rpict and pfilt for each view */
1100	<	char    *opts;
1099	>	rpict(opts, po)                         /* run rpict and pfilt for each view */
1100	>	char    *opts, *po;
1101		{
1102	<	char    combuf[1024];
1103	<	char    rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
1102	>	char    combuf[PATH_MAX];
1103	>	char    rawfile[PATH_MAX], picfile[PATH_MAX];
1104	>	char    zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
1105	>	char    rppopt[128], *pfile = NULL;
1106		char    pfopts[128];
1107		char    vs[32], *vw;
1108		int     vn, mult;
1109	+	FILE    *fp;
1110	+	time_t  rfdt, pfdt;
1111		/* get pfilt options */
1112		pfiltopts(pfopts);
1113		/* get resolution, reporting */
1114	<	mult = vscale(QUALITY)+1;
1114	>	switch (vscale(QUALITY)) {
1115	>	case LOW:
1116	>	mult = 1;
1117	>	break;
1118	>	case MEDIUM:
1119	>	mult = 2;
1120	>	break;
1121	>	case HIGH:
1122	>	mult = 3;
1123	>	break;
1124	>	}
1125		{
1126		int     xres, yres;
1127		double  aspect;
#	Line 1041 | Line 1148 | char   *opts;
1148		else
1149		badvalue(REPORT);
1150		}
1151	<	/* do each view */
1152	<	vn = 0;
1151	>	/* set up parallel rendering */
1152	>	if (nprocs > 1 & !vdef(ZFILE)) {
1153	>	strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1154	>	pfile = rppopt+9;
1155	>	if (mktemp(pfile) == NULL)
1156	>	pfile = NULL;
1157	>	}
1158	>	vn = 0;                                 /* do each view */
1159		while ((vw = getview(vn++, vs)) != NULL) {
1160	+	if (sayview)
1161	+	myprintview(vw, stdout);
1162		if (!vs[0])
1163		sprintf(vs, "%d", vn);
1164		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1165	+	if (vdef(ZFILE))
1166	+	sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1167	+	else
1168	+	zopt[0] = '\0';
1169		/* check date on picture */
1170	<	if (fdate(picfile) > octreedate)
1170	>	pfdt = fdate(picfile);
1171	>	if (pfdt >= oct1date)
1172		continue;
1173	+	/* get raw file name */
1174	+	sprintf(rawfile, "%s_%s.unf",
1175	+	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs);
1176	+	rfdt = fdate(rawfile);
1177	+	if (touchonly) {                /* update times only */
1178	+	if (rfdt) {
1179	+	if (rfdt < oct1date)
1180	+	touch(rawfile);
1181	+	} else if (pfdt && pfdt < oct1date)
1182	+	touch(picfile);
1183	+	continue;
1184	+	}
1185	+	if (next_process()) {           /* parallel running? */
1186	+	if (pfile != NULL)
1187	+	sleep(20);
1188	+	continue;
1189	+	}
1190	+	/* XXX Remember to call finish_process() */
1191		/* build rpict command */
1192	<	sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1193	<	if (fdate(rawfile) > octreedate)        /* recover */
1194	<	sprintf(combuf, "rpict%s%s -ro %s %s",
1195	<	rep, opts, rawfile, vval(OCTREE));
1196	<	else {
1192	>	if (rfdt >= oct1date) {         /* recover */
1193	>	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1194	>	rep, po, opts, zopt, rawfile, oct1name);
1195	>	if (runcom(combuf))     /* run rpict */
1196	>	goto rperror;
1197	>	} else {
1198		if (overture) {         /* run overture calculation */
1199		sprintf(combuf,
1200		"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1201		rep, vw, opts,
1202	<	vval(OCTREE), overfile);
1202	>	oct1name, overfile);
1203		if (runcom(combuf)) {
1204		fprintf(stderr,
1205		"%s: error in overture for view %s\n",
1206		progname, vs);
1207	<	exit(1);
1207	>	quit(1);
1208		}
1209	<	#ifdef NIX
1209	>	#ifndef NULL_DEVICE
1210		rmfile(overfile);
1211		#endif
1212		}
1213	<	sprintf(combuf, "rpict%s %s %s%s %s > %s",
1214	<	rep, vw, res, opts,
1215	<	vval(OCTREE), rawfile);
1213	>	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1214	>	rep, vw, res, po, opts,
1215	>	zopt, oct1name, rawfile);
1216	>	if (pfile != NULL && inchild()) {
1217	>	/* rpict persistent mode */
1218	>	if (!silent)
1219	>	printf("\t%s\n", combuf);
1220	>	sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
1221	>	rep, rppopt, res, po, opts,
1222	>	oct1name, rawfile);
1223	>	fflush(stdout);
1224	>	fp = popen(combuf, "w");
1225	>	if (fp == NULL)
1226	>	goto rperror;
1227	>	myprintview(vw, fp);
1228	>	if (pclose(fp))
1229	>	goto rperror;
1230	>	} else {                /* rpict normal mode */
1231	>	if (runcom(combuf))
1232	>	goto rperror;
1233	>	}
1234		}
1235	<	if (runcom(combuf)) {           /* run rpict */
1079	<	fprintf(stderr, "%s: error rendering view %s\n",
1080	<	progname, vs);
1081	<	exit(1);
1082	<	}
1235	>	if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1236		/* build pfilt command */
1237	<	if (mult > 1)
1238	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1237	>	if (mult > 1)
1238	>	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1239		pfopts, mult, mult, rawfile, picfile);
1240	<	else
1241	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1242	<	rawfile, picfile);
1243	<	if (runcom(combuf)) {           /* run pfilt */
1244	<	fprintf(stderr,
1245	<	"%s: error filtering view %s\n\t%s removed\n",
1246	<	progname, vs, picfile);
1247	<	unlink(picfile);
1248	<	exit(1);
1240	>	else
1241	>	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1242	>	rawfile, picfile);
1243	>	if (runcom(combuf)) {   /* run pfilt */
1244	>	fprintf(stderr,
1245	>	"%s: error filtering view %s\n\t%s removed\n",
1246	>	progname, vs, picfile);
1247	>	unlink(picfile);
1248	>	quit(1);
1249	>	}
1250		}
1251	<	/* remove raw file */
1252	<	rmfile(rawfile);
1251	>	/* remove/rename raw file */
1252	>	if (vdef(RAWFILE)) {
1253	>	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1254	>	mvfile(rawfile, combuf);
1255	>	} else
1256	>	rmfile(rawfile);
1257	>	finish_process();               /* leave if child */
1258		}
1259	+	wait_process(1);                /* wait for children to finish */
1260	+	if (pfile != NULL) {            /* clean up rpict persistent mode */
1261	+	int     pid;
1262	+	fp = fopen(pfile, "r");
1263	+	if (fp != NULL) {
1264	+	if (fscanf(fp, "%*s %d", &pid) != 1 ||
1265	+	kill(pid, 1) == -1)
1266	+	unlink(pfile);
1267	+	fclose(fp);
1268	+	}
1269	+	}
1270	+	return;
1271	+	rperror:
1272	+	fprintf(stderr, "%s: error rendering view %s\n", progname, vs);
1273	+	quit(1);
1274		}
1275
1276
1277	+	touch(fn)                       /* update a file */
1278	+	char    *fn;
1279	+	{
1280	+	if (!silent)
1281	+	printf("\ttouch %s\n", fn);
1282	+	if (!nprocs)
1283	+	return(0);
1284	+	#ifdef notused
1285	+	if (access(fn, F_OK) == -1)             /* create it */
1286	+	if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
1287	+	return(-1);
1288	+	#endif
1289	+	return(setfdate(fn, time((time_t *)NULL)));
1290	+	}
1291	+
1292	+
1293		runcom(cs)                      /* run command */
1294		char    *cs;
1295		{
1296		if (!silent)            /* echo it */
1297		printf("\t%s\n", cs);
1298	<	if (noaction)
1298	>	if (!nprocs)
1299		return(0);
1300		fflush(stdout);         /* flush output and pass to shell */
1301		return(system(cs));
#	Line 1116 | Line 1306 | rmfile(fn)                     /* remove a file */
1306		char    *fn;
1307		{
1308		if (!silent)
1309	<	#ifdef MSDOS
1309	>	#ifdef _WIN32
1310		printf("\tdel %s\n", fn);
1311		#else
1312		printf("\trm -f %s\n", fn);
1313		#endif
1314	<	if (noaction)
1314	>	if (!nprocs)
1315		return(0);
1316		return(unlink(fn));
1317		}
1318
1319
1320	<	#ifdef MSDOS
1320	>	mvfile(fold, fnew)              /* move a file */
1321	>	char    *fold, *fnew;
1322	>	{
1323	>	if (!silent)
1324	>	#ifdef _WIN32
1325	>	printf("\trename %s %s\n", fold, fnew);
1326	>	#else
1327	>	printf("\tmv %s %s\n", fold, fnew);
1328	>	#endif
1329	>	if (!nprocs)
1330	>	return(0);
1331	>	return(rename(fold, fnew));
1332	>	}
1333	>
1334	>
1335	>	#ifdef RHAS_FORK_EXEC
1336	>	int
1337	>	next_process()                  /* fork the next process (max. nprocs) */
1338	>	{
1339	>	int     child_pid;
1340	>
1341	>	if (nprocs <= 1)
1342	>	return(0);              /* it's us or no one */
1343	>	if (inchild()) {
1344	>	fprintf(stderr, "%s: internal error 1 in spawn_process()\n",
1345	>	progname);
1346	>	quit(1);
1347	>	}
1348	>	if (children_running >= nprocs)
1349	>	wait_process(0);        /* wait for someone to finish */
1350	>	fflush(stdout);
1351	>	child_pid = fork();             /* split process */
1352	>	if (child_pid == 0) {           /* we're the child */
1353	>	children_running = -1;
1354	>	return(0);
1355	>	}
1356	>	if (child_pid > 0) {            /* we're the parent */
1357	>	++children_running;
1358	>	return(1);
1359	>	}
1360	>	fprintf(stderr, "%s: warning -- fork() failed\n", progname);
1361	>	return(0);
1362	>	}
1363	>
1364	>	wait_process(all)                       /* wait for process(es) to finish */
1365	>	int     all;
1366	>	{
1367	>	int     ourstatus = 0;
1368	>	int     pid, status;
1369	>
1370	>	if (all)
1371	>	all = children_running;
1372	>	else if (children_running > 0)
1373	>	all = 1;
1374	>	while (all-- > 0) {
1375	>	pid = wait(&status);
1376	>	if (pid < 0)
1377	>	syserr(progname);
1378	>	status = status>>8 & 0xff;
1379	>	--children_running;
1380	>	if (status != 0) {      /* child's problem is our problem */
1381	>	if (ourstatus == 0 & children_running > 0)
1382	>	fprintf(stderr, "%s: waiting for remaining processes\n",
1383	>	progname);
1384	>	ourstatus = status;
1385	>	all = children_running;
1386	>	}
1387	>	}
1388	>	if (ourstatus != 0)
1389	>	quit(ourstatus);        /* bad status from child */
1390	>	}
1391	>	#else   /* ! RHAS_FORK_EXEC */
1392	>	int
1393	>	next_process()
1394	>	{
1395	>	return(0);                      /* cannot start new process */
1396	>	}
1397	>	wait_process(all)
1398	>	int     all;
1399	>	{
1400	>	(void)all;                      /* no one to wait for */
1401	>	}
1402	>	int
1403	>	kill(pid, sig) /* win|unix_process.c should also wait and kill */
1404	>	int pid, sig;
1405	>	{
1406	>	return 0;
1407	>	}
1408	>	#endif  /* ! RHAS_FORK_EXEC */
1409	>
1410	>	finish_process()                        /* exit a child process */
1411	>	{
1412	>	if (!inchild())
1413	>	return;                 /* in parent -- noop */
1414	>	exit(0);
1415	>	}
1416	>
1417	>	#ifdef _WIN32
1418		setenv(vname, value)            /* set an environment variable */
1419		char    *vname, *value;
1420		{
#	Line 1139 | Line 1426 | char   *vname, *value;
1426		sprintf(evp, "%s=%s", vname, value);
1427		if (putenv(evp) != 0) {
1428		fprintf(stderr, "%s: out of environment space\n", progname);
1429	<	exit(1);
1429	>	quit(1);
1430		}
1431		if (!silent)
1432		printf("set %s\n", evp);
#	Line 1152 | Line 1439 | int    vc;
1439		{
1440		fprintf(stderr, "%s: bad value for variable '%s'\n",
1441		progname, vnam(vc));
1442	<	exit(1);
1442	>	quit(1);
1443		}
1444
1445
#	Line 1160 | Line 1447 | syserr(s)                      /* report a system error and exit */
1447		char    *s;
1448		{
1449		perror(s);
1450	<	exit(1);
1450	>	quit(1);
1451	>	}
1452	>
1453	>
1454	>	void
1455	>	quit(ec)                        /* exit program */
1456	>	int     ec;
1457	>	{
1458	>	exit(ec);
1459		}

Diff Legend

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