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.1 by greg, Thu Mar 11 09:11:00 1993 UTC vs.
Revision 2.63 by schorsch, Thu Jun 5 19:29:35 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
73	<	VARIABLE        *matchvar();
74	<	char    *nvalue();
75	<	int     vscale();
73	>	/* overture calculation file */
74	>	#ifdef NIX
75	>	char    overfile[] = "overture.unf";
76	>	#else
77	>	char    overfile[] = "/dev/null";
78	>	#endif
79
80	<	#define vnam(vc)        (vv[vc].name)
80	<	#define vdef(vc)        (vv[vc].nass)
81	<	#define vval(vc)        (vv[vc].value)
82	<	#define vint(vc)        atoi(vval(vc))
83	<	#define vlet(vc)        (vval(vc)[0]&~0x20)
84	<	#define vbool(vc)       (vlet(vc)=='T')
80	>	extern time_t   time();
81
82	<	#define HIGH            2
83	<	#define MEDIUM          1
84	<	#define LOW             0
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	<	int     lowqopts(), medqopts(), hiqopts();
88	<	int     (*setqopts[3])() = {lowqopts, medqopts, hiqopts};
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	<	#define renderopts      (*setqopts[vscale(QUALITY)])
94	<
95	<	extern long     fdate();
96	<
97	<	long    scenedate;              /* date of latest scene or object file */
98	<	long    octreedate;             /* date of octree */
99	<
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 115 | 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 127 | 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 156 | Line 167 | char   *argv[];
167		setdefaults();
168		/* print all values if requested */
169		if (explicate)
170	<	printvals();
171	<	/* run simulation */
170	>	printvars(stdout);
171	>	/* build octree (and run mkillum) */
172		oconv();
173	<	renderopts(ropts);
173	>	/* check date on ambient file */
174	>	checkambfile();
175	>	/* run simulation */
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][-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 189 | 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[256];
197	<	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	<	perror(rfname);
217	<	exit(1);
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	<	while (fgetline(buf, sizeof(buf), fp) != NULL) {
206	<	for (cp = buf; *cp; cp++) {
207	<	switch (*cp) {
208	<	case '\\':
209	<	case '\n':
210	<	*cp = ' ';
211	<	continue;
212	<	case '#':
213	<	*cp = '\0';
214	<	break;
215	<	}
216	<	break;
217	<	}
218	<	setvariable(buf);
219	<	}
220	<	fclose(fp);
224	>	return(lastdate);
225		}
226
227
224	–	setvariable(ass)                /* assign variable according to string */
225	–	register char   *ass;
226	–	{
227	–	char    varname[32];
228	–	register char   *cp;
229	–	register VARIABLE       *vp;
230	–	register int    i;
231	–	int     n;
232	–
233	–	while (isspace(*ass))           /* skip leading space */
234	–	ass++;
235	–	cp = varname;                   /* extract name */
236	–	while (cp < varname+sizeof(varname)-1
237	–	&& *ass && !isspace(*ass) && *ass != '=')
238	–	*cp++ = *ass++;
239	–	*cp = '\0';
240	–	if (!varname[0])
241	–	return;         /* no variable name! */
242	–	/* trim value */
243	–	while (isspace(*ass) || *ass == '=')
244	–	ass++;
245	–	cp = ass + strlen(ass);
246	–	do
247	–	*cp-- = '\0';
248	–	while (cp >= ass && isspace(*cp));
249	–	n = cp - ass + 1;
250	–	if (!n) {
251	–	fprintf(stderr, "%s: warning - missing value for variable '%s'\n",
252	–	progname, varname);
253	–	return;
254	–	}
255	–	/* match variable from list */
256	–	vp = matchvar(varname);
257	–	if (vp == NULL) {
258	–	fprintf(stderr, "%s: unknown variable '%s'\n",
259	–	progname, varname);
260	–	exit(1);
261	–	}
262	–	/* assign new value */
263	–	cp = vp->value; i = vp->nass;
264	–	while (i--)
265	–	while (*cp++)
266	–	;
267	–	i = cp - vp->value;
268	–	vp->value = realloc(vp->value, i+n+1);
269	–	if (vp->value == NULL) {
270	–	perror(progname);
271	–	exit(1);
272	–	}
273	–	strcpy(vp->value+i, ass);
274	–	vp->nass++;
275	–	}
276	–
277	–
278	–	VARIABLE *
279	–	matchvar(nam)                   /* match a variable by its name */
280	–	char    *nam;
281	–	{
282	–	int     n = strlen(nam);
283	–	register int    i;
284	–
285	–	for (i = 0; i < NVARS; i++)
286	–	if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n))
287	–	return(vv+i);
288	–	return(NULL);
289	–	}
290	–
291	–
228		char *
229	<	nvalue(vp, n)                   /* return nth variable value */
230	<	VARIABLE        *vp;
231	<	register int    n;
229	>	newfname(orig, pred)            /* create modified file name */
230	>	char    *orig;
231	>	int     pred;
232		{
233	+	extern char     *rindex();
234		register char   *cp;
235	+	register int    n;
236	+	int     suffix;
237
238	<	if (vp == NULL || n < 0 || n >= vp->nass)
239	<	return(NULL);
240	<	cp = vp->value;
241	<	while (n--)
242	<	while (*cp++)
243	<	;
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	>	if (suffix == -1) suffix = n;
245	>	if ((cp = bmalloc(n+2)) == NULL)
246	>	syserr(progname);
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
309	–	int
310	–	vscale(vc)                      /* return scale for variable vc */
311	–	int     vc;
312	–	{
313	–	switch(vlet(vc)) {
314	–	case 'H':
315	–	return(HIGH);
316	–	case 'M':
317	–	return(MEDIUM);
318	–	case 'L':
319	–	return(LOW);
320	–	}
321	–	fprintf(stderr, "%s: illegal value for variable '%s' (%s)\n",
322	–	progname, vnam(vc), vval(vc));
323	–	exit(1);
324	–	}
325	–
326	–
327	–	checkvalues()                   /* check assignments */
328	–	{
329	–	register int    i;
330	–
331	–	for (i = 0; i < NVARS; i++)
332	–	if (vv[i].fixval != NULL)
333	–	(*vv[i].fixval)(vv+i);
334	–	}
335	–
336	–
337	–	onevalue(vp)                    /* only one assignment for this variable */
338	–	register VARIABLE       *vp;
339	–	{
340	–	if (vp->nass < 2)
341	–	return;
342	–	fprintf(stderr, "%s: warning - multiple assignment of variable '%s'\n",
343	–	progname, vp->name);
344	–	while (vp->nass-- > 1)
345	–	vp->value += strlen(vp->value)+1;
346	–	}
347	–
348	–
349	–	catvalues(vp)                   /* concatenate variable values */
350	–	register VARIABLE       *vp;
351	–	{
352	–	register char   *cp;
353	–
354	–	if (vp->nass < 2)
355	–	return;
356	–	for (cp = vp->value; vp->nass > 1; vp->nass--) {
357	–	while (*cp)
358	–	cp++;
359	–	*cp++ = ' ';
360	–	}
361	–	}
362	–
363	–
364	–	long
365	–	checklast(fnames)                       /* check files and find most recent */
366	–	register char   *fnames;
367	–	{
368	–	char    thisfile[MAXPATH];
369	–	long    thisdate, lastdate = -1;
370	–	register char   *cp;
371	–
372	–	while (*fnames) {
373	–	while (isspace(*fnames)) fnames++;
374	–	cp = thisfile;
375	–	while (*fnames && !isspace(*fnames)) *cp++ = *fnames++;
376	–	*cp = '\0';
377	–	if ((thisdate = fdate(thisfile)) < 0) {
378	–	perror(thisfile);
379	–	exit(1);
380	–	}
381	–	if (thisdate > lastdate)
382	–	lastdate = thisdate;
383	–	}
384	–	return(lastdate);
385	–	}
386	–
387	–
254		checkfiles()                    /* check for existence and modified times */
255		{
256	<	long    objdate;
256	>	time_t  objdate;
257
258	<	octreedate = vdef(OCTREE) ? fdate(vval(OCTREE)) : -1;
259	<	scenedate = -1;
260	<	if (vdef(SCENE)) {
261	<	scenedate = checklast(vval(SCENE));
262	<	if (vdef(OBJECT)) {
263	<	objdate = checklast(vval(OBJECT));
264	<	if (objdate > scenedate)
265	<	scenedate = objdate;
266	<	}
258	>	if (!vdef(OCTREE)) {
259	>	if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL)
260	>	syserr(progname);
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	<	if (octreedate < 0 & scenedate < 0) {
269	<	fprintf(stderr, "%s: need scene or octree\n", progname);
270	<	exit(1);
268	>	octreedate = fdate(vval(OCTREE));
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	+	matdate = checklast(vval(MATERIAL));
286		}
287
288
289	<	setdefaults()                   /* set default values for unassigned var's */
289	>	getoctcube(org, sizp)           /* get octree bounding cube */
290	>	double  org[3], *sizp;
291		{
292	+	extern FILE     *popen();
293	+	static double   oorg[3], osiz = 0.;
294	+	double  min[3], max[3];
295	+	char    buf[1024];
296		FILE    *fp;
297	<	double  xmin, ymin, zmin, size;
413	<	char    buf[512];
414	<	char    *cp;
297	>	register int    i;
298
299	<	if (!vdef(OCTREE)) {
300	<	sprintf(buf, "%s.oct", radname);
301	<	vval(OCTREE) = savqstr(buf);
302	<	vdef(OCTREE)++;
303	<	}
304	<	if (!vdef(ZONE)) {
305	<	if (scenedate > octreedate) {
306	<	sprintf(buf, "getbbox -w -h %s", vval(SCENE));
307	<	if (!silent) {
308	<	printf("\t%s\n", buf);
309	<	fflush(stdout);
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	<	if ((fp = popen(buf, "r")) == NULL) {
316	<	perror("getbbox");
317	<	exit(1);
318	<	}
319	<	buf[0] = 'E'; buf[1] = ' ';
433	<	fgetline(buf+2, sizeof(buf)-2, fp);
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 {
322	<	sprintf(buf, "getinfo -d < %s", vval(OCTREE));
323	<	if ((fp = popen(buf, "r")) == NULL) {
324	<	perror("getinfo");
325	<	exit(1);
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	>	quit(1);
332		}
441	–	fscanf(fp, "%lf %lf %lf %lf",
442	–	&xmin, &ymin, &zmin, &size);
443	–	sprintf(buf, "E %g %g %g %g %g %g", xmin, xmin+size,
444	–	ymin, ymin+size, zmin, zmin+size);
333		pclose(fp);
334		}
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], lim[3], size;
342	+	char    buf[128];
343	+
344	+	if (!vdef(ZONE)) {
345	+	getoctcube(org, &size);
346	+	sprintf(buf, "E %g %g %g %g %g %g", org[0], org[0]+size,
347	+	org[1], org[1]+size, org[2], org[2]+size);
348		vval(ZONE) = savqstr(buf);
349		vdef(ZONE)++;
350		}
351	<	if (!vdef(UP)) {
352	<	vval(UP) = "Z";
353	<	vdef(UP)++;
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";
#	Line 467 | Line 374 | setdefaults()                  /* set default values for unassigned v
374		vval(PICTURE) = radname;
375		vdef(PICTURE)++;
376		}
377	<	if (!vdef(AMBFILE)) {
378	<	sprintf(buf, "%s.amb", radname);
379	<	vval(AMBFILE) = savqstr(buf);
473	<	vdef(AMBFILE)++;
377	>	if (!vdef(VIEWS)) {
378	>	vval(VIEWS) = "X";
379	>	vdef(VIEWS)++;
380		}
475	–	if (!vdef(VIEW)) {
476	–	vval(VIEW) = "X";
477	–	vdef(VIEW)++;
478	–	}
381		if (!vdef(DETAIL)) {
382		vval(DETAIL) = "M";
383		vdef(DETAIL)++;
#	Line 491 | 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 < vv[i].nass; j++)
403	<	printf("%s= %s\n", vv[i].name, 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 */
413	<	return;
414	<	/* build command */
415	<	oconvopts(ocopts);
416	<	sprintf(combuf, "oconv%s %s > %s", ocopts, vval(SCENE), vval(OCTREE));
417	<	if (!silent) {                  /* echo it */
418	<	printf("\t%s\n", combuf);
419	<	fflush(stdout);
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 (noaction)
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	<	if (system(combuf)) {           /* run it */
432	<	fprintf(stderr, "%s: error generating octree\n\t%s removed\n",
433	<	progname, vval(OCTREE));
434	<	unlink(vval(OCTREE));
435	<	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	+	oct1date = time((time_t *)NULL);
493	+	if (oct1date < oct0date)        /* in case clock is off */
494	+	oct1date = oct0date;
495		}
496
497
#	Line 538 | Line 507 | register char  *op, *arg;
507
508
509		oconvopts(oo)                           /* get oconv options */
510	<	char    *oo;
510	>	register char   *oo;
511		{
512	+	/* BEWARE:  This may be called via setdefaults(), so no assumptions */
513	+
514		*oo = '\0';
515		if (vdef(OCONV))
516		addarg(oo, vval(OCONV));
517		}
518
519
520	<	lowqopts(ro)                            /* low quality rendering options */
521	<	char    *ro;
520	>	mkillumopts(mo)                         /* get mkillum options */
521	>	register char   *mo;
522		{
523	<	register char   *op = ro;
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	+	time_t  afdate;
534	+
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));
544	+	}
545	+
546	+
547	+	double
548	+	ambval()                                /* compute ambient value */
549	+	{
550	+	if (vdef(EXPOSURE)) {
551	+	if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
552	+	return(.5/pow(2.,vflt(EXPOSURE)));
553	+	return(.5/vflt(EXPOSURE));
554	+	}
555	+	if (vlet(ZONE) == 'E')
556	+	return(10.);
557	+	if (vlet(ZONE) == 'I')
558	+	return(.01);
559	+	badvalue(ZONE);
560	+	}
561	+
562	+
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	+	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	+	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	+	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	+	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 .5");
622	+	if (vdef(AMBFILE)) {
623	+	sprintf(op, " -af %s", vval(AMBFILE));
624	+	op += strlen(op);
625	+	} else
626	+	overture = 0;
627	+	switch (vscale(VARIABILITY)) {
628	+	case LOW:
629	+	op = addarg(op, "-aa .4 -ad 64");
630	+	break;
631	+	case MEDIUM:
632	+	op = addarg(op, "-aa .3 -ad 128");
633	+	break;
634	+	case HIGH:
635	+	op = addarg(op, "-aa .25 -ad 256");
636	+	break;
637	+	}
638	+	op = addarg(op, "-as 0");
639	+	d = ambval();
640	+	sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
641	+	op += strlen(op);
642	+	op = addarg(op, "-lr 3 -lw .02");
643		if (vdef(RENDER))
644		op = addarg(op, vval(RENDER));
645		}
646
647
648	<	medqopts(ro)                            /* medium quality rendering options */
649	<	char    *ro;
648	>	medqopts(op, po)                        /* medium quality rendering options */
649	>	register char   *op;
650	>	char    *po;
651		{
652	<	register char   *op = ro;
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	+	asz = (siz[0]+siz[1]+siz[2])/3.;
664	+	d /= asz;
665	+	switch (vscale(DETAIL)) {
666	+	case LOW:
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	+	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	+	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	+	po = addarg(po, "-pt .08");
692	+	if (vbool(PENUMBRAS))
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 .1");
697	+	if (overture = vint(INDIRECT)) {
698	+	sprintf(op, " -ab %d", overture);
699	+	op += strlen(op);
700	+	}
701	+	if (vdef(AMBFILE)) {
702	+	sprintf(op, " -af %s", vval(AMBFILE));
703	+	op += strlen(op);
704	+	} else
705	+	overture = 0;
706	+	switch (vscale(VARIABILITY)) {
707	+	case LOW:
708	+	op = addarg(op, "-aa .25 -ad 196 -as 0");
709	+	break;
710	+	case MEDIUM:
711	+	op = addarg(op, "-aa .2 -ad 400 -as 64");
712	+	break;
713	+	case HIGH:
714	+	op = addarg(op, "-aa .15 -ad 768 -as 196");
715	+	break;
716	+	}
717	+	d = ambval();
718	+	sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
719	+	op += strlen(op);
720	+	op = addarg(op, "-lr 6 -lw .002");
721		if (vdef(RENDER))
722		op = addarg(op, vval(RENDER));
723		}
724
725
726	<	hiqopts(ro)                             /* high quality rendering options */
727	<	char    *ro;
726	>	hiqopts(op, po)                         /* high quality rendering options */
727	>	register char   *op;
728	>	char    *po;
729		{
730	<	register char   *op = ro;
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	+	asz = (siz[0]+siz[1]+siz[2])/3.;
742	+	d /= asz;
743	+	switch (vscale(DETAIL)) {
744	+	case LOW:
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	+	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	+	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	+	po = addarg(po, "-pt .04");
770	+	if (vbool(PENUMBRAS))
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 .01");
775	+	sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
776	+	op += strlen(op);
777	+	if (vdef(AMBFILE)) {
778	+	sprintf(op, " -af %s", vval(AMBFILE));
779	+	op += strlen(op);
780	+	} else
781	+	overture = 0;
782	+	switch (vscale(VARIABILITY)) {
783	+	case LOW:
784	+	op = addarg(op, "-aa .15 -ad 256 -as 0");
785	+	break;
786	+	case MEDIUM:
787	+	op = addarg(op, "-aa .125 -ad 512 -as 256");
788	+	break;
789	+	case HIGH:
790	+	op = addarg(op, "-aa .08 -ad 1024 -as 512");
791	+	break;
792	+	}
793	+	d = ambval();
794	+	sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
795	+	op += strlen(op);
796	+	op = addarg(op, "-lr 12 -lw .0005");
797		if (vdef(RENDER))
798		op = addarg(op, vval(RENDER));
799		}
#	Line 583 | 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) {
813	<	perror(vval(OPTFILE));
814	<	exit(1);
815	<	}
816	<	if (write(fd, ro+1, n-1) != n-1) {
817	<	perror(vval(OPTFILE));
818	<	exit(1);
819	<	}
820	<	write(fd, "\n", 1);
821	<	close(fd);
822	<	ro[0] = ' ';
602	<	ro[1] = '^';
603	<	strcpy(ro+2, vval(OPTFILE));
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	>	sprintf(ro, " @%s", vval(OPTFILE));
823		}
824	<	#ifdef MSDOS
824	>	#ifdef _WIN32
825		else if (n > 50) {
826	<	register char   *evp = bmalloc(n+6);
608	<	if (evp == NULL) {
609	<	perror(progname);
610	<	exit(1);
611	<	}
612	<	strcpy(evp, "ROPT=");
613	<	strcat(evp, ro);
614	<	putenv(evp);
826	>	setenv("ROPT", ro+1);
827		strcpy(ro, " $ROPT");
828		}
829		#endif
#	Line 626 | 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 649 | Line 867 | char *
867		specview(vs)                            /* get proper view spec from vs */
868		register char   *vs;
869		{
870	+	static char     vup[7][12] = {"-vu 0 0 -1","-vu 0 -1 0","-vu -1 0 0",
871	+	"-vu 0 0 1", "-vu 1 0 0","-vu 0 1 0","-vu 0 0 1"};
872		static char     viewopts[128];
873		register char   *cp;
874	<	int     xpos, ypos, zpos, viewtype;
875	<	int     exterior;
874	>	int     xpos, ypos, zpos, viewtype, upax;
875	>	register int    i;
876		double  cent[3], dim[3], mult, d;
877
878		if (vs == NULL || *vs == '-')
879		return(vs);
880	+	upax = 0;                       /* get the up vector */
881	+	if (vdef(UP)) {
882	+	if (vval(UP)[0] == '-' || vval(UP)[0] == '+')
883	+	upax = 1-'X'+UPPER(vval(UP)[1]);
884	+	else
885	+	upax = 1-'X'+vlet(UP);
886	+	if (upax < 1 | upax > 3)
887	+	badvalue(UP);
888	+	if (vval(UP)[0] == '-')
889	+	upax = -upax;
890	+	}
891		/* check standard view names */
892		xpos = ypos = zpos = 0;
662	–	viewtype = 0;
893		if (*vs == 'X') {
894		xpos = 1; vs++;
895		} else if (*vs == 'x') {
#	Line 675 | Line 905 | register char  *vs;
905		} else if (*vs == 'z') {
906		zpos = -1; vs++;
907		}
908	<	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h')
908	>	viewtype = 'v';
909	>	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c')
910		viewtype = *vs++;
680	–	else if (!*vs || isspace(*vs))
681	–	viewtype = 'v';
911		cp = viewopts;
912	<	if (viewtype && (xpos|ypos|zpos)) {     /* got standard view */
912	>	if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {       /* got one! */
913		*cp++ = '-'; *cp++ = 'v'; *cp++ = 't'; *cp++ = viewtype;
914		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf",
915		&cent[0], &dim[0], &cent[1], &dim[1],
916	<	&cent[2], &dim[2]) != 6) {
917	<	fprintf(stderr, "%s: bad zone specification\n",
918	<	progname);
919	<	exit(1);
916	>	&cent[2], &dim[2]) != 6)
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	<	dim[0] -= cent[0];
693	<	dim[1] -= cent[1];
694	<	dim[2] -= cent[2];
695	<	exterior = vlet(ZONE) == 'E';
696	<	mult = exterior ? 2. : .45 ;
924	>	mult = vlet(ZONE)=='E' ? 2. : .45 ;
925		sprintf(cp, " -vp %.2g %.2g %.2g -vd %.2g %.2g %.2g",
926		cent[0]+xpos*mult*dim[0],
927		cent[1]+ypos*mult*dim[1],
928		cent[2]+zpos*mult*dim[2],
929		-xpos*dim[0], -ypos*dim[1], -zpos*dim[2]);
930		cp += strlen(cp);
931	<	switch (vlet(UP)) {
932	<	case 'Z':
933	<	if (xpos|ypos) {
934	<	cp = addarg(cp, "-vu 0 0 1");
935	<	break;
936	<	}
937	<	/* fall through */
710	<	case 'Y':
711	<	if (xpos|zpos) {
712	<	cp = addarg(cp, "-vu 0 1 0");
713	<	break;
714	<	}
715	<	/* fall through */
716	<	case 'X':
717	<	if (ypos|zpos)
718	<	cp = addarg(cp, "-vu 1 0 0");
719	<	else
720	<	cp = addarg(cp, "-vu 0 0 1");
931	>	/* redirect up axis if necessary */
932	>	switch (upax) {
933	>	case 3:                 /* plus or minus Z axis */
934	>	case -3:
935	>	case 0:
936	>	if (!(xpos|ypos))
937	>	upax = 2;
938		break;
939	<	default:
940	<	fprintf(stderr, "%s: illegal value for variable '%s'\n",
941	<	progname, vnam(UP));
942	<	exit(1);
939	>	case 2:                 /* plus or minus Y axis */
940	>	case -2:
941	>	if (!(xpos|zpos))
942	>	upax = 1;
943	>	break;
944	>	case 1:                 /* plus or minus X axis */
945	>	case -1:
946	>	if (!(ypos|zpos))
947	>	upax = 3;
948	>	break;
949		}
950	+	cp = addarg(cp, vup[upax+3]);
951		switch (viewtype) {
952		case 'v':
953		cp = addarg(cp, "-vh 45 -vv 45");
#	Line 737 | 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 (*vs && !isspace(*vs))    /* else skip id */
970	<	vs++;
971	<	/* append any additional options */
972	<	while (isspace(*vs)) vs++;
968	>	} else {
969	>	while (!isspace(*vs))           /* else skip id */
970	>	if (!*vs++)
971	>	return(NULL);
972	>	if (upax) {                     /* specify up vector */
973	>	strcpy(cp, vup[upax+3]);
974	>	cp += strlen(cp);
975	>	}
976	>	}
977	>	if (cp == viewopts)             /* append any additional options */
978	>	vs++;           /* skip prefixed space if unneeded */
979		strcpy(cp, vs);
980	+	#ifdef _WIN32
981	+	if (strlen(viewopts) > 40) {
982	+	setenv("VIEW", viewopts);
983	+	return("$VIEW");
984	+	}
985	+	#endif
986		return(viewopts);
987		}
988
#	Line 751 | Line 990 | register char  *vs;
990		char *
991		getview(n, vn)                          /* get view n, or NULL if none */
992		int     n;
993	<	char    *vn;
993	>	char    *vn;            /* returned view name */
994		{
995		register char   *mv;
996
997	<	if (viewselect != NULL) {
997	>	if (viewselect != NULL) {               /* command-line selected */
998		if (n)                          /* only do one */
999		return(NULL);
1000		if (viewselect[0] == '-') {     /* already specified */
#	Line 768 | Line 1007 | char   *vn;
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	<	if (vn != NULL && (mv = nvalue(vv+VIEW, n)) != NULL) {
1020	<	if (*mv != '-')
1021	<	while (*mv && !isspace(*mv))
1022	<	*vn++ = *mv++;
1019	>	mv = nvalue(VIEWS, n);          /* use view n */
1020	>	if (vn != NULL & mv != NULL) {
1021	>	register char   *mv2 = mv;
1022	>	if (*mv2 != '-')
1023	>	while (*mv2 && !isspace(*mv2))
1024	>	*vn++ = *mv2++;
1025		*vn = '\0';
1026		}
1027	<	return(specview(nvalue(vv+VIEW, n)));   /* use view n */
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	+	VIEW    vwr;
1035	+	char    buf[128];
1036	+	register char   *cp;
1037	+	again:
1038	+	if (vopts == NULL)
1039	+	return(-1);
1040	+	#ifdef _WIN32
1041	+	if (vopts[0] == '$') {
1042	+	vopts = getenv(vopts+1);
1043	+	goto again;
1044	+	}
1045	+	#endif
1046	+	copystruct(&vwr, &stdview);
1047	+	sscanview(&vwr, cp=vopts);              /* set initial options */
1048	+	while ((cp = strstr(cp, "-vf ")) != NULL &&
1049	+	*atos(buf, sizeof(buf), cp += 4)) {
1050	+	viewfile(buf, &vwr, NULL);      /* load -vf file */
1051	+	sscanview(&vwr, cp);            /* reset tail */
1052	+	}
1053	+	fputs(VIEWSTR, stdout);
1054	+	fprintview(&vwr, stdout);               /* print full spec. */
1055	+	fputc('\n', stdout);
1056	+	return(0);
1057	+	}
1058	+
1059	+
1060	+	rview(opts, po)                         /* run rview with first view */
1061	+	char    *opts, *po;
1062	+	{
1063	+	char    *vw;
1064		char    combuf[512];
1065		/* build command */
1066	<	sprintf(combuf, "rview %s%s ", getview(0, NULL), opts);
1066	>	if (touchonly || (vw = getview(0, NULL)) == NULL)
1067	>	return;
1068	>	if (sayview)
1069	>	printview(vw);
1070	>	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1071		if (rvdevice != NULL)
1072		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1073	<	strcat(combuf, vval(OCTREE));
1074	<	if (!silent) {                  /* echo it */
1075	<	printf("\t%s\n", combuf);
1076	<	fflush(stdout);
799	<	}
800	<	if (noaction)
801	<	return;
802	<	if (system(combuf)) {           /* run it */
1073	>	if (vdef(EXPOSURE))
1074	>	sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1075	>	strcat(combuf, oct1name);
1076	>	if (runcom(combuf)) {           /* run it */
1077		fprintf(stderr, "%s: error running rview\n", progname);
1078	<	exit(1);
1078	>	quit(1);
1079		}
1080		}
1081
1082
1083	<	rpict(opts)                             /* run rpict and pfilt for each view */
1084	<	char    *opts;
1083	>	rpict(opts, po)                         /* run rpict and pfilt for each view */
1084	>	char    *opts, *po;
1085		{
1086	<	char    combuf[512];
1087	<	char    rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH], res[32];
1088	<	char    pfopts[64];
1086	>	char    combuf[1024];
1087	>	char    rawfile[MAXPATH], picfile[MAXPATH];
1088	>	char    zopt[MAXPATH+4], rep[MAXPATH+16], res[32];
1089	>	char    pfopts[128];
1090		char    vs[32], *vw;
1091		int     vn, mult;
1092	+	time_t  rfdt, pfdt;
1093		/* get pfilt options */
1094		pfiltopts(pfopts);
1095		/* get resolution, reporting */
1096	<	mult = vscale(QUALITY)+1;
1096	>	switch (vscale(QUALITY)) {
1097	>	case LOW:
1098	>	mult = 1;
1099	>	break;
1100	>	case MEDIUM:
1101	>	mult = 2;
1102	>	break;
1103	>	case HIGH:
1104	>	mult = 3;
1105	>	break;
1106	>	}
1107		{
1108		int     xres, yres;
1109		double  aspect;
#	Line 829 | Line 1115 | char   *opts;
1115		else if (n) {
1116		if (n == 1) yres = xres;
1117		sprintf(res, "-x %d -y %d", mult*xres, mult*yres);
1118	<	} else {
1119	<	fprintf(stderr, "%s: bad value for variable '%s'\n",
834	<	progname, vnam(RESOLUTION));
835	<	exit(1);
836	<	}
1118	>	} else
1119	>	badvalue(RESOLUTION);
1120		}
1121		rep[0] = '\0';
1122		if (vdef(REPORT)) {
#	Line 844 | Line 1127 | char   *opts;
1127		sprintf(rep, " -t %d -e %s", (int)(minutes*60), rawfile);
1128		else if (n == 1)
1129		sprintf(rep, " -t %d", (int)(minutes*60));
1130	<	else {
1131	<	fprintf(stderr, "%s: bad value for variable '%s'\n",
849	<	progname, vnam(REPORT));
850	<	exit(1);
851	<	}
1130	>	else
1131	>	badvalue(REPORT);
1132		}
1133		/* do each view */
1134		vn = 0;
1135		while ((vw = getview(vn++, vs)) != NULL) {
1136	+	if (sayview)
1137	+	printview(vw);
1138		if (!vs[0])
1139		sprintf(vs, "%d", vn);
1140		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1141	+	if (vdef(ZFILE))
1142	+	sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1143	+	else
1144	+	zopt[0] = '\0';
1145		/* check date on picture */
1146	<	if (fdate(picfile) > octreedate)
1146	>	pfdt = fdate(picfile);
1147	>	if (pfdt >= oct1date)
1148		continue;
1149	+	/* get raw file name */
1150	+	sprintf(rawfile, "%s_%s.unf",
1151	+	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs);
1152	+	rfdt = fdate(rawfile);
1153	+	if (touchonly) {                /* update times only */
1154	+	if (rfdt) {
1155	+	if (rfdt < oct1date)
1156	+	touch(rawfile);
1157	+	} else if (pfdt && pfdt < oct1date)
1158	+	touch(picfile);
1159	+	continue;
1160	+	}
1161		/* build rpict command */
1162	<	sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1163	<	if (fdate(rawfile) > octreedate)        /* recover */
1164	<	sprintf(combuf, "rpict%s%s -ro %s %s",
866	<	rep, opts, rawfile, vval(OCTREE));
1162	>	if (rfdt >= oct1date)           /* recover */
1163	>	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1164	>	rep, po, opts, zopt, rawfile, oct1name);
1165		else {
1166		if (overture) {         /* run overture calculation */
1167		sprintf(combuf,
1168		"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1169		rep, vw, opts,
1170	<	vval(OCTREE), rawfile);
1171	<	if (!silent) {
874	<	printf("\t%s\n", combuf);
875	<	fflush(stdout);
876	<	}
877	<	if (!noaction && system(combuf)) {
1170	>	oct1name, overfile);
1171	>	if (runcom(combuf)) {
1172		fprintf(stderr,
1173	<	"%s: error in overture for view %s\n\t%s removed\n",
1174	<	progname, vs, rawfile);
1175	<	unlink(rawfile);
882	<	exit(1);
1173	>	"%s: error in overture for view %s\n",
1174	>	progname, vs);
1175	>	quit(1);
1176		}
1177	+	#ifdef NIX
1178	+	rmfile(overfile);
1179	+	#endif
1180		}
1181	<	sprintf(combuf, "rpict%s %s %s%s %s > %s",
1182	<	rep, vw, res, opts,
1183	<	vval(OCTREE), rawfile);
1181	>	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1182	>	rep, vw, res, po, opts, zopt,
1183	>	oct1name, rawfile);
1184		}
1185	<	if (!silent) {                  /* echo rpict command */
890	<	printf("\t%s\n", combuf);
891	<	fflush(stdout);
892	<	}
893	<	if (!noaction && system(combuf)) {      /* run rpict */
1185	>	if (runcom(combuf)) {           /* run rpict */
1186		fprintf(stderr, "%s: error rendering view %s\n",
1187		progname, vs);
1188	<	exit(1);
1188	>	quit(1);
1189		}
1190	+	if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1191		/* build pfilt command */
1192	<	if (mult > 1)
1193	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1192	>	if (mult > 1)
1193	>	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1194		pfopts, mult, mult, rawfile, picfile);
1195	<	else
1196	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1197	<	rawfile, picfile);
1198	<	if (!silent) {                  /* echo pfilt command */
1199	<	printf("\t%s\n", combuf);
1200	<	fflush(stdout);
1195	>	else
1196	>	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1197	>	rawfile, picfile);
1198	>	if (runcom(combuf)) {           /* run pfilt */
1199	>	fprintf(stderr,
1200	>	"%s: error filtering view %s\n\t%s removed\n",
1201	>	progname, vs, picfile);
1202	>	unlink(picfile);
1203	>	quit(1);
1204	>	}
1205		}
1206	<	if (!noaction && system(combuf)) {      /* run pfilt */
1207	<	fprintf(stderr,
1208	<	"%s: error filtering view %s\n\t%s removed\n",
1209	<	progname, vs, picfile);
1210	<	unlink(picfile);
1211	<	exit(1);
1212	<	}
1213	<	/* remove raw file */
1214	<	if (!silent)
1215	<	#ifdef MSDOS
1216	<	printf("\tdel %s\n", rawfile);
1206	>	/* remove/rename raw file */
1207	>	if (vdef(RAWFILE)) {
1208	>	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1209	>	mvfile(rawfile, combuf);
1210	>	} else
1211	>	rmfile(rawfile);
1212	>	}
1213	>	}
1214	>
1215	>
1216	>	touch(fn)                       /* update a file */
1217	>	char    *fn;
1218	>	{
1219	>	if (!silent)
1220	>	printf("\ttouch %s\n", fn);
1221	>	if (noaction)
1222	>	return(0);
1223	>	#ifdef notused
1224	>	if (access(fn, F_OK) == -1)             /* create it */
1225	>	if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
1226	>	return(-1);
1227	>	#endif
1228	>	return(setfdate(fn, time((time_t *)NULL)));
1229	>	}
1230	>
1231	>
1232	>	runcom(cs)                      /* run command */
1233	>	char    *cs;
1234	>	{
1235	>	if (!silent)            /* echo it */
1236	>	printf("\t%s\n", cs);
1237	>	if (noaction)
1238	>	return(0);
1239	>	fflush(stdout);         /* flush output and pass to shell */
1240	>	return(system(cs));
1241	>	}
1242	>
1243	>
1244	>	rmfile(fn)                      /* remove a file */
1245	>	char    *fn;
1246	>	{
1247	>	if (!silent)
1248	>	#ifdef _WIN32
1249	>	printf("\tdel %s\n", fn);
1250		#else
1251	<	printf("\trm %s\n", rawfile);
1251	>	printf("\trm -f %s\n", fn);
1252		#endif
1253	<	if (!noaction)
1254	<	unlink(rawfile);
1253	>	if (noaction)
1254	>	return(0);
1255	>	return(unlink(fn));
1256	>	}
1257	>
1258	>
1259	>	mvfile(fold, fnew)              /* move a file */
1260	>	char    *fold, *fnew;
1261	>	{
1262	>	if (!silent)
1263	>	#ifdef _WIN32
1264	>	printf("\trename %s %s\n", fold, fnew);
1265	>	#else
1266	>	printf("\tmv %s %s\n", fold, fnew);
1267	>	#endif
1268	>	if (noaction)
1269	>	return(0);
1270	>	return(rename(fold, fnew));
1271	>	}
1272	>
1273	>
1274	>	#ifdef _WIN32
1275	>	setenv(vname, value)            /* set an environment variable */
1276	>	char    *vname, *value;
1277	>	{
1278	>	register char   *evp;
1279	>
1280	>	evp = bmalloc(strlen(vname)+strlen(value)+2);
1281	>	if (evp == NULL)
1282	>	syserr(progname);
1283	>	sprintf(evp, "%s=%s", vname, value);
1284	>	if (putenv(evp) != 0) {
1285	>	fprintf(stderr, "%s: out of environment space\n", progname);
1286	>	quit(1);
1287		}
1288	+	if (!silent)
1289	+	printf("set %s\n", evp);
1290	+	}
1291	+	#endif
1292	+
1293	+
1294	+	badvalue(vc)                    /* report bad variable value and exit */
1295	+	int     vc;
1296	+	{
1297	+	fprintf(stderr, "%s: bad value for variable '%s'\n",
1298	+	progname, vnam(vc));
1299	+	quit(1);
1300	+	}
1301	+
1302	+
1303	+	syserr(s)                       /* report a system error and exit */
1304	+	char    *s;
1305	+	{
1306	+	perror(s);
1307	+	quit(1);
1308	+	}
1309	+
1310	+
1311	+	void
1312	+	quit(ec)                        /* exit program */
1313	+	int     ec;
1314	+	{
1315	+	exit(ec);
1316		}

Diff Legend

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