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

Diff Legend

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