ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/rad.c

Comparing ray/src/util/rad.c (file contents):
Revision 2.4 by greg, Fri Mar 12 13:37:03 1993 UTC vs.
Revision 2.65 by schorsch, Mon Jun 30 14:59:13 2003 UTC

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

Diff Legend

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