[ViewVC] Diff of: radiance/ray/src/util/rad.c

Comparing ray/src/util/rad.c (file contents):
Revision 2.7 by greg, Tue Apr 6 17:21:04 1993 UTC vs.
Revision 2.55 by gregl, Fri Jan 23 17:17:32 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
15	–
16	–	typedef struct {
17	–	char name; / variable name */
18	–	short nick; /* # characters required for nickname */
19	–	short nass; /* # assignments made */
20	–	char value; / assigned value(s) */
21	–	int (fixval)(); / assignment checking function */
22	–	} VARIABLE;
23	–
24	–	int onevalue(), catvalues();
25	–
18		/* variables */
19		#define OBJECT 0 /* object files */
20		#define SCENE 1 /* scene files */
21		#define MATERIAL 2 /* material files */
22	<	#define RENDER 3 /* rendering options */
23	<	#define OCONV 4 /* oconv options */
24	<	#define PFILT 5 /* pfilt options */
25	<	#define VIEW 6 /* view(s) for picture(s) */
26	<	#define ZONE 7 /* simulation zone */
27	<	#define QUALITY 8 /* desired rendering quality */
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 */
22	>	#define ILLUM 3 /* mkillum input files */
23	>	#define MKILLUM 4 /* mkillum options */
24	>	#define RENDER 5 /* rendering options */
25	>	#define OCONV 6 /* oconv options */
26	>	#define PFILT 7 /* pfilt options */
27	>	#define VIEWS 8 /* view(s) for picture(s) */
28	>	#define ZONE 9 /* simulation zone */
29	>	#define QUALITY 10 /* desired rendering quality */
30	>	#define OCTREE 11 /* octree file name */
31	>	#define PICTURE 12 /* picture file root name */
32	>	#define AMBFILE 13 /* ambient file name */
33	>	#define OPTFILE 14 /* rendering options file */
34	>	#define EXPOSURE 15 /* picture exposure setting */
35	>	#define RESOLUTION 16 /* maximum picture resolution */
36	>	#define UP 17 /* view up (X, Y or Z) */
37	>	#define INDIRECT 18 /* indirection in lighting */
38	>	#define DETAIL 19 /* level of scene detail */
39	>	#define PENUMBRAS 20 /* shadow penumbras are desired */
40	>	#define VARIABILITY 21 /* level of light variability */
41	>	#define REPORT 22 /* report frequency and errfile */
42	>	#define RAWFILE 23 /* raw picture file root name */
43	>	#define ZFILE 24 /* distance file root name */
44		/* total number of variables */
45	<	#define NVARS 21
45	>	int NVARS = 25;
46
47	<	VARIABLE vv[NVARS] = { /* variable-value pairs */
47	>	VARIABLE vv[] = { /* variable-value pairs */
48		{"objects", 3, 0, NULL, catvalues},
49		{"scene", 3, 0, NULL, catvalues},
50		{"materials", 3, 0, NULL, catvalues},
51	+	{"illum", 3, 0, NULL, catvalues},
52	+	{"mkillum", 3, 0, NULL, catvalues},
53		{"render", 3, 0, NULL, catvalues},
54		{"oconv", 3, 0, NULL, catvalues},
55		{"pfilt", 2, 0, NULL, catvalues},
56		{"view", 2, 0, NULL, NULL},
57		{"ZONE", 2, 0, NULL, onevalue},
58	<	{"QUALITY", 3, 0, NULL, onevalue},
58	>	{"QUALITY", 3, 0, NULL, qualvalue},
59		{"OCTREE", 3, 0, NULL, onevalue},
60		{"PICTURE", 3, 0, NULL, onevalue},
61		{"AMBFILE", 3, 0, NULL, onevalue},
62		{"OPTFILE", 3, 0, NULL, onevalue},
63	<	{"EXPOSURE", 3, 0, NULL, onevalue},
63	>	{"EXPOSURE", 3, 0, NULL, fltvalue},
64		{"RESOLUTION", 3, 0, NULL, onevalue},
65		{"UP", 2, 0, NULL, onevalue},
66	<	{"INDIRECT", 3, 0, NULL, onevalue},
67	<	{"DETAIL", 3, 0, NULL, onevalue},
68	<	{"PENUMBRAS", 3, 0, NULL, onevalue},
69	<	{"VARIABILITY", 3, 0, NULL, onevalue},
66	>	{"INDIRECT", 3, 0, NULL, intvalue},
67	>	{"DETAIL", 3, 0, NULL, qualvalue},
68	>	{"PENUMBRAS", 3, 0, NULL, boolvalue},
69	>	{"VARIABILITY", 3, 0, NULL, qualvalue},
70		{"REPORT", 3, 0, NULL, onevalue},
71	+	{"RAWFILE", 3, 0, NULL, onevalue},
72	+	{"ZFILE", 2, 0, NULL, onevalue},
73		};
74
75	–	VARIABLE *matchvar();
76	–	char *nvalue();
77	–	int vscale();
78	–
79	–	#define UPPER(c) ((c)&~0x20) /* ASCII trick */
80	–
81	–	#define vnam(vc) (vv[vc].name)
82	–	#define vdef(vc) (vv[vc].nass)
83	–	#define vval(vc) (vv[vc].value)
84	–	#define vint(vc) atoi(vval(vc))
85	–	#define vlet(vc) UPPER(vval(vc)[0])
86	–	#define vbool(vc) (vlet(vc)=='T')
87	–
88	–	#define HIGH 2
89	–	#define MEDIUM 1
90	–	#define LOW 0
91	–
92	–	int lowqopts(), medqopts(), hiqopts();
93	–	int (*setqopts[3])() = {lowqopts, medqopts, hiqopts};
94	–
95	–	#define renderopts (*setqopts[vscale(QUALITY)])
96	–
75		/* overture calculation file */
76		#ifdef NIX
77	<	char overfile[] = "overture.raw";
77	>	char overfile[] = "overture.unf";
78		#else
79		char overfile[] = "/dev/null";
80		#endif
81
82	<	extern long fdate(), time();
82	>	extern time_t fdate(), time();
83
84	<	long scenedate; /* date of latest scene or object file */
85	<	long octreedate; /* date of octree */
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	+	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	+	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 124 \| 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 136 \| 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 165 \| Line 169 \| *char argv[];**
169		setdefaults();
170		/* print all values if requested */
171		if (explicate)
172	<	printvals();
173	<	/* build octree */
172	>	printvars(stdout);
173	>	/* build octree (and run mkillum) */
174		oconv();
175		/* check date on ambient file */
176		checkambfile();
177		/* run simulation */
178	<	renderopts(ropts);
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][-e][-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 201 \| Line 205 \| *register char rn, fn;*
205		}
206
207
208	<	load(rfname) /* load Radiance simulation file */
205	<	char *rfname;
206	<	{
207	<	FILE *fp;
208	<	char buf[512];
209	<	register char *cp;
210	<
211	<	if (rfname == NULL)
212	<	fp = stdin;
213	<	else if ((fp = fopen(rfname, "r")) == NULL)
214	<	syserr(rfname);
215	<	while (fgetline(buf, sizeof(buf), fp) != NULL) {
216	<	for (cp = buf; *cp; cp++) {
217	<	switch (*cp) {
218	<	case '\\':
219	<	case '\n':
220	<	*cp = ' ';
221	<	continue;
222	<	case '#':
223	<	*cp = '\0';
224	<	break;
225	<	default:
226	<	continue;
227	<	}
228	<	break;
229	<	}
230	<	setvariable(buf);
231	<	}
232	<	fclose(fp);
233	<	}
234	<
235	<
236	<	setvariable(ass) /* assign variable according to string */
237	<	register char *ass;
238	<	{
239	<	char varname[32];
240	<	register char *cp;
241	<	register VARIABLE *vp;
242	<	register int i;
243	<	int n;
244	<
245	<	while (isspace(ass)) / skip leading space */
246	<	ass++;
247	<	cp = varname; /* extract name */
248	<	while (cp < varname+sizeof(varname)-1
249	<	&& ass && !isspace(ass) && *ass != '=')
250	<	cp++ = ass++;
251	<	*cp = '\0';
252	<	if (!varname[0])
253	<	return; /* no variable name! */
254	<	/* trim value */
255	<	while (isspace(ass) \|\| ass == '=')
256	<	ass++;
257	<	cp = ass + strlen(ass);
258	<	do
259	<	*cp-- = '\0';
260	<	while (cp >= ass && isspace(*cp));
261	<	n = cp - ass + 1;
262	<	if (!n) {
263	<	fprintf(stderr, "%s: warning - missing value for variable '%s'\n",
264	<	progname, varname);
265	<	return;
266	<	}
267	<	/* match variable from list */
268	<	vp = matchvar(varname);
269	<	if (vp == NULL) {
270	<	fprintf(stderr, "%s: unknown variable '%s'\n",
271	<	progname, varname);
272	<	exit(1);
273	<	}
274	<	/* assign new value */
275	<	if (i = vp->nass) {
276	<	cp = vp->value;
277	<	while (i--)
278	<	while (*cp++)
279	<	;
280	<	i = cp - vp->value;
281	<	vp->value = realloc(vp->value, i+n+1);
282	<	} else
283	<	vp->value = malloc(n+1);
284	<	if (vp->value == NULL)
285	<	syserr(progname);
286	<	strcpy(vp->value+i, ass);
287	<	vp->nass++;
288	<	}
289	<
290	<
291	<	VARIABLE *
292	<	matchvar(nam) /* match a variable by its name */
293	<	char *nam;
294	<	{
295	<	int n = strlen(nam);
296	<	register int i;
297	<
298	<	for (i = 0; i < NVARS; i++)
299	<	if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n))
300	<	return(vv+i);
301	<	return(NULL);
302	<	}
303	<
304	<
305	<	char *
306	<	nvalue(vp, n) /* return nth variable value */
307	<	VARIABLE *vp;
308	<	register int n;
309	<	{
310	<	register char *cp;
311	<
312	<	if (vp == NULL \|\| n < 0 \|\| n >= vp->nass)
313	<	return(NULL);
314	<	cp = vp->value;
315	<	while (n--)
316	<	while (*cp++)
317	<	;
318	<	return(cp);
319	<	}
320	<
321	<
322	<	int
323	<	vscale(vc) /* return scale for variable vc */
324	<	int vc;
325	<	{
326	<	switch(vlet(vc)) {
327	<	case 'H':
328	<	return(HIGH);
329	<	case 'M':
330	<	return(MEDIUM);
331	<	case 'L':
332	<	return(LOW);
333	<	}
334	<	badvalue(vc);
335	<	}
336	<
337	<
338	<	checkvalues() /* check assignments */
339	<	{
340	<	register int i;
341	<
342	<	for (i = 0; i < NVARS; i++)
343	<	if (vv[i].fixval != NULL)
344	<	(*vv[i].fixval)(vv+i);
345	<	}
346	<
347	<
348	<	onevalue(vp) /* only one assignment for this variable */
349	<	register VARIABLE *vp;
350	<	{
351	<	if (vp->nass < 2)
352	<	return;
353	<	fprintf(stderr, "%s: warning - multiple assignment of variable '%s'\n",
354	<	progname, vp->name);
355	<	do
356	<	vp->value += strlen(vp->value)+1;
357	<	while (--vp->nass > 1);
358	<	}
359	<
360	<
361	<	catvalues(vp) /* concatenate variable values */
362	<	register VARIABLE *vp;
363	<	{
364	<	register char *cp;
365	<
366	<	if (vp->nass < 2)
367	<	return;
368	<	for (cp = vp->value; vp->nass > 1; vp->nass--) {
369	<	while (*cp)
370	<	cp++;
371	<	*cp++ = ' ';
372	<	}
373	<	}
374	<
375	<
376	<	long
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))
222		cp++ = fnames++;
223		*cp = '\0';
224	<	if ((thisdate = fdate(thisfile)) < 0)
224	>	if (!(thisdate = fdate(thisfile)))
225		syserr(thisfile);
226		if (thisdate > lastdate)
227		lastdate = thisdate;
#	Line 396 \| 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	<	char *cp;
402	<	long objdate;
261	>	time_t objdate;
262
263		if (!vdef(OCTREE)) {
264	<	if ((cp = bmalloc(strlen(radname)+5)) == NULL)
264	>	if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL)
265		syserr(progname);
266	<	sprintf(cp, "%s.oct", radname);
408	<	vval(OCTREE) = cp;
266	>	sprintf(vval(OCTREE), "%s.oct", radname);
267		vdef(OCTREE)++;
268		}
269		octreedate = fdate(vval(OCTREE));
270	<	scenedate = -1;
271	<	if (vdef(SCENE)) {
272	<	scenedate = checklast(vval(SCENE));
273	<	if (vdef(OBJECT)) {
274	<	objdate = checklast(vval(OBJECT));
275	<	if (objdate > scenedate)
276	<	scenedate = objdate;
277	<	}
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	<	if (octreedate < 0 & scenedate < 0) {
422	<	fprintf(stderr, "%s: need '%s' or '%s'\n", progname,
423	<	vnam(OCTREE), vnam(SCENE));
424	<	exit(1);
425	<	}
286	>	matdate = checklast(vval(MATERIAL));
287		}
288
289
#	Line 431 \| Line 292 \| *double org[3], sizp;**
292		{
293		extern FILE *popen();
294		static double oorg[3], osiz = 0.;
295	<	char buf[MAXPATH+16];
295	>	double min[3], max[3];
296	>	char buf[1024];
297		FILE *fp;
298	+	register int i;
299
300	<	if (osiz <= FTINY) {
301	<	oconv(); /* does nothing if done already */
302	<	sprintf(buf, "getinfo -d < %s", vval(OCTREE));
303	<	if ((fp = popen(buf, "r")) == NULL)
304	<	syserr("getinfo");
305	<	if (fscanf(fp, "%lf %lf %lf %lf", &oorg[0], &oorg[1],
306	<	&oorg[2], &osiz) != 4) {
307	<	fprintf(stderr,
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	>	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 { /* 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	<	exit(1);
331	>	progname);
332	>	quit(1);
333	>	}
334	>	pclose(fp);
335		}
449	–	pclose(fp);
450	–	}
336		org[0] = oorg[0]; org[1] = oorg[1]; org[2] = oorg[2]; *sizp = osiz;
337		}
338
#	Line 480 \| Line 365 \| *setdefaults() / set default values for unassigned v**
365		vval(PICTURE) = radname;
366		vdef(PICTURE)++;
367		}
368	<	if (!vdef(VIEW)) {
369	<	vval(VIEW) = "X";
370	<	vdef(VIEW)++;
368	>	if (!vdef(VIEWS)) {
369	>	vval(VIEWS) = "X";
370	>	vdef(VIEWS)++;
371		}
372		if (!vdef(DETAIL)) {
373		vval(DETAIL) = "M";
#	Line 499 \| 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 < vdef(i); j++)
394	<	printf("%s= %s\n", vnam(i), 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 */
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 (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	<	/* build command */
423	<	oconvopts(ocopts);
424	<	if (vdef(MATERIAL))
425	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
426	<	vval(MATERIAL), vval(SCENE), vval(OCTREE));
427	<	else
428	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
429	<	vval(SCENE), vval(OCTREE));
430	<
431	<	if (runcom(combuf)) { /* run it */
432	<	fprintf(stderr, "%s: error generating octree\n\t%s removed\n",
433	<	progname, vval(OCTREE));
434	<	unlink(vval(OCTREE));
435	<	exit(1);
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	<	octreedate = time(0);
483	>	oct1date = time((time_t *)NULL);
484	>	if (oct1date < oct0date) /* in case clock is off */
485	>	oct1date = oct0date;
486		}
487
488
#	Line 557 \| Line 508 \| *register char oo;**
508		}
509
510
511	+	mkillumopts(mo) /* get mkillum options */
512	+	register char *mo;
513	+	{
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	<	long afdate;
524	>	time_t afdate;
525
526	<	if (vdef(AMBFILE)) {
527	<	afdate = fdate(vval(AMBFILE));
528	<	if (afdate >= 0 & octreedate > afdate)
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));
568	–	}
535		}
536
537
#	Line 574 \| Line 540 \| *ambval() / compute ambient value /*
540		{
541		if (vdef(EXPOSURE)) {
542		if (vval(EXPOSURE)[0] == '+' \|\| vval(EXPOSURE)[0] == '-')
543	<	return(.5/pow(2.,atof(vval(EXPOSURE))));
544	<	if (isdigit(vval(EXPOSURE)[0]) \|\| vval(EXPOSURE)[0] == '.')
579	<	return(.5/atof(vval(EXPOSURE)));
580	<	badvalue(EXPOSURE);
543	>	return(.5/pow(2.,vflt(EXPOSURE)));
544	>	return(.5/vflt(EXPOSURE));
545		}
546		if (vlet(ZONE) == 'E')
547		return(10.);
#	Line 587 \| Line 551 \| *ambval() / compute ambient value /*
551		}
552
553
554	<	lowqopts(op) /* low quality rendering options */
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	<	op = addarg(op, "-ps 16 -dp 16");
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	<	op = addarg(op, "-ps 8 -dp 32");
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	<	op = addarg(op, "-ps 4 -dp 64");
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	<	op = addarg(op, "-pt .16");
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 .7");
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);
#	Line 629 \| Line 617 \| *register char op;**
617		overture = 0;
618		switch (vscale(VARIABILITY)) {
619		case LOW:
620	<	op = addarg(op, "-aa .4 -ad 32");
620	>	op = addarg(op, "-aa .4 -ad 64");
621		break;
622		case MEDIUM:
623	<	op = addarg(op, "-aa .3 -ad 64");
623	>	op = addarg(op, "-aa .3 -ad 128");
624		break;
625		case HIGH:
626	<	op = addarg(op, "-aa .25 -ad 128");
626	>	op = addarg(op, "-aa .25 -ad 256");
627		break;
628		}
629		op = addarg(op, "-as 0");
#	Line 648 \| Line 636 \| *register char op;**
636		}
637
638
639	<	medqopts(op) /* medium quality rendering options */
639	>	medqopts(op, po) /* medium quality rendering options */
640		register char *op;
641	+	char *po;
642		{
643	<	double d, org[3], siz[3];
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	<	d *= 3./(siz[0]+siz[1]+siz[2]);
654	>	asz = (siz[0]+siz[1]+siz[2])/3.;
655	>	d /= asz;
656		switch (vscale(DETAIL)) {
657		case LOW:
658	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
659	<	op = addarg(op, "-dp 64");
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	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
667	<	op = addarg(op, "-dp 128");
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	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
675	<	op = addarg(op, "-dp 256");
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	<	op = addarg(op, "-pt .08");
682	>	po = addarg(po, "-pt .08");
683		if (vbool(PENUMBRAS))
684	<	op = addarg(op, "-ds .2 -dj .35");
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 .15");
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);
#	Line 697 \| Line 696 \| *register char op;**
696		overture = 0;
697		switch (vscale(VARIABILITY)) {
698		case LOW:
699	<	op = addarg(op, "-aa .25 -ad 128 -as 0");
699	>	op = addarg(op, "-aa .25 -ad 196 -as 0");
700		break;
701		case MEDIUM:
702	<	op = addarg(op, "-aa .2 -ad 300 -as 64");
702	>	op = addarg(op, "-aa .2 -ad 400 -as 64");
703		break;
704		case HIGH:
705	<	op = addarg(op, "-aa .15 -ad 500 -as 128");
705	>	op = addarg(op, "-aa .15 -ad 768 -as 196");
706		break;
707		}
708		d = ambval();
#	Line 715 \| Line 714 \| *register char op;**
714		}
715
716
717	<	hiqopts(op) /* high quality rendering options */
717	>	hiqopts(op, po) /* high quality rendering options */
718		register char *op;
719	+	char *po;
720		{
721	<	double d, org[3], siz[3];
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	<	d *= 3./(siz[0]+siz[1]+siz[2]);
732	>	asz = (siz[0]+siz[1]+siz[2])/3.;
733	>	d /= asz;
734		switch (vscale(DETAIL)) {
735		case LOW:
736	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
737	<	op = addarg(op, "-dp 256");
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	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
745	<	op = addarg(op, "-dp 512");
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	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
753	<	op = addarg(op, "-dp 1024");
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	<	op = addarg(op, "-pt .04");
760	>	po = addarg(po, "-pt .04");
761		if (vbool(PENUMBRAS))
762	<	op = addarg(op, "-ds .1 -dj .7");
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 .03");
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)) {
#	Line 762 \| Line 772 \| *register char op;**
772		overture = 0;
773		switch (vscale(VARIABILITY)) {
774		case LOW:
775	<	op = addarg(op, "-aa .15 -ad 200 -as 0");
775	>	op = addarg(op, "-aa .15 -ad 256 -as 0");
776		break;
777		case MEDIUM:
778	<	op = addarg(op, "-aa .125 -ad 512 -as 128");
778	>	op = addarg(op, "-aa .125 -ad 512 -as 256");
779		break;
780		case HIGH:
781	<	op = addarg(op, "-aa .08 -ad 850 -as 256");
781	>	op = addarg(op, "-aa .08 -ad 1024 -as 512");
782		break;
783		}
784		d = ambval();
#	Line 784 \| 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)
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	<	if (write(fd, ro+1, n-1) != n-1)
795	<	syserr(vval(OPTFILE));
796	<	write(fd, "\n", 1);
797	<	close(fd);
798	<	sprintf(ro, " \"^%s\"", vval(OPTFILE));
813	>	sprintf(ro, " @%s", vval(OPTFILE));
814		}
815		#ifdef MSDOS
816		else if (n > 50) {
817	<	register char *evp = bmalloc(n+6);
803	<	if (evp == NULL)
804	<	syserr(progname);
805	<	strcpy(evp, "ROPT=");
806	<	strcat(evp, ro);
807	<	if (putenv(evp) != 0) {
808	<	fprintf(stderr, "%s: out of environment space\n",
809	<	progname);
810	<	exit(1);
811	<	}
817	>	setenv("ROPT", ro+1);
818		strcpy(ro, " $ROPT");
819		}
820		#endif
#	Line 823 \| 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 885 \| Line 897 \| *register char vs;**
897		zpos = -1; vs++;
898		}
899		viewtype = 'v';
900	<	if (vs == 'v' \| vs == 'l' \| vs == 'a' \| vs == 'h')
900	>	if (vs == 'v' \| vs == 'l' \| vs == 'a' \| vs == 'h' \| *vs == 'c')
901		viewtype = *vs++;
902		cp = viewopts;
903		if ((!vs \|\| isspace(vs)) && (xpos\|ypos\|zpos)) { /* got one! */
#	Line 896 \| Line 908 \| *register char vs;**
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		mult = vlet(ZONE)=='E' ? 2. : .45 ;
#	Line 938 \| 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 (!isspace(vs)) / else skip id */
#	Line 948 \| Line 965 \| *register char vs;**
965		cp += strlen(cp);
966		}
967		}
968	<	/* append any additional options */
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 957 \| 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 974 \| 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));
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[1024];
1078	<	char rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
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 1047 \| Line 1124 \| *char opts;**
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",
1060	<	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), overfile);
1161	>	oct1name, overfile);
1162		if (runcom(combuf)) {
1163		fprintf(stderr,
1164		"%s: error in overture for view %s\n",
1165		progname, vs);
1166	<	exit(1);
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 (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 (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	<	exit(1);
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	<	/* remove raw file */
1198	<	rmfile(rawfile);
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		{
#	Line 1130 \| Line 1247 \| *char 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	<	exit(1);
1290	>	quit(1);
1291		}
1292
1293
#	Line 1143 \| Line 1295 \| *syserr(s) / report a system error and exit /*
1295		char *s;
1296		{
1297		perror(s);
1298	<	exit(1);
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

Comparing ray/src/util/rad.c (file contents): Revision 2.7 by greg, Tue Apr 6 17:21:04 1993 UTC vs. Revision 2.55 by gregl, Fri Jan 23 17:17:32 1998 UTC

Diff Legend

Comparing ray/src/util/rad.c (file contents):
Revision 2.7 by greg, Tue Apr 6 17:21:04 1993 UTC vs.
Revision 2.55 by gregl, Fri Jan 23 17:17:32 1998 UTC