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.56 by gwlarson, Wed Jun 3 16:37:51 1998 UTC

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

Diff Legend

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