[ViewVC] Diff of: radiance/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.43 by greg, Thu Jul 6 12:15:40 1995 UTC

#	Line 1 \| Line 1
1	<	/* Copyright (c) 1993 Regents of the University of California */
1	>	/* Copyright (c) 1994 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 11 \| Line 11 \| static char SCCSid[] = "$SunId$ LBL";
11		#include "standard.h"
12		#include "paths.h"
13		#include <ctype.h>
14	+	#include <sys/types.h>
15
16
17		typedef struct {
#	Line 21 \| Line 22 \| typedef struct {
22		int (fixval)(); / assignment checking function */
23		} VARIABLE;
24
25	<	int onevalue(), catvalues();
25	>	int onevalue(), catvalues(), boolvalue(),
26	>	qualvalue(), fltvalue(), intvalue();
27
28		/* variables */
29		#define OBJECT 0 /* object files */
30		#define SCENE 1 /* scene files */
31		#define MATERIAL 2 /* material files */
32	<	#define RENDER 3 /* rendering options */
33	<	#define OCONV 4 /* oconv options */
34	<	#define PFILT 5 /* pfilt options */
35	<	#define VIEW 6 /* view(s) for picture(s) */
36	<	#define ZONE 7 /* simulation zone */
37	<	#define QUALITY 8 /* desired rendering quality */
38	<	#define OCTREE 9 /* octree file name */
39	<	#define PICTURE 10 /* picture file name */
40	<	#define AMBFILE 11 /* ambient file name */
41	<	#define OPTFILE 12 /* rendering options file */
42	<	#define EXPOSURE 13 /* picture exposure setting */
43	<	#define RESOLUTION 14 /* maximum picture resolution */
44	<	#define UP 15 /* view up (X, Y or Z) */
45	<	#define INDIRECT 16 /* indirection in lighting */
46	<	#define DETAIL 17 /* level of scene detail */
47	<	#define PENUMBRAS 18 /* shadow penumbras are desired */
48	<	#define VARIABILITY 19 /* level of light variability */
49	<	#define REPORT 20 /* report frequency and errfile */
32	>	#define ILLUM 3 /* mkillum input files */
33	>	#define MKILLUM 4 /* mkillum options */
34	>	#define RENDER 5 /* rendering options */
35	>	#define OCONV 6 /* oconv options */
36	>	#define PFILT 7 /* pfilt options */
37	>	#define VIEW 8 /* view(s) for picture(s) */
38	>	#define ZONE 9 /* simulation zone */
39	>	#define QUALITY 10 /* desired rendering quality */
40	>	#define OCTREE 11 /* octree file name */
41	>	#define PICTURE 12 /* picture file name */
42	>	#define AMBFILE 13 /* ambient file name */
43	>	#define OPTFILE 14 /* rendering options file */
44	>	#define EXPOSURE 15 /* picture exposure setting */
45	>	#define RESOLUTION 16 /* maximum picture resolution */
46	>	#define UP 17 /* view up (X, Y or Z) */
47	>	#define INDIRECT 18 /* indirection in lighting */
48	>	#define DETAIL 19 /* level of scene detail */
49	>	#define PENUMBRAS 20 /* shadow penumbras are desired */
50	>	#define VARIABILITY 21 /* level of light variability */
51	>	#define REPORT 22 /* report frequency and errfile */
52	>	#define RAWSAVE 23 /* save raw picture file */
53		/* total number of variables */
54	<	#define NVARS 21
54	>	#define NVARS 24
55
56		VARIABLE vv[NVARS] = { /* variable-value pairs */
57		{"objects", 3, 0, NULL, catvalues},
58		{"scene", 3, 0, NULL, catvalues},
59		{"materials", 3, 0, NULL, catvalues},
60	+	{"illum", 3, 0, NULL, catvalues},
61	+	{"mkillum", 3, 0, NULL, catvalues},
62		{"render", 3, 0, NULL, catvalues},
63		{"oconv", 3, 0, NULL, catvalues},
64		{"pfilt", 2, 0, NULL, catvalues},
65		{"view", 2, 0, NULL, NULL},
66		{"ZONE", 2, 0, NULL, onevalue},
67	<	{"QUALITY", 3, 0, NULL, onevalue},
67	>	{"QUALITY", 3, 0, NULL, qualvalue},
68		{"OCTREE", 3, 0, NULL, onevalue},
69		{"PICTURE", 3, 0, NULL, onevalue},
70		{"AMBFILE", 3, 0, NULL, onevalue},
71		{"OPTFILE", 3, 0, NULL, onevalue},
72	<	{"EXPOSURE", 3, 0, NULL, onevalue},
72	>	{"EXPOSURE", 3, 0, NULL, fltvalue},
73		{"RESOLUTION", 3, 0, NULL, onevalue},
74		{"UP", 2, 0, NULL, onevalue},
75	<	{"INDIRECT", 3, 0, NULL, onevalue},
76	<	{"DETAIL", 3, 0, NULL, onevalue},
77	<	{"PENUMBRAS", 3, 0, NULL, onevalue},
78	<	{"VARIABILITY", 3, 0, NULL, onevalue},
75	>	{"INDIRECT", 3, 0, NULL, intvalue},
76	>	{"DETAIL", 3, 0, NULL, qualvalue},
77	>	{"PENUMBRAS", 3, 0, NULL, boolvalue},
78	>	{"VARIABILITY", 3, 0, NULL, qualvalue},
79		{"REPORT", 3, 0, NULL, onevalue},
80	+	{"RAWSAVE", 3, 0, NULL, boolvalue},
81		};
82
83		VARIABLE *matchvar();
84		char *nvalue();
77	–	int vscale();
85
86		#define UPPER(c) ((c)&~0x20) /* ASCII trick */
87
#	Line 83 \| Line 90 \| int vscale();
90		#define vval(vc) (vv[vc].value)
91		#define vint(vc) atoi(vval(vc))
92		#define vlet(vc) UPPER(vval(vc)[0])
93	+	#define vscale vlet
94		#define vbool(vc) (vlet(vc)=='T')
95
96	<	#define HIGH 2
97	<	#define MEDIUM 1
98	<	#define LOW 0
96	>	#define HIGH 'H'
97	>	#define MEDIUM 'M'
98	>	#define LOW 'L'
99
100	<	int lowqopts(), medqopts(), hiqopts();
101	<	int (*setqopts[3])() = {lowqopts, medqopts, hiqopts};
100	>	/* overture calculation file */
101	>	#ifdef NIX
102	>	char overfile[] = "overture.raw";
103	>	#else
104	>	char overfile[] = "/dev/null";
105	>	#endif
106
107	<	#define renderopts (*setqopts[vscale(QUALITY)])
107	>	extern time_t fdate(), time();
108
109	<	extern long fdate(), time();
109	>	time_t scenedate; /* date of latest scene or object file */
110	>	time_t octreedate; /* date of octree */
111	>	time_t matdate; /* date of latest material file */
112	>	time_t illumdate; /* date of last illum file */
113
114	<	long scenedate; /* date of latest scene or object file */
115	<	long octreedate; /* date of octree */
114	>	char oct0name; / name of pre-mkillum octree */
115	>	time_t oct0date; /* date of pre-mkillum octree */
116	>	char oct1name; / name of post-mkillum octree */
117	>	time_t oct1date; /* date of post-mkillum octree (>= matdate) */
118
119	+	int nowarn = 0; /* no warnings */
120		int explicate = 0; /* explicate variables */
121		int silent = 0; /* do work silently */
122	+	int touchonly = 0; /* touch files only */
123		int noaction = 0; /* don't do anything */
124	+	int sayview = 0; /* print view out */
125		char rvdevice = NULL; / rview output device */
126		char viewselect = NULL; / specific view only */
127
128		int overture = 0; /* overture calculation needed */
129
130		char progname; / global argv[0] */
131	+	char rifname; / global rad input file name */
132
133		char radname[MAXPATH]; /* root Radiance file name */
134
#	Line 117 \| Line 138 \| int argc;
138		char *argv[];
139		{
140		char ropts[512];
141	+	char popts[64];
142		int i;
143
144		progname = argv[0];
#	Line 129 \| Line 151 \| *char argv[];**
151		case 'n':
152		noaction++;
153		break;
154	+	case 't':
155	+	touchonly++;
156	+	break;
157		case 'e':
158		explicate++;
159		break;
160		case 'o':
161		rvdevice = argv[++i];
162		break;
163	+	case 'V':
164	+	sayview++;
165	+	break;
166		case 'v':
167		viewselect = argv[++i];
168		break;
169	+	case 'w':
170	+	nowarn++;
171	+	break;
172		default:
173		goto userr;
174		}
175		if (i >= argc)
176		goto userr;
177	+	rifname = argv[i];
178		/* assign Radiance root file name */
179	<	rootname(radname, argv[i]);
179	>	rootname(radname, rifname);
180		/* load variable values */
181	<	load(argv[i]);
181	>	load(rifname);
182		/* get any additional assignments */
183		for (i++; i < argc; i++)
184		setvariable(argv[i]);
#	Line 159 \| Line 191 \| *char argv[];**
191		/* print all values if requested */
192		if (explicate)
193		printvals();
194	<	/* run simulation */
194	>	/* build octree (and run mkillum) */
195		oconv();
196	<	renderopts(ropts);
196	>	/* check date on ambient file */
197	>	checkambfile();
198	>	/* run simulation */
199	>	renderopts(ropts, popts);
200		xferopts(ropts);
201		if (rvdevice != NULL)
202	<	rview(ropts);
202	>	rview(ropts, popts);
203		else
204	<	rpict(ropts);
204	>	rpict(ropts, popts);
205		exit(0);
206		userr:
207		fprintf(stderr,
208	<	"Usage: %s [-s][-n][-e][-v view][-o dev] rfile [VAR=value ..]\n",
208	>	"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
209		progname);
210		exit(1);
211		}
#	Line 191 \| Line 226 \| *register char rn, fn;*
226		}
227
228
229	+	#define NOCHAR 127 /* constant for character to delete */
230	+
231	+
232		load(rfname) /* load Radiance simulation file */
233		char *rfname;
234		{
#	Line 206 \| Line 244 \| *char rfname;**
244		for (cp = buf; *cp; cp++) {
245		switch (*cp) {
246		case '\\':
247	<	case '\n':
210	<	*cp = ' ';
247	>	*cp++ = NOCHAR;
248		continue;
249		case '#':
250		*cp = '\0';
#	Line 227 \| Line 264 \| *setvariable(ass) / assign variable according to stri**
264		register char *ass;
265		{
266		char varname[32];
267	+	int n;
268		register char *cp;
269		register VARIABLE *vp;
270		register int i;
233	–	int n;
271
272		while (isspace(ass)) / skip leading space */
273		ass++;
#	Line 244 \| Line 281 \| *register char ass;**
281		/* trim value */
282		while (isspace(ass) \|\| ass == '=')
283		ass++;
284	<	cp = ass + strlen(ass);
285	<	do
286	<	*cp-- = '\0';
287	<	while (cp >= ass && isspace(*cp));
251	<	n = cp - ass + 1;
252	<	if (!n) {
284	>	for (n = strlen(ass); n > 0; n--)
285	>	if (!isspace(ass[n-1]))
286	>	break;
287	>	if (!n && !nowarn) {
288		fprintf(stderr, "%s: warning - missing value for variable '%s'\n",
289		progname, varname);
290		return;
#	Line 273 \| Line 308 \| *register char ass;**
308		vp->value = malloc(n+1);
309		if (vp->value == NULL)
310		syserr(progname);
311	<	strcpy(vp->value+i, ass);
311	>	cp = vp->value+i; /* copy value, squeezing spaces */
312	>	cp = ass;
313	>	for (i = 1; i <= n; i++) {
314	>	if (ass[i] == NOCHAR)
315	>	continue;
316	>	if (isspace(*cp))
317	>	while (isspace(ass[i]))
318	>	i++;
319	>	*++cp = ass[i];
320	>	}
321	>	if (isspace(cp)) / remove trailing space */
322	>	*cp = '\0';
323		vp->nass++;
324		}
325
#	Line 299 \| Line 345 \| register int n;
345		{
346		register char *cp;
347
348	<	if (vp == NULL \|\| n < 0 \|\| n >= vp->nass)
348	>	if (vp == NULL \| n < 0 \| n >= vp->nass)
349		return(NULL);
350		cp = vp->value;
351		while (n--)
#	Line 309 \| Line 355 \| register int n;
355		}
356
357
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	–
358		checkvalues() /* check assignments */
359		{
360		register int i;
#	Line 340 \| Line 370 \| *register VARIABLE vp;**
370		{
371		if (vp->nass < 2)
372		return;
373	<	fprintf(stderr, "%s: warning - multiple assignment of variable '%s'\n",
373	>	if (!nowarn)
374	>	fprintf(stderr,
375	>	"%s: warning - multiple assignment of variable '%s'\n",
376		progname, vp->name);
377		do
378		vp->value += strlen(vp->value)+1;
#	Line 363 \| Line 395 \| *register VARIABLE vp;**
395		}
396
397
398	<	long
398	>	int
399	>	badmatch(tv, cv) /* case insensitive truncated comparison */
400	>	register char tv, cv;
401	>	{
402	>	if (!tv) return(1); / null string cannot match */
403	>	do
404	>	if (UPPER(tv) != cv++)
405	>	return(1);
406	>	while (*++tv);
407	>	return(0); /* OK */
408	>	}
409	>
410	>
411	>	boolvalue(vp) /* check boolean for legal values */
412	>	register VARIABLE *vp;
413	>	{
414	>	if (!vp->nass) return;
415	>	onevalue(vp);
416	>	switch (UPPER(vp->value[0])) {
417	>	case 'T':
418	>	if (badmatch(vp->value, "TRUE")) break;
419	>	return;
420	>	case 'F':
421	>	if (badmatch(vp->value, "FALSE")) break;
422	>	return;
423	>	}
424	>	fprintf(stderr, "%s: illegal value for boolean variable '%s'\n",
425	>	progname, vp->name);
426	>	exit(1);
427	>	}
428	>
429	>
430	>	qualvalue(vp) /* check qualitative var. for legal values */
431	>	register VARIABLE *vp;
432	>	{
433	>	if (!vp->nass) return;
434	>	onevalue(vp);
435	>	switch (UPPER(vp->value[0])) {
436	>	case 'L':
437	>	if (badmatch(vp->value, "LOW")) break;
438	>	return;
439	>	case 'M':
440	>	if (badmatch(vp->value, "MEDIUM")) break;
441	>	return;
442	>	case 'H':
443	>	if (badmatch(vp->value, "HIGH")) break;
444	>	return;
445	>	}
446	>	fprintf(stderr, "%s: illegal value for qualitative variable '%s'\n",
447	>	progname, vp->name);
448	>	exit(1);
449	>	}
450	>
451	>
452	>	intvalue(vp) /* check integer variable for legal values */
453	>	register VARIABLE *vp;
454	>	{
455	>	if (!vp->nass) return;
456	>	onevalue(vp);
457	>	if (isint(vp->value)) return;
458	>	fprintf(stderr, "%s: illegal value for integer variable '%s'\n",
459	>	progname, vp->name);
460	>	exit(1);
461	>	}
462	>
463	>
464	>	fltvalue(vp) /* check float variable for legal values */
465	>	register VARIABLE *vp;
466	>	{
467	>	if (!vp->nass) return;
468	>	onevalue(vp);
469	>	if (isflt(vp->value)) return;
470	>	fprintf(stderr, "%s: illegal value for real variable '%s'\n",
471	>	progname, vp->name);
472	>	exit(1);
473	>	}
474	>
475	>
476	>	time_t
477		checklast(fnames) /* check files and find most recent */
478		register char *fnames;
479		{
480		char thisfile[MAXPATH];
481	<	long thisdate, lastdate = -1;
481	>	time_t thisdate, lastdate = 0;
482		register char *cp;
483
484	+	if (fnames == NULL)
485	+	return(0);
486		while (*fnames) {
487		while (isspace(*fnames)) fnames++;
488		cp = thisfile;
489		while (fnames && !isspace(fnames))
490		cp++ = fnames++;
491		*cp = '\0';
492	<	if ((thisdate = fdate(thisfile)) < 0)
492	>	if (!(thisdate = fdate(thisfile)))
493		syserr(thisfile);
494		if (thisdate > lastdate)
495		lastdate = thisdate;
#	Line 386 \| Line 498 \| *register char fnames;**
498		}
499
500
501	+	char *
502	+	newfname(orig, pred) /* create modified file name */
503	+	char *orig;
504	+	int pred;
505	+	{
506	+	extern char *rindex();
507	+	register char *cp;
508	+	register int n;
509	+	int suffix;
510	+
511	+	n = 0; cp = orig; suffix = -1; /* suffix position, length */
512	+	while (*cp) {
513	+	if (*cp == '.') suffix = n;
514	+	else if (ISDIRSEP(*cp)) suffix = -1;
515	+	cp++; n++;
516	+	}
517	+	if (suffix == -1) suffix = n;
518	+	if ((cp = bmalloc(n+2)) == NULL)
519	+	syserr(progname);
520	+	strncpy(cp, orig, suffix);
521	+	cp[suffix] = pred; /* root name + pred + suffix */
522	+	strcpy(cp+suffix+1, orig+suffix);
523	+	return(cp);
524	+	}
525	+
526	+
527		checkfiles() /* check for existence and modified times */
528		{
529	<	char *cp;
392	<	long objdate;
529	>	time_t objdate;
530
531		if (!vdef(OCTREE)) {
532	<	if ((cp = bmalloc(strlen(radname)+5)) == NULL)
532	>	if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL)
533		syserr(progname);
534	<	sprintf(cp, "%s.oct", radname);
398	<	vval(OCTREE) = cp;
534	>	sprintf(vval(OCTREE), "%s.oct", radname);
535		vdef(OCTREE)++;
536		}
537		octreedate = fdate(vval(OCTREE));
538	<	scenedate = -1;
539	<	if (vdef(SCENE)) {
540	<	scenedate = checklast(vval(SCENE));
541	<	if (vdef(OBJECT)) {
542	<	objdate = checklast(vval(OBJECT));
543	<	if (objdate > scenedate)
544	<	scenedate = objdate;
545	<	}
546	<	}
547	<	if (octreedate < 0 & scenedate < 0) {
548	<	fprintf(stderr, "%s: need '%s' or '%s'\n", progname,
549	<	vnam(OCTREE), vnam(SCENE));
538	>	if (vdef(ILLUM)) { /* illum requires secondary octrees */
539	>	oct0name = newfname(vval(OCTREE), '0');
540	>	oct1name = newfname(vval(OCTREE), '1');
541	>	oct0date = fdate(oct0name);
542	>	oct1date = fdate(oct1name);
543	>	} else
544	>	oct0name = oct1name = vval(OCTREE);
545	>	if ((scenedate = checklast(vval(SCENE))) &&
546	>	(objdate = checklast(vval(OBJECT))) > scenedate)
547	>	scenedate = objdate;
548	>	illumdate = checklast(vval(ILLUM));
549	>	if (!octreedate & !scenedate & !illumdate) {
550	>	fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname,
551	>	vnam(OCTREE), vnam(SCENE), vnam(ILLUM));
552		exit(1);
553		}
554	+	matdate = checklast(vval(MATERIAL));
555		}
556
557
#	Line 421 \| Line 560 \| *double org[3], sizp;**
560		{
561		extern FILE *popen();
562		static double oorg[3], osiz = 0.;
563	<	char buf[MAXPATH+16];
563	>	double min[3], max[3];
564	>	char buf[512];
565		FILE *fp;
566	+	register int i;
567
568	<	if (osiz <= FTINY) {
569	<	oconv(); /* does nothing if done already */
570	<	sprintf(buf, "getinfo -d < %s", vval(OCTREE));
571	<	if ((fp = popen(buf, "r")) == NULL)
572	<	syserr("getinfo");
573	<	if (fscanf(fp, "%lf %lf %lf %lf", &oorg[0], &oorg[1],
574	<	&oorg[2], &osiz) != 4) {
575	<	fprintf(stderr,
568	>	if (osiz <= FTINY)
569	>	if (noaction && fdate(oct1name) <
570	>	(scenedate>illumdate?scenedate:illumdate)) {
571	>	/* run getbbox */
572	>	sprintf(buf, "getbbox -w -h %s",
573	>	vdef(SCENE) ? vval(SCENE) : vval(ILLUM));
574	>	if ((fp = popen(buf, "r")) == NULL)
575	>	syserr("getbbox");
576	>	if (fscanf(fp, "%lf %lf %lf %lf %lf %lf",
577	>	&min[0], &max[0], &min[1], &max[1],
578	>	&min[2], &max[2]) != 6) {
579	>	fprintf(stderr,
580	>	"%s: error reading bounding box from getbbox\n",
581	>	progname);
582	>	exit(1);
583	>	}
584	>	for (i = 0; i < 3; i++)
585	>	if (max[i] - min[i] > osiz)
586	>	osiz = max[i] - min[i];
587	>	for (i = 0; i < 3; i++)
588	>	oorg[i] = (max[i]+min[i]-osiz)*.5;
589	>	pclose(fp);
590	>	} else { /* from octree */
591	>	oconv(); /* does nothing if done already */
592	>	sprintf(buf, "getinfo -d < %s", oct1name);
593	>	if ((fp = popen(buf, "r")) == NULL)
594	>	syserr("getinfo");
595	>	if (fscanf(fp, "%lf %lf %lf %lf", &oorg[0], &oorg[1],
596	>	&oorg[2], &osiz) != 4) {
597	>	fprintf(stderr,
598		"%s: error reading bounding cube from getinfo\n",
599	<	progname);
600	<	exit(1);
599	>	progname);
600	>	exit(1);
601	>	}
602	>	pclose(fp);
603		}
439	–	pclose(fp);
440	–	}
604		org[0] = oorg[0]; org[1] = oorg[1]; org[2] = oorg[2]; *sizp = osiz;
605		}
606
#	Line 486 \| Line 649 \| *setdefaults() / set default values for unassigned v**
649		vval(VARIABILITY) = "L";
650		vdef(VARIABILITY)++;
651		}
652	+	if (!vdef(RAWSAVE)) {
653	+	vval(RAWSAVE) = "F";
654	+	vdef(RAWSAVE)++;
655	+	}
656		}
657
658
659		printvals() /* print variable values */
660		{
661	<	register int i, j;
661	>	int i, j, clipline;
662	>	register char *cp;
663	>	register int k;
664
665	<	for (i = 0; i < NVARS; i++)
666	<	for (j = 0; j < vdef(i); j++)
667	<	printf("%s= %s\n", vnam(i), nvalue(vv+i, j));
665	>	for (i = 0; i < NVARS; i++) /* print each variable */
666	>	for (j = 0; j < vdef(i); j++) { /* print each assignment */
667	>	fputs(vnam(i), stdout);
668	>	fputs("= ", stdout);
669	>	k = clipline = ( vv[i].fixval == catvalues ? 64 : 320 )
670	>	- strlen(vnam(i)) ;
671	>	cp = nvalue(vv+i, j);
672	>	while (*cp) {
673	>	putchar(*cp++);
674	>	if (--k <= 0) { /* line too long */
675	>	while (cp && !isspace(cp))
676	>	putchar(cp++); / finish this word */
677	>	if (cp) { / start new line */
678	>	putchar('\n');
679	>	fputs(vnam(i), stdout);
680	>	putchar('=');
681	>	k = clipline;
682	>	}
683	>	}
684	>	}
685	>	putchar('\n');
686	>	}
687		fflush(stdout);
688		}
689
690
691	<	oconv() /* run oconv if necessary */
691	>	oconv() /* run oconv and mkillum if necessary */
692		{
693	<	char combuf[512], ocopts[64];
693	>	static char illumtmp[] = "ilXXXXXX";
694	>	char combuf[512], ocopts[64], mkopts[64];
695
696	<	if (octreedate >= scenedate) /* check dates */
696	>	oconvopts(ocopts); /* get options */
697	>	if (octreedate < scenedate) { /* check date on original octree */
698	>	if (touchonly && octreedate)
699	>	touch(vval(OCTREE));
700	>	else { /* build command */
701	>	if (vdef(MATERIAL))
702	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
703	>	vval(MATERIAL), vval(SCENE),
704	>	vval(OCTREE));
705	>	else
706	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
707	>	vval(SCENE), vval(OCTREE));
708	>
709	>	if (runcom(combuf)) { /* run it */
710	>	fprintf(stderr,
711	>	"%s: error generating octree\n\t%s removed\n",
712	>	progname, vval(OCTREE));
713	>	unlink(vval(OCTREE));
714	>	exit(1);
715	>	}
716	>	}
717	>	octreedate = time((time_t *)NULL);
718	>	if (octreedate < scenedate) /* in case clock is off */
719	>	octreedate = scenedate;
720	>	}
721	>	if (oct1name == vval(OCTREE)) /* no mkillum? */
722	>	oct1date = octreedate > matdate ? octreedate : matdate;
723	>	if (oct1date >= octreedate & oct1date >= matdate
724	>	& oct1date >= illumdate) /* all done */
725		return;
726	<	/* build command */
727	<	oconvopts(ocopts);
728	<	if (vdef(MATERIAL))
729	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
730	<	vval(MATERIAL), vval(SCENE), vval(OCTREE));
731	<	else
732	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
733	<	vval(SCENE), vval(OCTREE));
734	<
735	<	if (runcom(combuf)) { /* run it */
736	<	fprintf(stderr, "%s: error generating octree\n\t%s removed\n",
737	<	progname, vval(OCTREE));
738	<	unlink(vval(OCTREE));
739	<	exit(1);
726	>	/* make octree0 */
727	>	if (oct0date < scenedate \| oct0date < illumdate) {
728	>	if (touchonly && oct0date)
729	>	touch(oct0name);
730	>	else { /* build command */
731	>	if (octreedate)
732	>	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
733	>	vval(OCTREE), vval(ILLUM), oct0name);
734	>	else if (vdef(MATERIAL))
735	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
736	>	vval(MATERIAL), vval(ILLUM), oct0name);
737	>	else
738	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
739	>	vval(ILLUM), oct0name);
740	>	if (runcom(combuf)) { /* run it */
741	>	fprintf(stderr,
742	>	"%s: error generating octree\n\t%s removed\n",
743	>	progname, oct0name);
744	>	unlink(oct0name);
745	>	exit(1);
746	>	}
747	>	}
748	>	oct0date = time((time_t *)NULL);
749	>	if (oct0date < octreedate) /* in case clock is off */
750	>	oct0date = octreedate;
751	>	if (oct0date < illumdate) /* ditto */
752	>	oct0date = illumdate;
753	>	}
754	>	if (touchonly && oct1date)
755	>	touch(oct1name);
756	>	else {
757	>	mkillumopts(mkopts); /* build mkillum command */
758	>	mktemp(illumtmp);
759	>	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
760	>	oct0name, vval(ILLUM), illumtmp);
761	>	if (runcom(combuf)) { /* run it */
762	>	fprintf(stderr, "%s: error running mkillum\n",
763	>	progname);
764	>	unlink(illumtmp);
765	>	exit(1);
766	>	}
767	>	/* make octree1 (frozen) */
768	>	if (octreedate)
769	>	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
770	>	vval(OCTREE), illumtmp, oct1name);
771	>	else if (vdef(MATERIAL))
772	>	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
773	>	vval(MATERIAL), illumtmp, oct1name);
774	>	else
775	>	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
776	>	illumtmp, oct1name);
777	>	if (runcom(combuf)) { /* run it */
778	>	fprintf(stderr,
779	>	"%s: error generating octree\n\t%s removed\n",
780	>	progname, oct1name);
781	>	unlink(oct1name);
782	>	exit(1);
783	>	}
784	>	rmfile(illumtmp);
785		}
786	<	octreedate = time(0);
786	>	oct1date = time((time_t *)NULL);
787	>	if (oct1date < oct0date) /* in case clock is off */
788	>	oct1date = oct0date;
789		}
790
791
#	Line 547 \| Line 811 \| *register char oo;**
811		}
812
813
814	+	mkillumopts(mo) /* get mkillum options */
815	+	register char *mo;
816	+	{
817	+	/* BEWARE: This may be called via setdefaults(), so no assumptions */
818	+
819	+	*mo = '\0';
820	+	if (vdef(MKILLUM))
821	+	addarg(mo, vval(MKILLUM));
822	+	}
823	+
824	+
825	+	checkambfile() /* check date on ambient file */
826	+	{
827	+	time_t afdate;
828	+
829	+	if (!vdef(AMBFILE))
830	+	return;
831	+	if (!(afdate = fdate(vval(AMBFILE))))
832	+	return;
833	+	if (oct1date > afdate)
834	+	if (touchonly)
835	+	touch(vval(AMBFILE));
836	+	else
837	+	rmfile(vval(AMBFILE));
838	+	}
839	+
840	+
841		double
842		ambval() /* compute ambient value */
843		{
844		if (vdef(EXPOSURE)) {
845		if (vval(EXPOSURE)[0] == '+' \|\| vval(EXPOSURE)[0] == '-')
846		return(.5/pow(2.,atof(vval(EXPOSURE))));
847	<	if (isdigit(vval(EXPOSURE)[0]) \|\| vval(EXPOSURE)[0] == '.')
557	<	return(.5/atof(vval(EXPOSURE)));
558	<	badvalue(EXPOSURE);
847	>	return(.5/atof(vval(EXPOSURE)));
848		}
849		if (vlet(ZONE) == 'E')
850		return(10.);
#	Line 565 \| Line 854 \| *ambval() / compute ambient value /*
854		}
855
856
857	<	lowqopts(op) /* low quality rendering options */
857	>	renderopts(op, po) /* set rendering options */
858	>	char op, po;
859	>	{
860	>	switch(vscale(QUALITY)) {
861	>	case LOW:
862	>	lowqopts(op, po);
863	>	break;
864	>	case MEDIUM:
865	>	medqopts(op, po);
866	>	break;
867	>	case HIGH:
868	>	hiqopts(op, po);
869	>	break;
870	>	}
871	>	}
872	>
873	>
874	>	lowqopts(op, po) /* low quality rendering options */
875		register char *op;
876	+	char *po;
877		{
878		double d, org[3], siz[3];
879
880		*op = '\0';
881	+	*po = '\0';
882		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
883		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
884		badvalue(ZONE);
885		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
886	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
887	+	badvalue(ZONE);
888		getoctcube(org, &d);
889		d *= 3./(siz[0]+siz[1]+siz[2]);
890		switch (vscale(DETAIL)) {
891		case LOW:
892	<	op = addarg(op, "-ps 16 -dp 16");
892	>	po = addarg(po, "-ps 16");
893	>	op = addarg(op, "-dp 64");
894		sprintf(op, " -ar %d", (int)(4*d));
895		op += strlen(op);
896		break;
897		case MEDIUM:
898	<	op = addarg(op, "-ps 8 -dp 32");
898	>	po = addarg(po, "-ps 8");
899	>	op = addarg(op, "-dp 128");
900		sprintf(op, " -ar %d", (int)(8*d));
901		op += strlen(op);
902		break;
903		case HIGH:
904	<	op = addarg(op, "-ps 4 -dp 64");
904	>	po = addarg(po, "-ps 4");
905	>	op = addarg(op, "-dp 256");
906		sprintf(op, " -ar %d", (int)(16*d));
907		op += strlen(op);
908		break;
909		}
910	<	op = addarg(op, "-pt .16");
910	>	po = addarg(po, "-pt .16");
911		if (vbool(PENUMBRAS))
912		op = addarg(op, "-ds .4");
913		else
914		op = addarg(op, "-ds 0");
915	<	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .7");
915	>	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5");
916		if (vdef(AMBFILE)) {
917		sprintf(op, " -af %s", vval(AMBFILE));
918		op += strlen(op);
#	Line 607 \| Line 920 \| *register char op;**
920		overture = 0;
921		switch (vscale(VARIABILITY)) {
922		case LOW:
923	<	op = addarg(op, "-aa .4 -ad 32");
923	>	op = addarg(op, "-aa .4 -ad 64");
924		break;
925		case MEDIUM:
926	<	op = addarg(op, "-aa .3 -ad 64");
926	>	op = addarg(op, "-aa .3 -ad 128");
927		break;
928		case HIGH:
929	<	op = addarg(op, "-aa .25 -ad 128");
929	>	op = addarg(op, "-aa .25 -ad 256");
930		break;
931		}
932		op = addarg(op, "-as 0");
#	Line 626 \| Line 939 \| *register char op;**
939		}
940
941
942	<	medqopts(op) /* medium quality rendering options */
942	>	medqopts(op, po) /* medium quality rendering options */
943		register char *op;
944	+	char *po;
945		{
946		double d, org[3], siz[3];
947
948		*op = '\0';
949	+	*po = '\0';
950		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
951		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
952		badvalue(ZONE);
953		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
954	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
955	+	badvalue(ZONE);
956		getoctcube(org, &d);
957		d *= 3./(siz[0]+siz[1]+siz[2]);
958		switch (vscale(DETAIL)) {
959		case LOW:
960	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
961	<	op = addarg(op, "-dp 64");
960	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
961	>	op = addarg(op, "-dp 256");
962		sprintf(op, " -ar %d", (int)(8*d));
963		op += strlen(op);
964		break;
965		case MEDIUM:
966	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
967	<	op = addarg(op, "-dp 128");
966	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
967	>	op = addarg(op, "-dp 512");
968		sprintf(op, " -ar %d", (int)(16*d));
969		op += strlen(op);
970		break;
971		case HIGH:
972	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
973	<	op = addarg(op, "-dp 256");
972	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
973	>	op = addarg(op, "-dp 1024");
974		sprintf(op, " -ar %d", (int)(32*d));
975		op += strlen(op);
976		break;
977		}
978	<	op = addarg(op, "-pt .08");
978	>	po = addarg(po, "-pt .08");
979		if (vbool(PENUMBRAS))
980	<	op = addarg(op, "-ds .2 -dj .35");
980	>	op = addarg(op, "-ds .2 -dj .5");
981		else
982		op = addarg(op, "-ds .3");
983	<	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .15");
984	<	sprintf(op, " -ab %d", overture=vint(INDIRECT));
985	<	op += strlen(op);
983	>	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
984	>	if (overture = vint(INDIRECT)) {
985	>	sprintf(op, " -ab %d", overture);
986	>	op += strlen(op);
987	>	}
988		if (vdef(AMBFILE)) {
989		sprintf(op, " -af %s", vval(AMBFILE));
990		op += strlen(op);
#	Line 673 \| Line 992 \| *register char op;**
992		overture = 0;
993		switch (vscale(VARIABILITY)) {
994		case LOW:
995	<	op = addarg(op, "-aa .25 -ad 128 -as 0");
995	>	op = addarg(op, "-aa .25 -ad 196 -as 0");
996		break;
997		case MEDIUM:
998	<	op = addarg(op, "-aa .2 -ad 300 -as 64");
998	>	op = addarg(op, "-aa .2 -ad 400 -as 64");
999		break;
1000		case HIGH:
1001	<	op = addarg(op, "-aa .15 -ad 500 -as 128");
1001	>	op = addarg(op, "-aa .15 -ad 768 -as 196");
1002		break;
1003		}
1004		d = ambval();
#	Line 691 \| Line 1010 \| *register char op;**
1010		}
1011
1012
1013	<	hiqopts(op) /* high quality rendering options */
1013	>	hiqopts(op, po) /* high quality rendering options */
1014		register char *op;
1015	+	char *po;
1016		{
1017		double d, org[3], siz[3];
1018
1019		*op = '\0';
1020	+	*po = '\0';
1021		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
1022		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
1023		badvalue(ZONE);
1024		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
1025	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
1026	+	badvalue(ZONE);
1027		getoctcube(org, &d);
1028		d *= 3./(siz[0]+siz[1]+siz[2]);
1029		switch (vscale(DETAIL)) {
1030		case LOW:
1031	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
1032	<	op = addarg(op, "-dp 256");
1031	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
1032	>	op = addarg(op, "-dp 1024");
1033		sprintf(op, " -ar %d", (int)(16*d));
1034		op += strlen(op);
1035		break;
1036		case MEDIUM:
1037	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
1038	<	op = addarg(op, "-dp 512");
1037	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
1038	>	op = addarg(op, "-dp 2048");
1039		sprintf(op, " -ar %d", (int)(32*d));
1040		op += strlen(op);
1041		break;
1042		case HIGH:
1043	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
1044	<	op = addarg(op, "-dp 1024");
1043	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
1044	>	op = addarg(op, "-dp 4096");
1045		sprintf(op, " -ar %d", (int)(64*d));
1046		op += strlen(op);
1047		break;
1048		}
1049	<	op = addarg(op, "-pt .04");
1049	>	po = addarg(po, "-pt .04");
1050		if (vbool(PENUMBRAS))
1051	<	op = addarg(op, "-ds .1 -dj .7");
1051	>	op = addarg(op, "-ds .1 -dj .65");
1052		else
1053		op = addarg(op, "-ds .2");
1054	<	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .03");
1054	>	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
1055		sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
1056		op += strlen(op);
1057		if (vdef(AMBFILE)) {
#	Line 738 \| Line 1061 \| *register char op;**
1061		overture = 0;
1062		switch (vscale(VARIABILITY)) {
1063		case LOW:
1064	<	op = addarg(op, "-aa .15 -ad 200 -as 0");
1064	>	op = addarg(op, "-aa .15 -ad 256 -as 0");
1065		break;
1066		case MEDIUM:
1067	<	op = addarg(op, "-aa .125 -ad 512 -as 128");
1067	>	op = addarg(op, "-aa .125 -ad 512 -as 256");
1068		break;
1069		case HIGH:
1070	<	op = addarg(op, "-aa .08 -ad 850 -as 256");
1070	>	op = addarg(op, "-aa .08 -ad 1024 -as 512");
1071		break;
1072		}
1073		d = ambval();
#	Line 760 \| Line 1083 \| *xferopts(ro) / transfer options if indicated /*
1083		char *ro;
1084		{
1085		int fd, n;
1086	+	register char *cp;
1087
1088		n = strlen(ro);
1089		if (n < 2)
1090		return;
1091		if (vdef(OPTFILE)) {
1092	<	if ((fd = open(vval(OPTFILE), O_WRONLY\|O_CREAT\|O_TRUNC, 0666)) == -1)
1092	>	for (cp = ro; cp[1]; cp++)
1093	>	if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3]))
1094	>	*cp = '\n';
1095	>	else
1096	>	*cp = cp[1];
1097	>	*cp = '\n';
1098	>	fd = open(vval(OPTFILE), O_WRONLY\|O_CREAT\|O_TRUNC, 0666);
1099	>	if (fd < 0 \|\| write(fd, ro, n) != n \|\| close(fd) < 0)
1100		syserr(vval(OPTFILE));
1101	<	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));
1101	>	sprintf(ro, " @%s", vval(OPTFILE));
1102		}
1103		#ifdef MSDOS
1104		else if (n > 50) {
1105	<	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	<	}
1105	>	setenv("ROPT", ro+1);
1106		strcpy(ro, " $ROPT");
1107		}
1108		#endif
#	Line 799 \| Line 1117 \| *register char po;**
1117		po = addarg(po, "-1 -e");
1118		po = addarg(po, vval(EXPOSURE));
1119		}
1120	<	if (vscale(QUALITY) == HIGH)
1121	<	po = addarg(po, "-r .65");
1120	>	switch (vscale(QUALITY)) {
1121	>	case MEDIUM:
1122	>	po = addarg(po, "-r 1");
1123	>	break;
1124	>	case HIGH:
1125	>	po = addarg(po, "-m .25");
1126	>	break;
1127	>	}
1128		if (vdef(PFILT))
1129		po = addarg(po, vval(PFILT));
1130		}
#	Line 872 \| Line 1196 \| *register char vs;**
1196		badvalue(ZONE);
1197		for (i = 0; i < 3; i++) {
1198		dim[i] -= cent[i];
1199	+	if (dim[i] <= FTINY)
1200	+	badvalue(ZONE);
1201		cent[i] += .5*dim[i];
1202		}
1203		mult = vlet(ZONE)=='E' ? 2. : .45 ;
#	Line 924 \| Line 1250 \| *register char vs;**
1250		cp += strlen(cp);
1251		}
1252		}
1253	<	/* append any additional options */
1253	>	if (cp == viewopts) /* append any additional options */
1254	>	vs++; /* skip prefixed space if unneeded */
1255		strcpy(cp, vs);
1256	+	#ifdef MSDOS
1257	+	if (strlen(viewopts) > 40) {
1258	+	setenv("VIEW", viewopts);
1259	+	return("$VIEW");
1260	+	}
1261	+	#endif
1262		return(viewopts);
1263		}
1264
#	Line 933 \| Line 1266 \| *register char vs;**
1266		char *
1267		getview(n, vn) /* get view n, or NULL if none */
1268		int n;
1269	<	char *vn;
1269	>	char vn; / returned view name */
1270		{
1271		register char *mv;
1272
1273	<	if (viewselect != NULL) {
1273	>	if (viewselect != NULL) { /* command-line selected */
1274		if (n) /* only do one */
1275		return(NULL);
1276		if (viewselect[0] == '-') { /* already specified */
#	Line 950 \| Line 1283 \| *char vn;**
1283		;
1284		*vn = '\0';
1285		}
1286	+	/* view number? */
1287	+	if (isint(viewselect))
1288	+	return(specview(nvalue(vv+VIEW, atoi(viewselect)-1)));
1289		/* check list */
1290		while ((mv = nvalue(vv+VIEW, n++)) != NULL)
1291		if (matchword(viewselect, mv))
1292		return(specview(mv));
1293		return(specview(viewselect)); /* standard view? */
1294		}
1295	<	if (vn != NULL && (mv = nvalue(vv+VIEW, n)) != NULL) {
1296	<	if (*mv != '-')
1297	<	while (mv && !isspace(mv))
1298	<	vn++ = mv++;
1295	>	mv = nvalue(vv+VIEW, n); /* use view n */
1296	>	if (vn != NULL & mv != NULL) {
1297	>	register char *mv2 = mv;
1298	>	if (*mv2 != '-')
1299	>	while (mv2 && !isspace(mv2))
1300	>	vn++ = mv2++;
1301		*vn = '\0';
1302		}
1303	<	return(specview(nvalue(vv+VIEW, n))); /* use view n */
1303	>	return(specview(mv));
1304		}
1305
1306
1307	<	rview(opts) /* run rview with first view */
1308	<	char *opts;
1307	>	printview(vopts) /* print out selected view */
1308	>	register char *vopts;
1309		{
1310	+	extern char atos(), getenv();
1311	+	char buf[256];
1312	+	FILE *fp;
1313	+	register char *cp;
1314	+
1315	+	if (vopts == NULL)
1316	+	return(-1);
1317	+	fputs("VIEW=", stdout);
1318	+	do {
1319	+	if (matchword(vopts, "-vf")) { /* expand view file */
1320	+	vopts = sskip(vopts);
1321	+	if (!*atos(buf, sizeof(buf), vopts))
1322	+	return(-1);
1323	+	if ((fp = fopen(buf, "r")) == NULL)
1324	+	return(-1);
1325	+	for (buf[sizeof(buf)-2] = '\n';
1326	+	fgets(buf, sizeof(buf), fp) != NULL &&
1327	+	buf[0] != '\n';
1328	+	buf[sizeof(buf)-2] = '\n') {
1329	+	if (buf[sizeof(buf)-2] != '\n') {
1330	+	ungetc(buf[sizeof(buf)-2], fp);
1331	+	buf[sizeof(buf)-2] = '\0';
1332	+	}
1333	+	if (matchword(buf, "VIEW=") \|\|
1334	+	matchword(buf, "rview")) {
1335	+	for (cp = sskip(buf); cp && cp != '\n'; cp++)
1336	+	putchar(*cp);
1337	+	}
1338	+	}
1339	+	fclose(fp);
1340	+	vopts = sskip(vopts);
1341	+	} else {
1342	+	while (isspace(*vopts))
1343	+	vopts++;
1344	+	putchar(' ');
1345	+	#ifdef MSDOS
1346	+	if (vopts == '$') { / expand env. var. */
1347	+	if (!*atos(buf, sizeof(buf), vopts+1))
1348	+	return(-1);
1349	+	if ((cp = getenv(buf)) == NULL)
1350	+	return(-1);
1351	+	fputs(cp, stdout);
1352	+	vopts = sskip(vopts);
1353	+	} else
1354	+	#endif
1355	+	while (vopts && !isspace(vopts))
1356	+	putchar(*vopts++);
1357	+	}
1358	+	} while (*vopts++);
1359	+	putchar('\n');
1360	+	return(0);
1361	+	}
1362	+
1363	+
1364	+	rview(opts, po) /* run rview with first view */
1365	+	char opts, po;
1366	+	{
1367	+	char *vw;
1368		char combuf[512];
1369		/* build command */
1370	<	sprintf(combuf, "rview %s%s ", getview(0, NULL), opts);
1370	>	if (touchonly \|\| (vw = getview(0, NULL)) == NULL)
1371	>	return;
1372	>	if (sayview)
1373	>	printview(vw);
1374	>	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1375		if (rvdevice != NULL)
1376		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1377	<	strcat(combuf, vval(OCTREE));
1377	>	if (vdef(EXPOSURE))
1378	>	sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1379	>	strcat(combuf, oct1name);
1380		if (runcom(combuf)) { /* run it */
1381		fprintf(stderr, "%s: error running rview\n", progname);
1382		exit(1);
#	Line 982 \| Line 1384 \| *char opts;**
1384		}
1385
1386
1387	<	rpict(opts) /* run rpict and pfilt for each view */
1388	<	char *opts;
1387	>	rpict(opts, po) /* run rpict and pfilt for each view */
1388	>	char opts, po;
1389		{
1390		char combuf[1024];
1391		char rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
1392		char pfopts[128];
1393		char vs[32], *vw;
1394		int vn, mult;
1395	+	time_t rfdt, pfdt;
1396		/* get pfilt options */
1397		pfiltopts(pfopts);
1398		/* get resolution, reporting */
1399	<	mult = vscale(QUALITY)+1;
1399	>	switch (vscale(QUALITY)) {
1400	>	case LOW:
1401	>	mult = 1;
1402	>	break;
1403	>	case MEDIUM:
1404	>	mult = 2;
1405	>	break;
1406	>	case HIGH:
1407	>	mult = 3;
1408	>	break;
1409	>	}
1410		{
1411		int xres, yres;
1412		double aspect;
#	Line 1020 \| Line 1433 \| *char opts;**
1433		else
1434		badvalue(REPORT);
1435		}
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	–	}
1436		/* do each view */
1437		vn = 0;
1438		while ((vw = getview(vn++, vs)) != NULL) {
1439	+	if (sayview)
1440	+	printview(vw);
1441		if (!vs[0])
1442		sprintf(vs, "%d", vn);
1443		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1444		/* check date on picture */
1445	<	if (fdate(picfile) > octreedate)
1445	>	pfdt = fdate(picfile);
1446	>	if (pfdt >= oct1date)
1447		continue;
1448	<	/* build rpict command */
1448	>	/* get raw file name */
1449		sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1450	<	if (fdate(rawfile) > octreedate) /* recover */
1451	<	sprintf(combuf, "rpict%s%s -ro %s %s",
1452	<	rep, opts, rawfile, vval(OCTREE));
1450	>	rfdt = fdate(rawfile);
1451	>	if (touchonly) { /* update times only */
1452	>	if (rfdt) {
1453	>	if (rfdt < oct1date)
1454	>	touch(rawfile);
1455	>	} else if (pfdt && pfdt < oct1date)
1456	>	touch(picfile);
1457	>	continue;
1458	>	}
1459	>	/* build rpict command */
1460	>	if (rfdt >= oct1date) /* recover */
1461	>	sprintf(combuf, "rpict%s%s%s -ro %s %s",
1462	>	rep, po, opts, rawfile, oct1name);
1463		else {
1464		if (overture) { /* run overture calculation */
1465		sprintf(combuf,
1466		"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1467		rep, vw, opts,
1468	<	vval(OCTREE), rawfile);
1468	>	oct1name, overfile);
1469		if (runcom(combuf)) {
1470		fprintf(stderr,
1471	<	"%s: error in overture for view %s\n\t%s removed\n",
1472	<	progname, vs, rawfile);
1053	<	unlink(rawfile);
1471	>	"%s: error in overture for view %s\n",
1472	>	progname, vs);
1473		exit(1);
1474		}
1475	+	#ifdef NIX
1476	+	rmfile(overfile);
1477	+	#endif
1478		}
1479	<	sprintf(combuf, "rpict%s %s %s%s %s > %s",
1480	<	rep, vw, res, opts,
1481	<	vval(OCTREE), rawfile);
1479	>	sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
1480	>	rep, vw, res, po, opts,
1481	>	oct1name, rawfile);
1482		}
1483		if (runcom(combuf)) { /* run rpict */
1484		fprintf(stderr, "%s: error rendering view %s\n",
#	Line 1077 \| Line 1499 \| *char opts;**
1499		unlink(picfile);
1500		exit(1);
1501		}
1502	<	/* remove raw file */
1503	<	rmfile(rawfile);
1502	>	/* remove/rename raw file */
1503	>	if (vbool(RAWSAVE)) {
1504	>	sprintf(combuf, "%s_%s.rwp", vval(PICTURE), vs);
1505	>	mvfile(rawfile, combuf);
1506	>	} else
1507	>	rmfile(rawfile);
1508		}
1509		}
1510
1511
1512	+	touch(fn) /* update a file */
1513	+	char *fn;
1514	+	{
1515	+	if (!silent)
1516	+	printf("\ttouch %s\n", fn);
1517	+	if (noaction)
1518	+	return(0);
1519	+	#ifdef notused
1520	+	if (access(fn, F_OK) == -1) /* create it */
1521	+	if (close(open(fn, O_WRONLY\|O_CREAT, 0666)) == -1)
1522	+	return(-1);
1523	+	#endif
1524	+	return(setfdate(fn, time((time_t *)NULL)));
1525	+	}
1526	+
1527	+
1528		runcom(cs) /* run command */
1529		char *cs;
1530		{
#	Line 1108 \| Line 1550 \| *char fn;**
1550		return(0);
1551		return(unlink(fn));
1552		}
1553	+
1554	+
1555	+	mvfile(fold, fnew) /* move a file */
1556	+	char fold, fnew;
1557	+	{
1558	+	if (!silent)
1559	+	#ifdef MSDOS
1560	+	printf("\trename %s %s\n", fold, fnew);
1561	+	#else
1562	+	printf("\tmv %s %s\n", fold, fnew);
1563	+	#endif
1564	+	if (noaction)
1565	+	return(0);
1566	+	return(rename(fold, fnew));
1567	+	}
1568	+
1569	+
1570	+	#ifdef MSDOS
1571	+	setenv(vname, value) /* set an environment variable */
1572	+	char vname, value;
1573	+	{
1574	+	register char *evp;
1575	+
1576	+	evp = bmalloc(strlen(vname)+strlen(value)+2);
1577	+	if (evp == NULL)
1578	+	syserr(progname);
1579	+	sprintf(evp, "%s=%s", vname, value);
1580	+	if (putenv(evp) != 0) {
1581	+	fprintf(stderr, "%s: out of environment space\n", progname);
1582	+	exit(1);
1583	+	}
1584	+	if (!silent)
1585	+	printf("set %s\n", evp);
1586	+	}
1587	+	#endif
1588
1589
1590		badvalue(vc) /* report bad variable value and exit */

Diff Legend

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

Comparing ray/src/util/rad.c (file contents): Revision 2.4 by greg, Fri Mar 12 13:37:03 1993 UTC vs. Revision 2.43 by greg, Thu Jul 6 12:15:40 1995 UTC

Diff Legend

Comparing ray/src/util/rad.c (file contents):
Revision 2.4 by greg, Fri Mar 12 13:37:03 1993 UTC vs.
Revision 2.43 by greg, Thu Jul 6 12:15:40 1995 UTC