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.61 by greg, Sat Feb 22 02:07:30 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 "view.h"
10		#include "paths.h"
11	+	#include "vars.h"
12		#include <ctype.h>
13
14	<
15	<	typedef struct {
16	<	char    *name;          /* variable name */
17	<	short   nick;           /* # characters required for nickname */
18	<	short   nass;           /* # assignments made */
19	<	char    *value;         /* assigned value(s) */
20	<	int     (*fixval)();    /* assignment checking function */
21	<	} VARIABLE;
22	<
23	<	int     onevalue(), catvalues();
24	<
25	<	/* variables */
26	<	#define OBJECT          0               /* object files */
27	<	#define SCENE           1               /* scene files */
28	<	#define MATERIAL        2               /* material files */
29	<	#define RENDER          3               /* rendering options */
30	<	#define OCONV           4               /* oconv options */
31	<	#define PFILT           5               /* pfilt options */
32	<	#define VIEW            6               /* view(s) for picture(s) */
33	<	#define ZONE            7               /* simulation zone */
34	<	#define QUALITY         8               /* desired rendering quality */
35	<	#define OCTREE          9               /* octree file name */
36	<	#define PICTURE         10              /* picture file name */
37	<	#define AMBFILE         11              /* ambient file name */
38	<	#define OPTFILE         12              /* rendering options file */
39	<	#define EXPOSURE        13              /* picture exposure setting */
40	<	#define RESOLUTION      14              /* maximum picture resolution */
42	<	#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 */
14	>	/* variables (alphabetical by name) */
15	>	#define AMBFILE         0               /* ambient file name */
16	>	#define DETAIL          1               /* level of scene detail */
17	>	#define EXPOSURE        2               /* picture exposure setting */
18	>	#define EYESEP          3               /* interocular distance */
19	>	#define ILLUM           4               /* mkillum input files */
20	>	#define INDIRECT        5               /* indirection in lighting */
21	>	#define MATERIAL        6               /* material files */
22	>	#define MKILLUM         7               /* mkillum options */
23	>	#define OBJECT          8               /* object files */
24	>	#define OCONV           9               /* oconv options */
25	>	#define OCTREE          10              /* octree file name */
26	>	#define OPTFILE         11              /* rendering options file */
27	>	#define PENUMBRAS       12              /* shadow penumbras are desired */
28	>	#define PFILT           13              /* pfilt options */
29	>	#define PICTURE         14              /* picture file root name */
30	>	#define QUALITY         15              /* desired rendering quality */
31	>	#define RAWFILE         16              /* raw picture file root name */
32	>	#define RENDER          17              /* rendering options */
33	>	#define REPORT          18              /* report frequency and errfile */
34	>	#define RESOLUTION      19              /* maximum picture resolution */
35	>	#define SCENE           20              /* scene files */
36	>	#define UP              21              /* view up (X, Y or Z) */
37	>	#define VARIABILITY     22              /* level of light variability */
38	>	#define VIEWS           23              /* view(s) for picture(s) */
39	>	#define ZFILE           24              /* distance file root name */
40	>	#define ZONE            25              /* simulation zone */
41		/* total number of variables */
42	<	#define NVARS           21
42	>	int NVARS = 26;
43
44	<	VARIABLE        vv[NVARS] = {           /* variable-value pairs */
45	<	{"objects",     3,      0,      NULL,   catvalues},
46	<	{"scene",       3,      0,      NULL,   catvalues},
44	>	VARIABLE        vv[] = {                /* variable-value pairs */
45	>	{"AMBFILE",     3,      0,      NULL,   onevalue},
46	>	{"DETAIL",      3,      0,      NULL,   qualvalue},
47	>	{"EXPOSURE",    3,      0,      NULL,   fltvalue},
48	>	{"EYESEP",      3,      0,      NULL,   fltvalue},
49	>	{"illum",       3,      0,      NULL,   catvalues},
50	>	{"INDIRECT",    3,      0,      NULL,   intvalue},
51		{"materials",   3,      0,      NULL,   catvalues},
52	<	{"render",      3,      0,      NULL,   catvalues},
52	>	{"mkillum",     3,      0,      NULL,   catvalues},
53	>	{"objects",     3,      0,      NULL,   catvalues},
54		{"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},
55		{"OCTREE",      3,      0,      NULL,   onevalue},
62	–	{"PICTURE",     3,      0,      NULL,   onevalue},
63	–	{"AMBFILE",     3,      0,      NULL,   onevalue},
56		{"OPTFILE",     3,      0,      NULL,   onevalue},
57	<	{"EXPOSURE",    3,      0,      NULL,   onevalue},
57	>	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
58	>	{"pfilt",       2,      0,      NULL,   catvalues},
59	>	{"PICTURE",     3,      0,      NULL,   onevalue},
60	>	{"QUALITY",     3,      0,      NULL,   qualvalue},
61	>	{"RAWFILE",     3,      0,      NULL,   onevalue},
62	>	{"render",      3,      0,      NULL,   catvalues},
63	>	{"REPORT",      3,      0,      NULL,   onevalue},
64		{"RESOLUTION",  3,      0,      NULL,   onevalue},
65	+	{"scene",       3,      0,      NULL,   catvalues},
66		{"UP",          2,      0,      NULL,   onevalue},
67	<	{"INDIRECT",    3,      0,      NULL,   onevalue},
68	<	{"DETAIL",      3,      0,      NULL,   onevalue},
69	<	{"PENUMBRAS",   3,      0,      NULL,   onevalue},
70	<	{"VARIABILITY", 3,      0,      NULL,   onevalue},
72	<	{"REPORT",      3,      0,      NULL,   onevalue},
67	>	{"VARIABILITY", 3,      0,      NULL,   qualvalue},
68	>	{"view",        2,      0,      NULL,   NULL},
69	>	{"ZFILE",       2,      0,      NULL,   onevalue},
70	>	{"ZONE",        2,      0,      NULL,   onevalue},
71		};
72
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	–
73		/* overture calculation file */
74		#ifdef NIX
75	<	char    overfile[] = "overture.raw";
75	>	char    overfile[] = "overture.unf";
76		#else
77		char    overfile[] = "/dev/null";
78		#endif
79
80	<	extern long     fdate(), time();
80	>	extern time_t   time();
81
82	<	long    scenedate;              /* date of latest scene or object file */
83	<	long    octreedate;             /* date of octree */
82	>	time_t  scenedate;              /* date of latest scene or object file */
83	>	time_t  octreedate;             /* date of octree */
84	>	time_t  matdate;                /* date of latest material file */
85	>	time_t  illumdate;              /* date of last illum file */
86
87	+	char    *oct0name;              /* name of pre-mkillum octree */
88	+	time_t  oct0date;               /* date of pre-mkillum octree */
89	+	char    *oct1name;              /* name of post-mkillum octree */
90	+	time_t  oct1date;               /* date of post-mkillum octree (>= matdate) */
91	+
92	+	int     nowarn = 0;             /* no warnings */
93		int     explicate = 0;          /* explicate variables */
94		int     silent = 0;             /* do work silently */
95	+	int     touchonly = 0;          /* touch files only */
96		int     noaction = 0;           /* don't do anything */
97	+	int     sayview = 0;            /* print view out */
98		char    *rvdevice = NULL;       /* rview output device */
99		char    *viewselect = NULL;     /* specific view only */
100
101		int     overture = 0;           /* overture calculation needed */
102
103		char    *progname;              /* global argv[0] */
104	+	char    *rifname;               /* global rad input file name */
105
106		char    radname[MAXPATH];       /* root Radiance file name */
107
#	Line 124 | Line 111 | int    argc;
111		char    *argv[];
112		{
113		char    ropts[512];
114	+	char    popts[64];
115		int     i;
116
117		progname = argv[0];
#	Line 136 | Line 124 | char   *argv[];
124		case 'n':
125		noaction++;
126		break;
127	+	case 't':
128	+	touchonly++;
129	+	break;
130		case 'e':
131		explicate++;
132		break;
133		case 'o':
134		rvdevice = argv[++i];
135		break;
136	+	case 'V':
137	+	sayview++;
138	+	break;
139		case 'v':
140		viewselect = argv[++i];
141		break;
142	+	case 'w':
143	+	nowarn++;
144	+	break;
145		default:
146		goto userr;
147		}
148		if (i >= argc)
149		goto userr;
150	+	rifname = argv[i];
151		/* assign Radiance root file name */
152	<	rootname(radname, argv[i]);
152	>	rootname(radname, rifname);
153		/* load variable values */
154	<	load(argv[i]);
154	>	loadvars(rifname);
155		/* get any additional assignments */
156		for (i++; i < argc; i++)
157	<	setvariable(argv[i]);
157	>	if (setvariable(argv[i], matchvar) < 0) {
158	>	fprintf(stderr, "%s: unknown variable: %s\n",
159	>	progname, argv[i]);
160	>	quit(1);
161	>	}
162		/* check assignments */
163		checkvalues();
164		/* check files and dates */
#	Line 165 | Line 167 | char   *argv[];
167		setdefaults();
168		/* print all values if requested */
169		if (explicate)
170	<	printvals();
171	<	/* build octree */
170	>	printvars(stdout);
171	>	/* build octree (and run mkillum) */
172		oconv();
173		/* check date on ambient file */
174		checkambfile();
175		/* run simulation */
176	<	renderopts(ropts);
176	>	renderopts(ropts, popts);
177		xferopts(ropts);
178		if (rvdevice != NULL)
179	<	rview(ropts);
179	>	rview(ropts, popts);
180		else
181	<	rpict(ropts);
182	<	exit(0);
181	>	rpict(ropts, popts);
182	>	quit(0);
183		userr:
184		fprintf(stderr,
185	<	"Usage: %s [-s][-n][-e][-v view][-o dev] rfile [VAR=value ..]\n",
185	>	"Usage: %s [-w][-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
186		progname);
187	<	exit(1);
187	>	quit(1);
188		}
189
190
#	Line 201 | Line 203 | register char  *rn, *fn;
203		}
204
205
206	<	load(rfname)                    /* load Radiance simulation file */
207	<	char    *rfname;
206	>	time_t
207	>	checklast(fnames)                       /* check files and find most recent */
208	>	register char   *fnames;
209		{
210	<	FILE    *fp;
211	<	char    buf[512];
209	<	register char   *cp;
210	>	char    thisfile[MAXPATH];
211	>	time_t  thisdate, lastdate = 0;
212
213	<	if (rfname == NULL)
214	<	fp = stdin;
215	<	else if ((fp = fopen(rfname, "r")) == NULL)
216	<	syserr(rfname);
217	<	while (fgetline(buf, sizeof(buf), fp) != NULL) {
218	<	for (cp = buf; *cp; cp++) {
219	<	switch (*cp) {
220	<	case '\\':
221	<	case '\n':
222	<	*cp = ' ';
221	<	continue;
222	<	case '#':
223	<	*cp = '\0';
224	<	break;
225	<	default:
226	<	continue;
227	<	}
228	<	break;
229	<	}
230	<	setvariable(buf);
213	>	if (fnames == NULL)
214	>	return(0);
215	>	while ((fnames = nextword(thisfile, MAXPATH, fnames)) != NULL) {
216	>	if (thisfile[0] == '!' ||
217	>	(thisfile[0] == '\\' && thisfile[1] == '!'))
218	>	continue;
219	>	if (!(thisdate = fdate(thisfile)))
220	>	syserr(thisfile);
221	>	if (thisdate > lastdate)
222	>	lastdate = thisdate;
223		}
224	<	fclose(fp);
224	>	return(lastdate);
225		}
226
227
228	<	setvariable(ass)                /* assign variable according to string */
229	<	register char   *ass;
228	>	char *
229	>	newfname(orig, pred)            /* create modified file name */
230	>	char    *orig;
231	>	int     pred;
232		{
233	<	char    varname[32];
233	>	extern char     *rindex();
234		register char   *cp;
235	<	register VARIABLE       *vp;
236	<	register int    i;
243	<	int     n;
235	>	register int    n;
236	>	int     suffix;
237
238	<	while (isspace(*ass))           /* skip leading space */
239	<	ass++;
240	<	cp = varname;                   /* extract name */
241	<	while (cp < varname+sizeof(varname)-1
242	<	&& *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;
238	>	n = 0; cp = orig; suffix = -1;          /* suffix position, length */
239	>	while (*cp) {
240	>	if (*cp == '.') suffix = n;
241	>	else if (ISDIRSEP(*cp)) suffix = -1;
242	>	cp++; n++;
243		}
244	<	/* match variable from list */
245	<	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)
244	>	if (suffix == -1) suffix = n;
245	>	if ((cp = bmalloc(n+2)) == NULL)
246		syserr(progname);
247	<	strcpy(vp->value+i, ass);
248	<	vp->nass++;
249	<	}
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	<	;
247	>	strncpy(cp, orig, suffix);
248	>	cp[suffix] = pred;                      /* root name + pred + suffix */
249	>	strcpy(cp+suffix+1, orig+suffix);
250		return(cp);
251		}
252
253
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	–
254		checkfiles()                    /* check for existence and modified times */
255		{
256	<	char    *cp;
402	<	long    objdate;
256	>	time_t  objdate;
257
258		if (!vdef(OCTREE)) {
259	<	if ((cp = bmalloc(strlen(radname)+5)) == NULL)
259	>	if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL)
260		syserr(progname);
261	<	sprintf(cp, "%s.oct", radname);
408	<	vval(OCTREE) = cp;
261	>	sprintf(vval(OCTREE), "%s.oct", radname);
262		vdef(OCTREE)++;
263	+	} else if (vval(OCTREE)[0] == '!') {
264	+	fprintf(stderr, "%s: illegal '%s' specification\n",
265	+	progname, vnam(OCTREE));
266	+	quit(1);
267		}
268		octreedate = fdate(vval(OCTREE));
269	<	scenedate = -1;
270	<	if (vdef(SCENE)) {
271	<	scenedate = checklast(vval(SCENE));
272	<	if (vdef(OBJECT)) {
273	<	objdate = checklast(vval(OBJECT));
274	<	if (objdate > scenedate)
275	<	scenedate = objdate;
276	<	}
269	>	if (vdef(ILLUM)) {              /* illum requires secondary octrees */
270	>	oct0name = newfname(vval(OCTREE), '0');
271	>	oct1name = newfname(vval(OCTREE), '1');
272	>	oct0date = fdate(oct0name);
273	>	oct1date = fdate(oct1name);
274	>	} else
275	>	oct0name = oct1name = vval(OCTREE);
276	>	if ((scenedate = checklast(vval(SCENE))) &&
277	>	(objdate = checklast(vval(OBJECT))) > scenedate)
278	>	scenedate = objdate;
279	>	illumdate = checklast(vval(ILLUM));
280	>	if (!octreedate & !scenedate & !illumdate) {
281	>	fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname,
282	>	vnam(OCTREE), vnam(SCENE), vnam(ILLUM));
283	>	quit(1);
284		}
285	<	if (octreedate < 0 & scenedate < 0) {
422	<	fprintf(stderr, "%s: need '%s' or '%s'\n", progname,
423	<	vnam(OCTREE), vnam(SCENE));
424	<	exit(1);
425	<	}
285	>	matdate = checklast(vval(MATERIAL));
286		}
287
288
#	Line 431 | Line 291 | double org[3], *sizp;
291		{
292		extern FILE     *popen();
293		static double   oorg[3], osiz = 0.;
294	<	char    buf[MAXPATH+16];
294	>	double  min[3], max[3];
295	>	char    buf[1024];
296		FILE    *fp;
297	+	register int    i;
298
299	<	if (osiz <= FTINY) {
300	<	oconv();                /* does nothing if done already */
301	<	sprintf(buf, "getinfo -d < %s", vval(OCTREE));
302	<	if ((fp = popen(buf, "r")) == NULL)
303	<	syserr("getinfo");
304	<	if (fscanf(fp, "%lf %lf %lf %lf", &oorg[0], &oorg[1],
305	<	&oorg[2], &osiz) != 4) {
306	<	fprintf(stderr,
299	>	if (osiz <= FTINY)
300	>	if (noaction && fdate(oct1name) <
301	>	(scenedate>illumdate?scenedate:illumdate)) {
302	>	/* run getbbox */
303	>	sprintf(buf, "getbbox -w -h %s",
304	>	vdef(SCENE) ? vval(SCENE) : vval(ILLUM));
305	>	if ((fp = popen(buf, "r")) == NULL)
306	>	syserr("getbbox");
307	>	if (fscanf(fp, "%lf %lf %lf %lf %lf %lf",
308	>	&min[0], &max[0], &min[1], &max[1],
309	>	&min[2], &max[2]) != 6) {
310	>	fprintf(stderr,
311	>	"%s: error reading bounding box from getbbox\n",
312	>	progname);
313	>	quit(1);
314	>	}
315	>	for (i = 0; i < 3; i++)
316	>	if (max[i] - min[i] > osiz)
317	>	osiz = max[i] - min[i];
318	>	for (i = 0; i < 3; i++)
319	>	oorg[i] = (max[i]+min[i]-osiz)*.5;
320	>	pclose(fp);
321	>	} else {                                /* from octree */
322	>	oconv();        /* does nothing if done already */
323	>	sprintf(buf, "getinfo -d < %s", oct1name);
324	>	if ((fp = popen(buf, "r")) == NULL)
325	>	syserr("getinfo");
326	>	if (fscanf(fp, "%lf %lf %lf %lf", &oorg[0], &oorg[1],
327	>	&oorg[2], &osiz) != 4) {
328	>	fprintf(stderr,
329		"%s: error reading bounding cube from getinfo\n",
330	<	progname);
331	<	exit(1);
330	>	progname);
331	>	quit(1);
332	>	}
333	>	pclose(fp);
334		}
449	–	pclose(fp);
450	–	}
335		org[0] = oorg[0]; org[1] = oorg[1]; org[2] = oorg[2]; *sizp = osiz;
336		}
337
338
339		setdefaults()                   /* set default values for unassigned var's */
340		{
341	<	double  org[3], size;
341	>	double  org[3], lim[3], size;
342		char    buf[128];
343
344		if (!vdef(ZONE)) {
#	Line 464 | Line 348 | setdefaults()                  /* set default values for unassigned v
348		vval(ZONE) = savqstr(buf);
349		vdef(ZONE)++;
350		}
351	+	if (!vdef(EYESEP)) {
352	+	if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf",
353	+	&org[0], &lim[0], &org[1], &lim[1],
354	+	&org[2], &lim[2]) != 6)
355	+	badvalue(ZONE);
356	+	sprintf(buf, "%f",
357	+	0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2]));
358	+	vval(EYESEP) = savqstr(buf);
359	+	vdef(EYESEP)++;
360	+	}
361		if (!vdef(INDIRECT)) {
362		vval(INDIRECT) = "0";
363		vdef(INDIRECT)++;
#	Line 480 | Line 374 | setdefaults()                  /* set default values for unassigned v
374		vval(PICTURE) = radname;
375		vdef(PICTURE)++;
376		}
377	<	if (!vdef(VIEW)) {
378	<	vval(VIEW) = "X";
379	<	vdef(VIEW)++;
377	>	if (!vdef(VIEWS)) {
378	>	vval(VIEWS) = "X";
379	>	vdef(VIEWS)++;
380		}
381		if (!vdef(DETAIL)) {
382		vval(DETAIL) = "M";
#	Line 499 | Line 393 | setdefaults()                  /* set default values for unassigned v
393		}
394
395
396	<	printvals()                     /* print variable values */
396	>	oconv()                         /* run oconv and mkillum if necessary */
397		{
398	<	register int    i, j;
398	>	static char     illumtmp[] = "ilXXXXXX";
399	>	char    combuf[1024], ocopts[64], mkopts[64];
400
401	<	for (i = 0; i < NVARS; i++)
402	<	for (j = 0; j < vdef(i); j++)
403	<	printf("%s= %s\n", vnam(i), nvalue(vv+i, j));
404	<	fflush(stdout);
405	<	}
406	<
407	<
408	<	oconv()                         /* run oconv if necessary */
409	<	{
410	<	char    combuf[512], ocopts[64];
411	<
412	<	if (octreedate >= scenedate)    /* check dates */
401	>	oconvopts(ocopts);              /* get options */
402	>	if (octreedate < scenedate) {   /* check date on original octree */
403	>	if (touchonly && octreedate)
404	>	touch(vval(OCTREE));
405	>	else {                          /* build command */
406	>	if (vdef(MATERIAL))
407	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
408	>	vval(MATERIAL), vval(SCENE),
409	>	vval(OCTREE));
410	>	else
411	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
412	>	vval(SCENE), vval(OCTREE));
413	>
414	>	if (runcom(combuf)) {           /* run it */
415	>	fprintf(stderr,
416	>	"%s: error generating octree\n\t%s removed\n",
417	>	progname, vval(OCTREE));
418	>	unlink(vval(OCTREE));
419	>	quit(1);
420	>	}
421	>	}
422	>	octreedate = time((time_t *)NULL);
423	>	if (octreedate < scenedate)     /* in case clock is off */
424	>	octreedate = scenedate;
425	>	}
426	>	if (oct1name == vval(OCTREE))           /* no mkillum? */
427	>	oct1date = octreedate > matdate ? octreedate : matdate;
428	>	if (oct1date >= octreedate & oct1date >= matdate
429	>	& oct1date >= illumdate)        /* all done */
430		return;
431	<	/* build command */
432	<	oconvopts(ocopts);
433	<	if (vdef(MATERIAL))
434	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
435	<	vval(MATERIAL), vval(SCENE), vval(OCTREE));
436	<	else
437	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
438	<	vval(SCENE), vval(OCTREE));
439	<
440	<	if (runcom(combuf)) {           /* run it */
441	<	fprintf(stderr, "%s: error generating octree\n\t%s removed\n",
442	<	progname, vval(OCTREE));
443	<	unlink(vval(OCTREE));
444	<	exit(1);
431	>	/* make octree0 */
432	>	if (oct0date < scenedate | oct0date < illumdate) {
433	>	if (touchonly && oct0date)
434	>	touch(oct0name);
435	>	else {                          /* build command */
436	>	if (octreedate)
437	>	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
438	>	vval(OCTREE), vval(ILLUM), oct0name);
439	>	else if (vdef(MATERIAL))
440	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
441	>	vval(MATERIAL), vval(ILLUM), oct0name);
442	>	else
443	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
444	>	vval(ILLUM), oct0name);
445	>	if (runcom(combuf)) {           /* run it */
446	>	fprintf(stderr,
447	>	"%s: error generating octree\n\t%s removed\n",
448	>	progname, oct0name);
449	>	unlink(oct0name);
450	>	quit(1);
451	>	}
452	>	}
453	>	oct0date = time((time_t *)NULL);
454	>	if (oct0date < octreedate)      /* in case clock is off */
455	>	oct0date = octreedate;
456	>	if (oct0date < illumdate)       /* ditto */
457	>	oct0date = illumdate;
458	>	}
459	>	if (touchonly && oct1date)
460	>	touch(oct1name);
461	>	else {
462	>	mkillumopts(mkopts);            /* build mkillum command */
463	>	mktemp(illumtmp);
464	>	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
465	>	oct0name, vval(ILLUM), illumtmp);
466	>	if (runcom(combuf)) {                   /* run it */
467	>	fprintf(stderr, "%s: error running mkillum\n",
468	>	progname);
469	>	unlink(illumtmp);
470	>	quit(1);
471	>	}
472	>	/* make octree1 (frozen) */
473	>	if (octreedate)
474	>	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
475	>	vval(OCTREE), illumtmp, oct1name);
476	>	else if (vdef(MATERIAL))
477	>	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
478	>	vval(MATERIAL), illumtmp, oct1name);
479	>	else
480	>	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
481	>	illumtmp, oct1name);
482	>	if (runcom(combuf)) {           /* run it */
483	>	fprintf(stderr,
484	>	"%s: error generating octree\n\t%s removed\n",
485	>	progname, oct1name);
486	>	unlink(oct1name);
487	>	unlink(illumtmp);
488	>	quit(1);
489	>	}
490	>	rmfile(illumtmp);
491		}
492	<	octreedate = time(0);
492	>	oct1date = time((time_t *)NULL);
493	>	if (oct1date < oct0date)        /* in case clock is off */
494	>	oct1date = oct0date;
495		}
496
497
#	Line 557 | Line 517 | register char  *oo;
517		}
518
519
520	+	mkillumopts(mo)                         /* get mkillum options */
521	+	register char   *mo;
522	+	{
523	+	/* BEWARE:  This may be called via setdefaults(), so no assumptions */
524	+
525	+	*mo = '\0';
526	+	if (vdef(MKILLUM))
527	+	addarg(mo, vval(MKILLUM));
528	+	}
529	+
530	+
531		checkambfile()                  /* check date on ambient file */
532		{
533	<	long    afdate;
533	>	time_t  afdate;
534
535	<	if (vdef(AMBFILE)) {
536	<	afdate = fdate(vval(AMBFILE));
537	<	if (afdate >= 0 & octreedate > afdate)
535	>	if (!vdef(AMBFILE))
536	>	return;
537	>	if (!(afdate = fdate(vval(AMBFILE))))
538	>	return;
539	>	if (oct1date > afdate)
540	>	if (touchonly)
541	>	touch(vval(AMBFILE));
542	>	else
543		rmfile(vval(AMBFILE));
568	–	}
544		}
545
546
#	Line 574 | Line 549 | ambval()                               /* compute ambient value */
549		{
550		if (vdef(EXPOSURE)) {
551		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
552	<	return(.5/pow(2.,atof(vval(EXPOSURE))));
553	<	if (isdigit(vval(EXPOSURE)[0]) || vval(EXPOSURE)[0] == '.')
579	<	return(.5/atof(vval(EXPOSURE)));
580	<	badvalue(EXPOSURE);
552	>	return(.5/pow(2.,vflt(EXPOSURE)));
553	>	return(.5/vflt(EXPOSURE));
554		}
555		if (vlet(ZONE) == 'E')
556		return(10.);
#	Line 587 | Line 560 | ambval()                               /* compute ambient value */
560		}
561
562
563	<	lowqopts(op)                            /* low quality rendering options */
563	>	renderopts(op, po)                      /* set rendering options */
564	>	char    *op, *po;
565	>	{
566	>	switch(vscale(QUALITY)) {
567	>	case LOW:
568	>	lowqopts(op, po);
569	>	break;
570	>	case MEDIUM:
571	>	medqopts(op, po);
572	>	break;
573	>	case HIGH:
574	>	hiqopts(op, po);
575	>	break;
576	>	}
577	>	}
578	>
579	>
580	>	lowqopts(op, po)                        /* low quality rendering options */
581		register char   *op;
582	+	char    *po;
583		{
584		double  d, org[3], siz[3];
585
586		*op = '\0';
587	+	*po = '\0';
588		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
589		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
590		badvalue(ZONE);
591		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
592	+	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
593	+	badvalue(ZONE);
594		getoctcube(org, &d);
595		d *= 3./(siz[0]+siz[1]+siz[2]);
596		switch (vscale(DETAIL)) {
597		case LOW:
598	<	op = addarg(op, "-ps 16 -dp 16");
598	>	po = addarg(po, "-ps 16");
599	>	op = addarg(op, "-dp 64");
600		sprintf(op, " -ar %d", (int)(4*d));
601		op += strlen(op);
602		break;
603		case MEDIUM:
604	<	op = addarg(op, "-ps 8 -dp 32");
604	>	po = addarg(po, "-ps 8");
605	>	op = addarg(op, "-dp 128");
606		sprintf(op, " -ar %d", (int)(8*d));
607		op += strlen(op);
608		break;
609		case HIGH:
610	<	op = addarg(op, "-ps 4 -dp 64");
610	>	po = addarg(po, "-ps 4");
611	>	op = addarg(op, "-dp 256");
612		sprintf(op, " -ar %d", (int)(16*d));
613		op += strlen(op);
614		break;
615		}
616	<	op = addarg(op, "-pt .16");
616	>	po = addarg(po, "-pt .16");
617		if (vbool(PENUMBRAS))
618		op = addarg(op, "-ds .4");
619		else
620		op = addarg(op, "-ds 0");
621	<	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .7");
621	>	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5");
622		if (vdef(AMBFILE)) {
623		sprintf(op, " -af %s", vval(AMBFILE));
624		op += strlen(op);
#	Line 629 | Line 626 | register char  *op;
626		overture = 0;
627		switch (vscale(VARIABILITY)) {
628		case LOW:
629	<	op = addarg(op, "-aa .4 -ad 32");
629	>	op = addarg(op, "-aa .4 -ad 64");
630		break;
631		case MEDIUM:
632	<	op = addarg(op, "-aa .3 -ad 64");
632	>	op = addarg(op, "-aa .3 -ad 128");
633		break;
634		case HIGH:
635	<	op = addarg(op, "-aa .25 -ad 128");
635	>	op = addarg(op, "-aa .25 -ad 256");
636		break;
637		}
638		op = addarg(op, "-as 0");
#	Line 648 | Line 645 | register char  *op;
645		}
646
647
648	<	medqopts(op)                            /* medium quality rendering options */
648	>	medqopts(op, po)                        /* medium quality rendering options */
649		register char   *op;
650	+	char    *po;
651		{
652	<	double  d, org[3], siz[3];
652	>	double  d, org[3], siz[3], asz;
653
654		*op = '\0';
655	+	*po = '\0';
656		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
657		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
658		badvalue(ZONE);
659		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
660	+	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
661	+	badvalue(ZONE);
662		getoctcube(org, &d);
663	<	d *= 3./(siz[0]+siz[1]+siz[2]);
663	>	asz = (siz[0]+siz[1]+siz[2])/3.;
664	>	d /= asz;
665		switch (vscale(DETAIL)) {
666		case LOW:
667	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
668	<	op = addarg(op, "-dp 64");
667	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
668	>	op = addarg(op, "-dp 256");
669		sprintf(op, " -ar %d", (int)(8*d));
670		op += strlen(op);
671	+	sprintf(op, " -ms %.2g", asz/20.);
672	+	op += strlen(op);
673		break;
674		case MEDIUM:
675	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
676	<	op = addarg(op, "-dp 128");
675	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
676	>	op = addarg(op, "-dp 512");
677		sprintf(op, " -ar %d", (int)(16*d));
678		op += strlen(op);
679	+	sprintf(op, " -ms %.2g", asz/40.);
680	+	op += strlen(op);
681		break;
682		case HIGH:
683	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
684	<	op = addarg(op, "-dp 256");
683	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
684	>	op = addarg(op, "-dp 1024");
685		sprintf(op, " -ar %d", (int)(32*d));
686		op += strlen(op);
687	+	sprintf(op, " -ms %.2g", asz/80.);
688	+	op += strlen(op);
689		break;
690		}
691	<	op = addarg(op, "-pt .08");
691	>	po = addarg(po, "-pt .08");
692		if (vbool(PENUMBRAS))
693	<	op = addarg(op, "-ds .2 -dj .35");
693	>	op = addarg(op, "-ds .2 -dj .5");
694		else
695		op = addarg(op, "-ds .3");
696	<	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .15");
696	>	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
697		if (overture = vint(INDIRECT)) {
698		sprintf(op, " -ab %d", overture);
699		op += strlen(op);
#	Line 697 | Line 705 | register char  *op;
705		overture = 0;
706		switch (vscale(VARIABILITY)) {
707		case LOW:
708	<	op = addarg(op, "-aa .25 -ad 128 -as 0");
708	>	op = addarg(op, "-aa .25 -ad 196 -as 0");
709		break;
710		case MEDIUM:
711	<	op = addarg(op, "-aa .2 -ad 300 -as 64");
711	>	op = addarg(op, "-aa .2 -ad 400 -as 64");
712		break;
713		case HIGH:
714	<	op = addarg(op, "-aa .15 -ad 500 -as 128");
714	>	op = addarg(op, "-aa .15 -ad 768 -as 196");
715		break;
716		}
717		d = ambval();
#	Line 715 | Line 723 | register char  *op;
723		}
724
725
726	<	hiqopts(op)                             /* high quality rendering options */
726	>	hiqopts(op, po)                         /* high quality rendering options */
727		register char   *op;
728	+	char    *po;
729		{
730	<	double  d, org[3], siz[3];
730	>	double  d, org[3], siz[3], asz;
731
732		*op = '\0';
733	+	*po = '\0';
734		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
735		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
736		badvalue(ZONE);
737		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
738	+	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
739	+	badvalue(ZONE);
740		getoctcube(org, &d);
741	<	d *= 3./(siz[0]+siz[1]+siz[2]);
741	>	asz = (siz[0]+siz[1]+siz[2])/3.;
742	>	d /= asz;
743		switch (vscale(DETAIL)) {
744		case LOW:
745	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
746	<	op = addarg(op, "-dp 256");
745	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
746	>	op = addarg(op, "-dp 1024");
747		sprintf(op, " -ar %d", (int)(16*d));
748		op += strlen(op);
749	+	sprintf(op, " -ms %.2g", asz/40.);
750	+	op += strlen(op);
751		break;
752		case MEDIUM:
753	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
754	<	op = addarg(op, "-dp 512");
753	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
754	>	op = addarg(op, "-dp 2048");
755		sprintf(op, " -ar %d", (int)(32*d));
756		op += strlen(op);
757	+	sprintf(op, " -ms %.2g", asz/80.);
758	+	op += strlen(op);
759		break;
760		case HIGH:
761	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
762	<	op = addarg(op, "-dp 1024");
761	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
762	>	op = addarg(op, "-dp 4096");
763		sprintf(op, " -ar %d", (int)(64*d));
764		op += strlen(op);
765	+	sprintf(op, " -ms %.2g", asz/160.);
766	+	op += strlen(op);
767		break;
768		}
769	<	op = addarg(op, "-pt .04");
769	>	po = addarg(po, "-pt .04");
770		if (vbool(PENUMBRAS))
771	<	op = addarg(op, "-ds .1 -dj .7");
771	>	op = addarg(op, "-ds .1 -dj .65");
772		else
773		op = addarg(op, "-ds .2");
774	<	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .03");
774	>	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
775		sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
776		op += strlen(op);
777		if (vdef(AMBFILE)) {
#	Line 762 | Line 781 | register char  *op;
781		overture = 0;
782		switch (vscale(VARIABILITY)) {
783		case LOW:
784	<	op = addarg(op, "-aa .15 -ad 200 -as 0");
784	>	op = addarg(op, "-aa .15 -ad 256 -as 0");
785		break;
786		case MEDIUM:
787	<	op = addarg(op, "-aa .125 -ad 512 -as 128");
787	>	op = addarg(op, "-aa .125 -ad 512 -as 256");
788		break;
789		case HIGH:
790	<	op = addarg(op, "-aa .08 -ad 850 -as 256");
790	>	op = addarg(op, "-aa .08 -ad 1024 -as 512");
791		break;
792		}
793		d = ambval();
#	Line 784 | Line 803 | xferopts(ro)                           /* transfer options if indicated */
803		char    *ro;
804		{
805		int     fd, n;
806	+	register char   *cp;
807
808		n = strlen(ro);
809		if (n < 2)
810		return;
811		if (vdef(OPTFILE)) {
812	<	if ((fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666)) == -1)
812	>	for (cp = ro; cp[1]; cp++)
813	>	if (isspace(cp[1]) && (cp[2] == '@' ||
814	>	(cp[2] == '-' && isalpha(cp[3]))))
815	>	*cp = '\n';
816	>	else
817	>	*cp = cp[1];
818	>	*cp = '\n';
819	>	fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666);
820	>	if (fd < 0 || write(fd, ro, n) != n || close(fd) < 0)
821		syserr(vval(OPTFILE));
822	<	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));
822	>	sprintf(ro, " @%s", vval(OPTFILE));
823		}
824		#ifdef MSDOS
825		else if (n > 50) {
#	Line 814 | Line 838 | register char  *po;
838		po = addarg(po, "-1 -e");
839		po = addarg(po, vval(EXPOSURE));
840		}
841	<	if (vscale(QUALITY) == HIGH)
842	<	po = addarg(po, "-r .65");
841	>	switch (vscale(QUALITY)) {
842	>	case MEDIUM:
843	>	po = addarg(po, "-r .6");
844	>	break;
845	>	case HIGH:
846	>	po = addarg(po, "-m .25");
847	>	break;
848	>	}
849		if (vdef(PFILT))
850		po = addarg(po, vval(PFILT));
851		}
#	Line 845 | Line 875 | register char  *vs;
875		register int    i;
876		double  cent[3], dim[3], mult, d;
877
878	<	if (*vs == '-')
878	>	if (vs == NULL || *vs == '-')
879		return(vs);
880		upax = 0;                       /* get the up vector */
881		if (vdef(UP)) {
#	Line 876 | Line 906 | register char  *vs;
906		zpos = -1; vs++;
907		}
908		viewtype = 'v';
909	<	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h')
909	>	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c')
910		viewtype = *vs++;
911		cp = viewopts;
912		if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {       /* got one! */
#	Line 887 | Line 917 | register char  *vs;
917		badvalue(ZONE);
918		for (i = 0; i < 3; i++) {
919		dim[i] -= cent[i];
920	+	if (dim[i] <= FTINY)
921	+	badvalue(ZONE);
922		cent[i] += .5*dim[i];
923		}
924		mult = vlet(ZONE)=='E' ? 2. : .45 ;
#	Line 929 | Line 961 | register char  *vs;
961		case 'h':
962		cp = addarg(cp, "-vh 180 -vv 180");
963		break;
964	+	case 'c':
965	+	cp = addarg(cp, "-vh 180 -vv 90");
966	+	break;
967		}
968		} else {
969		while (!isspace(*vs))           /* else skip id */
#	Line 939 | Line 974 | register char  *vs;
974		cp += strlen(cp);
975		}
976		}
977	<	strcpy(cp, vs);                 /* append any additional options */
977	>	if (cp == viewopts)             /* append any additional options */
978	>	vs++;           /* skip prefixed space if unneeded */
979	>	strcpy(cp, vs);
980		#ifdef MSDOS
981		if (strlen(viewopts) > 40) {
982		setenv("VIEW", viewopts);
#	Line 955 | Line 992 | getview(n, vn)                         /* get view n, or NULL if none */
992		int     n;
993		char    *vn;            /* returned view name */
994		{
995	<	register char   *mv = NULL;
995	>	register char   *mv;
996
997		if (viewselect != NULL) {               /* command-line selected */
998		if (n)                          /* only do one */
#	Line 970 | Line 1007 | char   *vn;            /* returned view name */
1007		;
1008		*vn = '\0';
1009		}
1010	+	/* view number? */
1011	+	if (isint(viewselect))
1012	+	return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
1013		/* check list */
1014	<	while ((mv = nvalue(vv+VIEW, n++)) != NULL)
1014	>	while ((mv = nvalue(VIEWS, n++)) != NULL)
1015		if (matchword(viewselect, mv))
1016		return(specview(mv));
1017		return(specview(viewselect));   /* standard view? */
1018		}
1019	<	mv = nvalue(vv+VIEW, n);                /* use view n */
1019	>	mv = nvalue(VIEWS, n);          /* use view n */
1020		if (vn != NULL & mv != NULL) {
1021	<	if (*mv != '-')
1022	<	while (*mv && !isspace(*mv))
1023	<	*vn++ = *mv++;
1021	>	register char   *mv2 = mv;
1022	>	if (*mv2 != '-')
1023	>	while (*mv2 && !isspace(*mv2))
1024	>	*vn++ = *mv2++;
1025		*vn = '\0';
1026		}
1027		return(specview(mv));
1028		}
1029
1030
1031	<	rview(opts)                             /* run rview with first view */
1032	<	char    *opts;
1031	>	printview(vopts)                        /* print out selected view */
1032	>	register char   *vopts;
1033		{
1034	+	extern char     *strstr(), *atos(), *getenv();
1035	+	VIEW    vwr;
1036	+	char    buf[128];
1037	+	register char   *cp;
1038	+	again:
1039	+	if (vopts == NULL)
1040	+	return(-1);
1041	+	#ifdef MSDOS
1042	+	if (vopts[0] == '$') {
1043	+	vopts = getenv(vopts+1);
1044	+	goto again;
1045	+	}
1046	+	#endif
1047	+	copystruct(&vwr, &stdview);
1048	+	sscanview(&vwr, cp=vopts);              /* set initial options */
1049	+	while ((cp = strstr(cp, "-vf ")) != NULL &&
1050	+	*atos(buf, sizeof(buf), cp += 4)) {
1051	+	viewfile(buf, &vwr, NULL);      /* load -vf file */
1052	+	sscanview(&vwr, cp);            /* reset tail */
1053	+	}
1054	+	fputs(VIEWSTR, stdout);
1055	+	fprintview(&vwr, stdout);               /* print full spec. */
1056	+	fputc('\n', stdout);
1057	+	return(0);
1058	+	}
1059	+
1060	+
1061	+	rview(opts, po)                         /* run rview with first view */
1062	+	char    *opts, *po;
1063	+	{
1064	+	char    *vw;
1065		char    combuf[512];
1066		/* build command */
1067	<	sprintf(combuf, "rview %s%s ", getview(0, NULL), opts);
1067	>	if (touchonly || (vw = getview(0, NULL)) == NULL)
1068	>	return;
1069	>	if (sayview)
1070	>	printview(vw);
1071	>	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1072		if (rvdevice != NULL)
1073		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1074	<	strcat(combuf, vval(OCTREE));
1074	>	if (vdef(EXPOSURE))
1075	>	sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1076	>	strcat(combuf, oct1name);
1077		if (runcom(combuf)) {           /* run it */
1078		fprintf(stderr, "%s: error running rview\n", progname);
1079	<	exit(1);
1079	>	quit(1);
1080		}
1081		}
1082
1083
1084	<	rpict(opts)                             /* run rpict and pfilt for each view */
1085	<	char    *opts;
1084	>	rpict(opts, po)                         /* run rpict and pfilt for each view */
1085	>	char    *opts, *po;
1086		{
1087		char    combuf[1024];
1088	<	char    rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
1088	>	char    rawfile[MAXPATH], picfile[MAXPATH];
1089	>	char    zopt[MAXPATH+4], rep[MAXPATH+16], res[32];
1090		char    pfopts[128];
1091		char    vs[32], *vw;
1092		int     vn, mult;
1093	+	time_t  rfdt, pfdt;
1094		/* get pfilt options */
1095		pfiltopts(pfopts);
1096		/* get resolution, reporting */
1097	<	mult = vscale(QUALITY)+1;
1097	>	switch (vscale(QUALITY)) {
1098	>	case LOW:
1099	>	mult = 1;
1100	>	break;
1101	>	case MEDIUM:
1102	>	mult = 2;
1103	>	break;
1104	>	case HIGH:
1105	>	mult = 3;
1106	>	break;
1107	>	}
1108		{
1109		int     xres, yres;
1110		double  aspect;
#	Line 1044 | Line 1134 | char   *opts;
1134		/* do each view */
1135		vn = 0;
1136		while ((vw = getview(vn++, vs)) != NULL) {
1137	+	if (sayview)
1138	+	printview(vw);
1139		if (!vs[0])
1140		sprintf(vs, "%d", vn);
1141		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1142	+	if (vdef(ZFILE))
1143	+	sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1144	+	else
1145	+	zopt[0] = '\0';
1146		/* check date on picture */
1147	<	if (fdate(picfile) > octreedate)
1147	>	pfdt = fdate(picfile);
1148	>	if (pfdt >= oct1date)
1149		continue;
1150	+	/* get raw file name */
1151	+	sprintf(rawfile, "%s_%s.unf",
1152	+	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs);
1153	+	rfdt = fdate(rawfile);
1154	+	if (touchonly) {                /* update times only */
1155	+	if (rfdt) {
1156	+	if (rfdt < oct1date)
1157	+	touch(rawfile);
1158	+	} else if (pfdt && pfdt < oct1date)
1159	+	touch(picfile);
1160	+	continue;
1161	+	}
1162		/* build rpict command */
1163	<	sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1164	<	if (fdate(rawfile) > octreedate)        /* recover */
1165	<	sprintf(combuf, "rpict%s%s -ro %s %s",
1057	<	rep, opts, rawfile, vval(OCTREE));
1163	>	if (rfdt >= oct1date)           /* recover */
1164	>	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1165	>	rep, po, opts, zopt, rawfile, oct1name);
1166		else {
1167		if (overture) {         /* run overture calculation */
1168		sprintf(combuf,
1169		"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1170		rep, vw, opts,
1171	<	vval(OCTREE), overfile);
1171	>	oct1name, overfile);
1172		if (runcom(combuf)) {
1173		fprintf(stderr,
1174		"%s: error in overture for view %s\n",
1175		progname, vs);
1176	<	exit(1);
1176	>	quit(1);
1177		}
1178		#ifdef NIX
1179		rmfile(overfile);
1180		#endif
1181		}
1182	<	sprintf(combuf, "rpict%s %s %s%s %s > %s",
1183	<	rep, vw, res, opts,
1184	<	vval(OCTREE), rawfile);
1182	>	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1183	>	rep, vw, res, po, opts, zopt,
1184	>	oct1name, rawfile);
1185		}
1186		if (runcom(combuf)) {           /* run rpict */
1187		fprintf(stderr, "%s: error rendering view %s\n",
1188		progname, vs);
1189	<	exit(1);
1189	>	quit(1);
1190		}
1191	+	if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1192		/* build pfilt command */
1193	<	if (mult > 1)
1194	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1193	>	if (mult > 1)
1194	>	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1195		pfopts, mult, mult, rawfile, picfile);
1196	<	else
1197	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1198	<	rawfile, picfile);
1199	<	if (runcom(combuf)) {           /* run pfilt */
1200	<	fprintf(stderr,
1201	<	"%s: error filtering view %s\n\t%s removed\n",
1202	<	progname, vs, picfile);
1203	<	unlink(picfile);
1204	<	exit(1);
1196	>	else
1197	>	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1198	>	rawfile, picfile);
1199	>	if (runcom(combuf)) {           /* run pfilt */
1200	>	fprintf(stderr,
1201	>	"%s: error filtering view %s\n\t%s removed\n",
1202	>	progname, vs, picfile);
1203	>	unlink(picfile);
1204	>	quit(1);
1205	>	}
1206		}
1207	<	/* remove raw file */
1208	<	rmfile(rawfile);
1207	>	/* remove/rename raw file */
1208	>	if (vdef(RAWFILE)) {
1209	>	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1210	>	mvfile(rawfile, combuf);
1211	>	} else
1212	>	rmfile(rawfile);
1213		}
1214		}
1215
1216
1217	+	touch(fn)                       /* update a file */
1218	+	char    *fn;
1219	+	{
1220	+	if (!silent)
1221	+	printf("\ttouch %s\n", fn);
1222	+	if (noaction)
1223	+	return(0);
1224	+	#ifdef notused
1225	+	if (access(fn, F_OK) == -1)             /* create it */
1226	+	if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
1227	+	return(-1);
1228	+	#endif
1229	+	return(setfdate(fn, time((time_t *)NULL)));
1230	+	}
1231	+
1232	+
1233		runcom(cs)                      /* run command */
1234		char    *cs;
1235		{
#	Line 1127 | Line 1257 | char   *fn;
1257		}
1258
1259
1260	+	mvfile(fold, fnew)              /* move a file */
1261	+	char    *fold, *fnew;
1262	+	{
1263	+	if (!silent)
1264		#ifdef MSDOS
1265	+	printf("\trename %s %s\n", fold, fnew);
1266	+	#else
1267	+	printf("\tmv %s %s\n", fold, fnew);
1268	+	#endif
1269	+	if (noaction)
1270	+	return(0);
1271	+	return(rename(fold, fnew));
1272	+	}
1273	+
1274	+
1275	+	#ifdef MSDOS
1276		setenv(vname, value)            /* set an environment variable */
1277		char    *vname, *value;
1278		{
#	Line 1139 | Line 1284 | char   *vname, *value;
1284		sprintf(evp, "%s=%s", vname, value);
1285		if (putenv(evp) != 0) {
1286		fprintf(stderr, "%s: out of environment space\n", progname);
1287	<	exit(1);
1287	>	quit(1);
1288		}
1289		if (!silent)
1290		printf("set %s\n", evp);
#	Line 1152 | Line 1297 | int    vc;
1297		{
1298		fprintf(stderr, "%s: bad value for variable '%s'\n",
1299		progname, vnam(vc));
1300	<	exit(1);
1300	>	quit(1);
1301		}
1302
1303
#	Line 1160 | Line 1305 | syserr(s)                      /* report a system error and exit */
1305		char    *s;
1306		{
1307		perror(s);
1308	<	exit(1);
1308	>	quit(1);
1309	>	}
1310	>
1311	>
1312	>	void
1313	>	quit(ec)                        /* exit program */
1314	>	int     ec;
1315	>	{
1316	>	exit(ec);
1317		}

Diff Legend

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