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

Comparing ray/src/util/rad.c (file contents):
Revision 2.33 by greg, Thu Nov 18 10:00:21 1993 UTC vs.
Revision 2.64 by schorsch, Thu Jun 26 00:58:11 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(), 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 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 */
43	<	#define EXPOSURE 15 /* picture exposure setting */
44	<	#define RESOLUTION 16 /* maximum picture resolution */
45	<	#define UP 17 /* view up (X, Y or Z) */
46	<	#define INDIRECT 18 /* indirection in lighting */
47	<	#define DETAIL 19 /* level of scene detail */
48	<	#define PENUMBRAS 20 /* shadow penumbras are desired */
49	<	#define VARIABILITY 21 /* level of light variability */
50	<	#define REPORT 22 /* 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 23
45	>	int NVARS = 26;
46
47	<	VARIABLE vv[NVARS] = { /* variable-value pairs */
48	<	{"objects", 3, 0, NULL, catvalues},
49	<	{"scene", 3, 0, NULL, catvalues},
50	<	{"materials", 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		{"mkillum", 3, 0, NULL, catvalues},
56	<	{"render", 3, 0, NULL, catvalues},
56	>	{"objects", 3, 0, NULL, catvalues},
57		{"oconv", 3, 0, NULL, catvalues},
62	–	{"pfilt", 2, 0, NULL, catvalues},
63	–	{"view", 2, 0, NULL, NULL},
64	–	{"ZONE", 2, 0, NULL, onevalue},
65	–	{"QUALITY", 3, 0, NULL, qualvalue},
58		{"OCTREE", 3, 0, NULL, onevalue},
67	–	{"PICTURE", 3, 0, NULL, onevalue},
68	–	{"AMBFILE", 3, 0, NULL, onevalue},
59		{"OPTFILE", 3, 0, NULL, onevalue},
60	<	{"EXPOSURE", 3, 0, NULL, fltvalue},
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},
73	–	{"INDIRECT", 3, 0, NULL, intvalue},
74	–	{"DETAIL", 3, 0, NULL, qualvalue},
75	–	{"PENUMBRAS", 3, 0, NULL, boolvalue},
70		{"VARIABILITY", 3, 0, NULL, qualvalue},
71	<	{"REPORT", 3, 0, NULL, onevalue},
71	>	{"view", 2, 0, NULL, NULL},
72	>	{"ZFILE", 2, 0, NULL, onevalue},
73	>	{"ZONE", 2, 0, NULL, onevalue},
74		};
75
80	–	VARIABLE *matchvar();
81	–	char *nvalue();
82	–
83	–	#define UPPER(c) ((c)&~0x20) /* ASCII trick */
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))
89	–	#define vlet(vc) UPPER(vval(vc)[0])
90	–	#define vscale vlet
91	–	#define vbool(vc) (vlet(vc)=='T')
92	–
93	–	#define HIGH 'H'
94	–	#define MEDIUM 'M'
95	–	#define LOW 'L'
96	–
76		/* overture calculation file */
77		#ifdef NIX
78	<	char overfile[] = "overture.raw";
78	>	char overfile[] = "overture.unf";
79		#else
80		char overfile[] = "/dev/null";
81		#endif
82
83	<	extern unsigned long fdate(), time();
83	>	extern time_t time();
84
85	<	unsigned long scenedate; /* date of latest scene or object file */
86	<	unsigned long octreedate; /* date of octree */
87	<	unsigned long matdate; /* date of latest material file */
88	<	unsigned long illumdate; /* date of last illum file */
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		char oct0name; / name of pre-mkillum octree */
91	<	unsigned long oct0date; /* date of pre-mkillum octree */
91	>	time_t oct0date; /* date of pre-mkillum octree */
92		char oct1name; / name of post-mkillum octree */
93	<	unsigned long oct1date; /* date of post-mkillum octree (>= matdate) */
93	>	time_t oct1date; /* date of post-mkillum octree (>= matdate) */
94
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 */
#	Line 133 \| 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 145 \| 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;
#	Line 157 \| Line 142 \| *char argv[];**
142		case 'v':
143		viewselect = argv[++i];
144		break;
145	+	case 'w':
146	+	nowarn++;
147	+	break;
148		default:
149		goto userr;
150		}
#	Line 166 \| Line 154 \| *char argv[];**
154		/* assign Radiance root file name */
155		rootname(radname, rifname);
156		/* load variable values */
157	<	load(rifname);
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 178 \| Line 170 \| *char argv[];**
170		setdefaults();
171		/* print all values if requested */
172		if (explicate)
173	<	printvals();
173	>	printvars(stdout);
174		/* build octree (and run mkillum) */
175		oconv();
176		/* check date on ambient file */
177		checkambfile();
178		/* run simulation */
179	<	renderopts(ropts);
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][-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 214 \| Line 206 \| *register char rn, fn;*
206		}
207
208
209	<	#define NOCHAR 127 /* constant for character to delete */
218	<
219	<
220	<	load(rfname) /* load Radiance simulation file */
221	<	char *rfname;
222	<	{
223	<	FILE *fp;
224	<	char buf[512];
225	<	register char *cp;
226	<
227	<	if (rfname == NULL)
228	<	fp = stdin;
229	<	else if ((fp = fopen(rfname, "r")) == NULL)
230	<	syserr(rfname);
231	<	while (fgetline(buf, sizeof(buf), fp) != NULL) {
232	<	for (cp = buf; *cp; cp++) {
233	<	switch (*cp) {
234	<	case '\\':
235	<	*cp++ = NOCHAR;
236	<	continue;
237	<	case '#':
238	<	*cp = '\0';
239	<	break;
240	<	default:
241	<	continue;
242	<	}
243	<	break;
244	<	}
245	<	setvariable(buf);
246	<	}
247	<	fclose(fp);
248	<	}
249	<
250	<
251	<	setvariable(ass) /* assign variable according to string */
252	<	register char *ass;
253	<	{
254	<	char varname[32];
255	<	int n;
256	<	register char *cp;
257	<	register VARIABLE *vp;
258	<	register int i;
259	<
260	<	while (isspace(ass)) / skip leading space */
261	<	ass++;
262	<	cp = varname; /* extract name */
263	<	while (cp < varname+sizeof(varname)-1
264	<	&& ass && !isspace(ass) && *ass != '=')
265	<	cp++ = ass++;
266	<	*cp = '\0';
267	<	if (!varname[0])
268	<	return; /* no variable name! */
269	<	/* trim value */
270	<	while (isspace(ass) \|\| ass == '=')
271	<	ass++;
272	<	for (n = strlen(ass); n > 0; n--)
273	<	if (!isspace(ass[n-1]))
274	<	break;
275	<	if (!n) {
276	<	fprintf(stderr, "%s: warning - missing value for variable '%s'\n",
277	<	progname, varname);
278	<	return;
279	<	}
280	<	/* match variable from list */
281	<	vp = matchvar(varname);
282	<	if (vp == NULL) {
283	<	fprintf(stderr, "%s: unknown variable '%s'\n",
284	<	progname, varname);
285	<	exit(1);
286	<	}
287	<	/* assign new value */
288	<	if (i = vp->nass) {
289	<	cp = vp->value;
290	<	while (i--)
291	<	while (*cp++)
292	<	;
293	<	i = cp - vp->value;
294	<	vp->value = realloc(vp->value, i+n+1);
295	<	} else
296	<	vp->value = malloc(n+1);
297	<	if (vp->value == NULL)
298	<	syserr(progname);
299	<	cp = vp->value+i; /* copy value, squeezing spaces */
300	<	cp = ass;
301	<	for (i = 1; i <= n; i++) {
302	<	if (ass[i] == NOCHAR)
303	<	continue;
304	<	if (isspace(*cp))
305	<	while (isspace(ass[i]))
306	<	i++;
307	<	*++cp = ass[i];
308	<	}
309	<	if (isspace(cp)) / remove trailing space */
310	<	*cp = '\0';
311	<	vp->nass++;
312	<	}
313	<
314	<
315	<	VARIABLE *
316	<	matchvar(nam) /* match a variable by its name */
317	<	char *nam;
318	<	{
319	<	int n = strlen(nam);
320	<	register int i;
321	<
322	<	for (i = 0; i < NVARS; i++)
323	<	if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n))
324	<	return(vv+i);
325	<	return(NULL);
326	<	}
327	<
328	<
329	<	char *
330	<	nvalue(vp, n) /* return nth variable value */
331	<	VARIABLE *vp;
332	<	register int n;
333	<	{
334	<	register char *cp;
335	<
336	<	if (vp == NULL \| n < 0 \| n >= vp->nass)
337	<	return(NULL);
338	<	cp = vp->value;
339	<	while (n--)
340	<	while (*cp++)
341	<	;
342	<	return(cp);
343	<	}
344	<
345	<
346	<	checkvalues() /* check assignments */
347	<	{
348	<	register int i;
349	<
350	<	for (i = 0; i < NVARS; i++)
351	<	if (vv[i].fixval != NULL)
352	<	(*vv[i].fixval)(vv+i);
353	<	}
354	<
355	<
356	<	onevalue(vp) /* only one assignment for this variable */
357	<	register VARIABLE *vp;
358	<	{
359	<	if (vp->nass < 2)
360	<	return;
361	<	fprintf(stderr, "%s: warning - multiple assignment of variable '%s'\n",
362	<	progname, vp->name);
363	<	do
364	<	vp->value += strlen(vp->value)+1;
365	<	while (--vp->nass > 1);
366	<	}
367	<
368	<
369	<	catvalues(vp) /* concatenate variable values */
370	<	register VARIABLE *vp;
371	<	{
372	<	register char *cp;
373	<
374	<	if (vp->nass < 2)
375	<	return;
376	<	for (cp = vp->value; vp->nass > 1; vp->nass--) {
377	<	while (*cp)
378	<	cp++;
379	<	*cp++ = ' ';
380	<	}
381	<	}
382	<
383	<
384	<	int
385	<	badmatch(tv, cv) /* case insensitive truncated comparison */
386	<	register char tv, cv;
387	<	{
388	<	if (!tv) return(1); / null string cannot match */
389	<	do
390	<	if (UPPER(tv) != cv++)
391	<	return(1);
392	<	while (*++tv);
393	<	return(0); /* OK */
394	<	}
395	<
396	<
397	<	boolvalue(vp) /* check boolean for legal values */
398	<	register VARIABLE *vp;
399	<	{
400	<	if (!vp->nass) return;
401	<	onevalue(vp);
402	<	switch (UPPER(vp->value[0])) {
403	<	case 'T':
404	<	if (badmatch(vp->value, "TRUE")) break;
405	<	return;
406	<	case 'F':
407	<	if (badmatch(vp->value, "FALSE")) break;
408	<	return;
409	<	}
410	<	fprintf(stderr, "%s: illegal value for boolean variable '%s'\n",
411	<	progname, vp->name);
412	<	exit(1);
413	<	}
414	<
415	<
416	<	qualvalue(vp) /* check qualitative var. for legal values */
417	<	register VARIABLE *vp;
418	<	{
419	<	if (!vp->nass) return;
420	<	onevalue(vp);
421	<	switch (UPPER(vp->value[0])) {
422	<	case 'L':
423	<	if (badmatch(vp->value, "LOW")) break;
424	<	return;
425	<	case 'M':
426	<	if (badmatch(vp->value, "MEDIUM")) break;
427	<	return;
428	<	case 'H':
429	<	if (badmatch(vp->value, "HIGH")) break;
430	<	return;
431	<	}
432	<	fprintf(stderr, "%s: illegal value for qualitative variable '%s'\n",
433	<	progname, vp->name);
434	<	exit(1);
435	<	}
436	<
437	<
438	<	intvalue(vp) /* check integer variable for legal values */
439	<	register VARIABLE *vp;
440	<	{
441	<	if (!vp->nass) return;
442	<	onevalue(vp);
443	<	if (isint(vp->value)) return;
444	<	fprintf(stderr, "%s: illegal value for integer variable '%s'\n",
445	<	progname, vp->name);
446	<	exit(1);
447	<	}
448	<
449	<
450	<	fltvalue(vp) /* check float variable for legal values */
451	<	register VARIABLE *vp;
452	<	{
453	<	if (!vp->nass) return;
454	<	onevalue(vp);
455	<	if (isflt(vp->value)) return;
456	<	fprintf(stderr, "%s: illegal value for real variable '%s'\n",
457	<	progname, vp->name);
458	<	exit(1);
459	<	}
460	<
461	<
462	<	unsigned long
209	>	time_t
210		checklast(fnames) /* check files and find most recent */
211		register char *fnames;
212		{
213		char thisfile[MAXPATH];
214	<	unsigned long thisdate, lastdate = 0;
468	<	register char *cp;
214	>	time_t thisdate, lastdate = 0;
215
216		if (fnames == NULL)
217		return(0);
218	<	while (*fnames) {
219	<	while (isspace(*fnames)) fnames++;
220	<	cp = thisfile;
221	<	while (fnames && !isspace(fnames))
476	<	cp++ = fnames++;
477	<	*cp = '\0';
218	>	while ((fnames = nextword(thisfile, MAXPATH, 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)
#	Line 512 \| Line 256 \| int pred;
256
257		checkfiles() /* check for existence and modified times */
258		{
259	<	unsigned long objdate;
259	>	time_t objdate;
260
261		if (!vdef(OCTREE)) {
262		if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL)
263		syserr(progname);
264		sprintf(vval(OCTREE), "%s.oct", radname);
265		vdef(OCTREE)++;
266	+	} else if (vval(OCTREE)[0] == '!') {
267	+	fprintf(stderr, "%s: illegal '%s' specification\n",
268	+	progname, vnam(OCTREE));
269	+	quit(1);
270		}
271		octreedate = fdate(vval(OCTREE));
272		if (vdef(ILLUM)) { /* illum requires secondary octrees */
#	Line 535 \| Line 283 \| *checkfiles() / check for existence and modified tim**
283		if (!octreedate & !scenedate & !illumdate) {
284		fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname,
285		vnam(OCTREE), vnam(SCENE), vnam(ILLUM));
286	<	exit(1);
286	>	quit(1);
287		}
288		matdate = checklast(vval(MATERIAL));
289		}
#	Line 547 \| Line 295 \| *double org[3], sizp;**
295		extern FILE *popen();
296		static double oorg[3], osiz = 0.;
297		double min[3], max[3];
298	<	char buf[512];
298	>	char buf[1024];
299		FILE *fp;
300		register int i;
301
#	Line 565 \| Line 313 \| *double org[3], sizp;**
313		fprintf(stderr,
314		"%s: error reading bounding box from getbbox\n",
315		progname);
316	<	exit(1);
316	>	quit(1);
317		}
318		for (i = 0; i < 3; i++)
319		if (max[i] - min[i] > osiz)
#	Line 583 \| Line 331 \| *double org[3], sizp;**
331		fprintf(stderr,
332		"%s: error reading bounding cube from getinfo\n",
333		progname);
334	<	exit(1);
334	>	quit(1);
335		}
336		pclose(fp);
337		}
#	Line 593 \| Line 341 \| *double org[3], sizp;**
341
342		setdefaults() /* set default values for unassigned var's */
343		{
344	<	double org[3], size;
344	>	double org[3], lim[3], size;
345		char buf[128];
346
347		if (!vdef(ZONE)) {
#	Line 603 \| Line 351 \| *setdefaults() / set default values for unassigned v**
351		vval(ZONE) = savqstr(buf);
352		vdef(ZONE)++;
353		}
354	+	if (!vdef(EYESEP)) {
355	+	if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf",
356	+	&org[0], &lim[0], &org[1], &lim[1],
357	+	&org[2], &lim[2]) != 6)
358	+	badvalue(ZONE);
359	+	sprintf(buf, "%f",
360	+	0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2]));
361	+	vval(EYESEP) = savqstr(buf);
362	+	vdef(EYESEP)++;
363	+	}
364		if (!vdef(INDIRECT)) {
365		vval(INDIRECT) = "0";
366		vdef(INDIRECT)++;
#	Line 619 \| Line 377 \| *setdefaults() / set default values for unassigned v**
377		vval(PICTURE) = radname;
378		vdef(PICTURE)++;
379		}
380	<	if (!vdef(VIEW)) {
381	<	vval(VIEW) = "X";
382	<	vdef(VIEW)++;
380	>	if (!vdef(VIEWS)) {
381	>	vval(VIEWS) = "X";
382	>	vdef(VIEWS)++;
383		}
384		if (!vdef(DETAIL)) {
385		vval(DETAIL) = "M";
#	Line 638 \| Line 396 \| *setdefaults() / set default values for unassigned v**
396		}
397
398
641	–	printvals() /* print variable values */
642	–	{
643	–	register int i, j;
644	–
645	–	for (i = 0; i < NVARS; i++)
646	–	for (j = 0; j < vdef(i); j++)
647	–	printf("%s= %s\n", vnam(i), nvalue(vv+i, j));
648	–	fflush(stdout);
649	–	}
650	–
651	–
399		oconv() /* run oconv and mkillum if necessary */
400		{
401		static char illumtmp[] = "ilXXXXXX";
402	<	char combuf[512], ocopts[64], mkopts[64];
402	>	char combuf[1024], ocopts[64], mkopts[64];
403
404		oconvopts(ocopts); /* get options */
405		if (octreedate < scenedate) { /* check date on original octree */
406	<	/* build command */
407	<	if (vdef(MATERIAL))
408	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
409	<	vval(MATERIAL), vval(SCENE), vval(OCTREE));
410	<	else
411	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
412	<	vval(SCENE), vval(OCTREE));
413	<
414	<	if (runcom(combuf)) { /* run it */
415	<	fprintf(stderr,
406	>	if (touchonly && octreedate)
407	>	touch(vval(OCTREE));
408	>	else { /* build command */
409	>	if (vdef(MATERIAL))
410	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
411	>	vval(MATERIAL), vval(SCENE),
412	>	vval(OCTREE));
413	>	else
414	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
415	>	vval(SCENE), vval(OCTREE));
416	>
417	>	if (runcom(combuf)) { /* run it */
418	>	fprintf(stderr,
419		"%s: error generating octree\n\t%s removed\n",
420	<	progname, vval(OCTREE));
421	<	unlink(vval(OCTREE));
422	<	exit(1);
420	>	progname, vval(OCTREE));
421	>	unlink(vval(OCTREE));
422	>	quit(1);
423	>	}
424		}
425	<	octreedate = time(0);
425	>	octreedate = time((time_t *)NULL);
426	>	if (octreedate < scenedate) /* in case clock is off */
427	>	octreedate = scenedate;
428		}
429		if (oct1name == vval(OCTREE)) /* no mkillum? */
430		oct1date = octreedate > matdate ? octreedate : matdate;
#	Line 680 \| Line 433 \| *oconv() / run oconv and mkillum if necessary /*
433		return;
434		/* make octree0 */
435		if (oct0date < scenedate \| oct0date < illumdate) {
436	<	/* build command */
436	>	if (touchonly && oct0date)
437	>	touch(oct0name);
438	>	else { /* build command */
439	>	if (octreedate)
440	>	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
441	>	vval(OCTREE), vval(ILLUM), oct0name);
442	>	else if (vdef(MATERIAL))
443	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
444	>	vval(MATERIAL), vval(ILLUM), oct0name);
445	>	else
446	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
447	>	vval(ILLUM), oct0name);
448	>	if (runcom(combuf)) { /* run it */
449	>	fprintf(stderr,
450	>	"%s: error generating octree\n\t%s removed\n",
451	>	progname, oct0name);
452	>	unlink(oct0name);
453	>	quit(1);
454	>	}
455	>	}
456	>	oct0date = time((time_t *)NULL);
457	>	if (oct0date < octreedate) /* in case clock is off */
458	>	oct0date = octreedate;
459	>	if (oct0date < illumdate) /* ditto */
460	>	oct0date = illumdate;
461	>	}
462	>	if (touchonly && oct1date)
463	>	touch(oct1name);
464	>	else {
465	>	mkillumopts(mkopts); /* build mkillum command */
466	>	mktemp(illumtmp);
467	>	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
468	>	oct0name, vval(ILLUM), illumtmp);
469	>	if (runcom(combuf)) { /* run it */
470	>	fprintf(stderr, "%s: error running mkillum\n",
471	>	progname);
472	>	unlink(illumtmp);
473	>	quit(1);
474	>	}
475	>	/* make octree1 (frozen) */
476		if (octreedate)
477	<	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
478	<	vval(OCTREE), vval(ILLUM), oct0name);
477	>	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
478	>	vval(OCTREE), illumtmp, oct1name);
479		else if (vdef(MATERIAL))
480	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
481	<	vval(MATERIAL), vval(ILLUM), oct0name);
480	>	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
481	>	vval(MATERIAL), illumtmp, oct1name);
482		else
483	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
484	<	vval(ILLUM), oct0name);
483	>	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
484	>	illumtmp, oct1name);
485		if (runcom(combuf)) { /* run it */
486		fprintf(stderr,
487		"%s: error generating octree\n\t%s removed\n",
488	<	progname, oct0name);
489	<	unlink(oct0name);
490	<	exit(1);
488	>	progname, oct1name);
489	>	unlink(oct1name);
490	>	unlink(illumtmp);
491	>	quit(1);
492		}
493	<	oct0date = time(0);
493	>	rmfile(illumtmp);
494		}
495	<	mkillumopts(mkopts); /* build mkillum command */
496	<	mktemp(illumtmp);
497	<	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
705	<	oct0name, vval(ILLUM), illumtmp);
706	<	if (runcom(combuf)) { /* run it */
707	<	fprintf(stderr, "%s: error running mkillum\n", progname);
708	<	unlink(illumtmp);
709	<	exit(1);
710	<	}
711	<	/* make octree1 (frozen) */
712	<	if (octreedate)
713	<	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
714	<	vval(OCTREE), illumtmp, oct1name);
715	<	else if (vdef(MATERIAL))
716	<	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
717	<	vval(MATERIAL), illumtmp, oct1name);
718	<	else
719	<	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
720	<	illumtmp, oct1name);
721	<	if (runcom(combuf)) { /* run it */
722	<	fprintf(stderr,
723	<	"%s: error generating octree\n\t%s removed\n",
724	<	progname, oct1name);
725	<	unlink(oct1name);
726	<	exit(1);
727	<	}
728	<	oct1date = time(0);
729	<	rmfile(illumtmp);
495	>	oct1date = time((time_t *)NULL);
496	>	if (oct1date < oct0date) /* in case clock is off */
497	>	oct1date = oct0date;
498		}
499
500
#	Line 765 \| Line 533 \| *register char mo;**
533
534		checkambfile() /* check date on ambient file */
535		{
536	<	unsigned long afdate;
536	>	time_t afdate;
537
538		if (!vdef(AMBFILE))
539		return;
540		if (!(afdate = fdate(vval(AMBFILE))))
541		return;
542		if (oct1date > afdate)
543	<	rmfile(vval(AMBFILE));
543	>	if (touchonly)
544	>	touch(vval(AMBFILE));
545	>	else
546	>	rmfile(vval(AMBFILE));
547		}
548
549
#	Line 781 \| Line 552 \| *ambval() / compute ambient value /*
552		{
553		if (vdef(EXPOSURE)) {
554		if (vval(EXPOSURE)[0] == '+' \|\| vval(EXPOSURE)[0] == '-')
555	<	return(.5/pow(2.,atof(vval(EXPOSURE))));
556	<	return(.5/atof(vval(EXPOSURE)));
555	>	return(.5/pow(2.,vflt(EXPOSURE)));
556	>	return(.5/vflt(EXPOSURE));
557		}
558		if (vlet(ZONE) == 'E')
559		return(10.);
#	Line 792 \| Line 563 \| *ambval() / compute ambient value /*
563		}
564
565
566	<	renderopts(op) /* set rendering options */
567	<	char *op;
566	>	renderopts(op, po) /* set rendering options */
567	>	char op, po;
568		{
569		switch(vscale(QUALITY)) {
570		case LOW:
571	<	lowqopts(op);
571	>	lowqopts(op, po);
572		break;
573		case MEDIUM:
574	<	medqopts(op);
574	>	medqopts(op, po);
575		break;
576		case HIGH:
577	<	hiqopts(op);
577	>	hiqopts(op, po);
578		break;
579		}
580		}
581
582
583	<	lowqopts(op) /* low quality rendering options */
583	>	lowqopts(op, po) /* low quality rendering options */
584		register char *op;
585	+	char *po;
586		{
587		double d, org[3], siz[3];
588
589		*op = '\0';
590	+	*po = '\0';
591		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
592		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
593		badvalue(ZONE);
594		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
595	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
596	+	badvalue(ZONE);
597		getoctcube(org, &d);
598		d *= 3./(siz[0]+siz[1]+siz[2]);
599		switch (vscale(DETAIL)) {
600		case LOW:
601	<	op = addarg(op, "-ps 16 -dp 64");
601	>	po = addarg(po, "-ps 16");
602	>	op = addarg(op, "-dp 64");
603		sprintf(op, " -ar %d", (int)(4*d));
604		op += strlen(op);
605		break;
606		case MEDIUM:
607	<	op = addarg(op, "-ps 8 -dp 128");
607	>	po = addarg(po, "-ps 8");
608	>	op = addarg(op, "-dp 128");
609		sprintf(op, " -ar %d", (int)(8*d));
610		op += strlen(op);
611		break;
612		case HIGH:
613	<	op = addarg(op, "-ps 4 -dp 256");
613	>	po = addarg(po, "-ps 4");
614	>	op = addarg(op, "-dp 256");
615		sprintf(op, " -ar %d", (int)(16*d));
616		op += strlen(op);
617		break;
618		}
619	<	op = addarg(op, "-pt .16");
619	>	po = addarg(po, "-pt .16");
620		if (vbool(PENUMBRAS))
621		op = addarg(op, "-ds .4");
622		else
#	Line 870 \| Line 648 \| *register char op;**
648		}
649
650
651	<	medqopts(op) /* medium quality rendering options */
651	>	medqopts(op, po) /* medium quality rendering options */
652		register char *op;
653	+	char *po;
654		{
655	<	double d, org[3], siz[3];
655	>	double d, org[3], siz[3], asz;
656
657		*op = '\0';
658	+	*po = '\0';
659		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
660		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
661		badvalue(ZONE);
662		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
663	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
664	+	badvalue(ZONE);
665		getoctcube(org, &d);
666	<	d *= 3./(siz[0]+siz[1]+siz[2]);
666	>	asz = (siz[0]+siz[1]+siz[2])/3.;
667	>	d /= asz;
668		switch (vscale(DETAIL)) {
669		case LOW:
670	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
670	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
671		op = addarg(op, "-dp 256");
672		sprintf(op, " -ar %d", (int)(8*d));
673		op += strlen(op);
674	+	sprintf(op, " -ms %.2g", asz/20.);
675	+	op += strlen(op);
676		break;
677		case MEDIUM:
678	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
678	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
679		op = addarg(op, "-dp 512");
680		sprintf(op, " -ar %d", (int)(16*d));
681		op += strlen(op);
682	+	sprintf(op, " -ms %.2g", asz/40.);
683	+	op += strlen(op);
684		break;
685		case HIGH:
686	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
686	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
687		op = addarg(op, "-dp 1024");
688		sprintf(op, " -ar %d", (int)(32*d));
689		op += strlen(op);
690	+	sprintf(op, " -ms %.2g", asz/80.);
691	+	op += strlen(op);
692		break;
693		}
694	<	op = addarg(op, "-pt .08");
694	>	po = addarg(po, "-pt .08");
695		if (vbool(PENUMBRAS))
696		op = addarg(op, "-ds .2 -dj .5");
697		else
#	Line 937 \| Line 726 \| *register char op;**
726		}
727
728
729	<	hiqopts(op) /* high quality rendering options */
729	>	hiqopts(op, po) /* high quality rendering options */
730		register char *op;
731	+	char *po;
732		{
733	<	double d, org[3], siz[3];
733	>	double d, org[3], siz[3], asz;
734
735		*op = '\0';
736	+	*po = '\0';
737		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
738		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
739		badvalue(ZONE);
740		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
741	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
742	+	badvalue(ZONE);
743		getoctcube(org, &d);
744	<	d *= 3./(siz[0]+siz[1]+siz[2]);
744	>	asz = (siz[0]+siz[1]+siz[2])/3.;
745	>	d /= asz;
746		switch (vscale(DETAIL)) {
747		case LOW:
748	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
748	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
749		op = addarg(op, "-dp 1024");
750		sprintf(op, " -ar %d", (int)(16*d));
751		op += strlen(op);
752	+	sprintf(op, " -ms %.2g", asz/40.);
753	+	op += strlen(op);
754		break;
755		case MEDIUM:
756	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
756	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
757		op = addarg(op, "-dp 2048");
758		sprintf(op, " -ar %d", (int)(32*d));
759		op += strlen(op);
760	+	sprintf(op, " -ms %.2g", asz/80.);
761	+	op += strlen(op);
762		break;
763		case HIGH:
764	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
764	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
765		op = addarg(op, "-dp 4096");
766		sprintf(op, " -ar %d", (int)(64*d));
767		op += strlen(op);
768	+	sprintf(op, " -ms %.2g", asz/160.);
769	+	op += strlen(op);
770		break;
771		}
772	<	op = addarg(op, "-pt .04");
772	>	po = addarg(po, "-pt .04");
773		if (vbool(PENUMBRAS))
774	<	op = addarg(op, "-ds .1 -dj .7");
774	>	op = addarg(op, "-ds .1 -dj .65");
775		else
776		op = addarg(op, "-ds .2");
777		op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
#	Line 1013 \| Line 813 \| *char ro;**
813		return;
814		if (vdef(OPTFILE)) {
815		for (cp = ro; cp[1]; cp++)
816	<	if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3]))
816	>	if (isspace(cp[1]) && (cp[2] == '@' \|\|
817	>	(cp[2] == '-' && isalpha(cp[3]))))
818		*cp = '\n';
819		else
820		*cp = cp[1];
#	Line 1023 \| Line 824 \| *char ro;**
824		syserr(vval(OPTFILE));
825		sprintf(ro, " @%s", vval(OPTFILE));
826		}
827	<	#ifdef MSDOS
827	>	#ifdef _WIN32
828		else if (n > 50) {
829		setenv("ROPT", ro+1);
830		strcpy(ro, " $ROPT");
#	Line 1042 \| Line 843 \| *register char po;**
843		}
844		switch (vscale(QUALITY)) {
845		case MEDIUM:
846	<	po = addarg(po, "-r 1");
846	>	po = addarg(po, "-r .6");
847		break;
848		case HIGH:
849		po = addarg(po, "-m .25");
#	Line 1108 \| Line 909 \| *register char vs;**
909		zpos = -1; vs++;
910		}
911		viewtype = 'v';
912	<	if (vs == 'v' \| vs == 'l' \| vs == 'a' \| vs == 'h')
912	>	if (vs == 'v' \| vs == 'l' \| vs == 'a' \| vs == 'h' \| *vs == 'c')
913		viewtype = *vs++;
914		cp = viewopts;
915		if ((!vs \|\| isspace(vs)) && (xpos\|ypos\|zpos)) { /* got one! */
#	Line 1119 \| Line 920 \| *register char vs;**
920		badvalue(ZONE);
921		for (i = 0; i < 3; i++) {
922		dim[i] -= cent[i];
923	+	if (dim[i] <= FTINY)
924	+	badvalue(ZONE);
925		cent[i] += .5*dim[i];
926		}
927		mult = vlet(ZONE)=='E' ? 2. : .45 ;
#	Line 1161 \| Line 964 \| *register char vs;**
964		case 'h':
965		cp = addarg(cp, "-vh 180 -vv 180");
966		break;
967	+	case 'c':
968	+	cp = addarg(cp, "-vh 180 -vv 90");
969	+	break;
970		}
971		} else {
972		while (!isspace(vs)) / else skip id */
#	Line 1174 \| Line 980 \| *register char vs;**
980		if (cp == viewopts) /* append any additional options */
981		vs++; /* skip prefixed space if unneeded */
982		strcpy(cp, vs);
983	<	#ifdef MSDOS
983	>	#ifdef _WIN32
984		if (strlen(viewopts) > 40) {
985		setenv("VIEW", viewopts);
986		return("$VIEW");
#	Line 1206 \| Line 1012 \| *char vn; /* returned view name /*
1012		}
1013		/* view number? */
1014		if (isint(viewselect))
1015	<	return(specview(nvalue(vv+VIEW, atoi(viewselect)-1)));
1015	>	return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
1016		/* check list */
1017	<	while ((mv = nvalue(vv+VIEW, n++)) != NULL)
1017	>	while ((mv = nvalue(VIEWS, n++)) != NULL)
1018		if (matchword(viewselect, mv))
1019		return(specview(mv));
1020		return(specview(viewselect)); /* standard view? */
1021		}
1022	<	mv = nvalue(vv+VIEW, n); /* use view n */
1022	>	mv = nvalue(VIEWS, n); /* use view n */
1023		if (vn != NULL & mv != NULL) {
1024		register char *mv2 = mv;
1025		if (*mv2 != '-')
#	Line 1228 \| Line 1034 \| *char vn; /* returned view name /*
1034		printview(vopts) /* print out selected view */
1035		register char *vopts;
1036		{
1037	<	extern char atos(), getenv();
1038	<	char buf[256];
1233	<	FILE *fp;
1037	>	VIEW vwr;
1038	>	char buf[128];
1039		register char *cp;
1040	<
1040	>	again:
1041		if (vopts == NULL)
1042		return(-1);
1043	<	fputs("VIEW=", stdout);
1044	<	do {
1045	<	if (matchword(vopts, "-vf")) { /* expand view file */
1046	<	vopts = sskip(vopts);
1047	<	if (!*atos(buf, sizeof(buf), vopts))
1243	<	return(-1);
1244	<	if ((fp = fopen(buf, "r")) == NULL)
1245	<	return(-1);
1246	<	for (buf[sizeof(buf)-2] = '\n';
1247	<	fgets(buf, sizeof(buf), fp) != NULL &&
1248	<	buf[0] != '\n';
1249	<	buf[sizeof(buf)-2] = '\n') {
1250	<	if (buf[sizeof(buf)-2] != '\n') {
1251	<	ungetc(buf[sizeof(buf)-2], fp);
1252	<	buf[sizeof(buf)-2] = '\0';
1253	<	}
1254	<	if (matchword(buf, "VIEW=") \|\|
1255	<	matchword(buf, "rview")) {
1256	<	for (cp = sskip(buf); cp && cp != '\n'; cp++)
1257	<	putchar(*cp);
1258	<	}
1259	<	}
1260	<	fclose(fp);
1261	<	vopts = sskip(vopts);
1262	<	} else {
1263	<	while (isspace(*vopts))
1264	<	vopts++;
1265	<	putchar(' ');
1266	<	#ifdef MSDOS
1267	<	if (vopts == '$') { / expand env. var. */
1268	<	if (!*atos(buf, sizeof(buf), vopts+1))
1269	<	return(-1);
1270	<	if ((cp = getenv(buf)) == NULL)
1271	<	return(-1);
1272	<	fputs(cp, stdout);
1273	<	vopts = sskip(vopts);
1274	<	} else
1043	>	#ifdef _WIN32
1044	>	if (vopts[0] == '$') {
1045	>	vopts = getenv(vopts+1);
1046	>	goto again;
1047	>	}
1048		#endif
1049	<	while (vopts && !isspace(vopts))
1050	<	putchar(*vopts++);
1051	<	}
1052	<	} while (*vopts++);
1053	<	putchar('\n');
1049	>	copystruct(&vwr, &stdview);
1050	>	sscanview(&vwr, cp=vopts); /* set initial options */
1051	>	while ((cp = strstr(cp, "-vf ")) != NULL &&
1052	>	*atos(buf, sizeof(buf), cp += 4)) {
1053	>	viewfile(buf, &vwr, NULL); /* load -vf file */
1054	>	sscanview(&vwr, cp); /* reset tail */
1055	>	}
1056	>	fputs(VIEWSTR, stdout);
1057	>	fprintview(&vwr, stdout); /* print full spec. */
1058	>	fputc('\n', stdout);
1059		return(0);
1060		}
1061
1062
1063	<	rview(opts) /* run rview with first view */
1064	<	char *opts;
1063	>	rview(opts, po) /* run rview with first view */
1064	>	char opts, po;
1065		{
1066		char *vw;
1067		char combuf[512];
1068		/* build command */
1069	<	if ((vw = getview(0, NULL)) == NULL)
1069	>	if (touchonly \|\| (vw = getview(0, NULL)) == NULL)
1070		return;
1071		if (sayview)
1072		printview(vw);
1073	<	sprintf(combuf, "rview %s%s -R %s ", vw, opts, rifname);
1073	>	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1074		if (rvdevice != NULL)
1075		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1076		if (vdef(EXPOSURE))
#	Line 1300 \| Line 1078 \| *char opts;**
1078		strcat(combuf, oct1name);
1079		if (runcom(combuf)) { /* run it */
1080		fprintf(stderr, "%s: error running rview\n", progname);
1081	<	exit(1);
1081	>	quit(1);
1082		}
1083		}
1084
1085
1086	<	rpict(opts) /* run rpict and pfilt for each view */
1087	<	char *opts;
1086	>	rpict(opts, po) /* run rpict and pfilt for each view */
1087	>	char opts, po;
1088		{
1089		char combuf[1024];
1090	<	char rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
1090	>	char rawfile[MAXPATH], picfile[MAXPATH];
1091	>	char zopt[MAXPATH+4], rep[MAXPATH+16], res[32];
1092		char pfopts[128];
1093		char vs[32], *vw;
1094		int vn, mult;
1095	+	time_t rfdt, pfdt;
1096		/* get pfilt options */
1097		pfiltopts(pfopts);
1098		/* get resolution, reporting */
#	Line 1361 \| Line 1141 \| *char opts;**
1141		if (!vs[0])
1142		sprintf(vs, "%d", vn);
1143		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1144	+	if (vdef(ZFILE))
1145	+	sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1146	+	else
1147	+	zopt[0] = '\0';
1148		/* check date on picture */
1149	<	if (fdate(picfile) >= oct1date)
1149	>	pfdt = fdate(picfile);
1150	>	if (pfdt >= oct1date)
1151		continue;
1152	+	/* get raw file name */
1153	+	sprintf(rawfile, "%s_%s.unf",
1154	+	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs);
1155	+	rfdt = fdate(rawfile);
1156	+	if (touchonly) { /* update times only */
1157	+	if (rfdt) {
1158	+	if (rfdt < oct1date)
1159	+	touch(rawfile);
1160	+	} else if (pfdt && pfdt < oct1date)
1161	+	touch(picfile);
1162	+	continue;
1163	+	}
1164		/* build rpict command */
1165	<	sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1166	<	if (fdate(rawfile) >= oct1date) /* recover */
1167	<	sprintf(combuf, "rpict%s%s -ro %s %s",
1371	<	rep, opts, rawfile, oct1name);
1165	>	if (rfdt >= oct1date) /* recover */
1166	>	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1167	>	rep, po, opts, zopt, rawfile, oct1name);
1168		else {
1169		if (overture) { /* run overture calculation */
1170		sprintf(combuf,
#	Line 1379 \| Line 1175 \| *char opts;**
1175		fprintf(stderr,
1176		"%s: error in overture for view %s\n",
1177		progname, vs);
1178	<	exit(1);
1178	>	quit(1);
1179		}
1180		#ifdef NIX
1181		rmfile(overfile);
1182		#endif
1183		}
1184	<	sprintf(combuf, "rpict%s %s %s%s %s > %s",
1185	<	rep, vw, res, opts,
1186	<	oct1name, rawfile);
1184	>	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1185	>	rep, vw, res, po, opts, zopt,
1186	>	oct1name, rawfile);
1187		}
1188		if (runcom(combuf)) { /* run rpict */
1189		fprintf(stderr, "%s: error rendering view %s\n",
1190		progname, vs);
1191	<	exit(1);
1191	>	quit(1);
1192		}
1193	+	if (!vdef(RAWFILE) \|\| strcmp(vval(RAWFILE),vval(PICTURE))) {
1194		/* build pfilt command */
1195	<	if (mult > 1)
1196	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1195	>	if (mult > 1)
1196	>	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1197		pfopts, mult, mult, rawfile, picfile);
1198	<	else
1199	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1200	<	rawfile, picfile);
1201	<	if (runcom(combuf)) { /* run pfilt */
1202	<	fprintf(stderr,
1203	<	"%s: error filtering view %s\n\t%s removed\n",
1204	<	progname, vs, picfile);
1205	<	unlink(picfile);
1206	<	exit(1);
1198	>	else
1199	>	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1200	>	rawfile, picfile);
1201	>	if (runcom(combuf)) { /* run pfilt */
1202	>	fprintf(stderr,
1203	>	"%s: error filtering view %s\n\t%s removed\n",
1204	>	progname, vs, picfile);
1205	>	unlink(picfile);
1206	>	quit(1);
1207	>	}
1208		}
1209	<	/* remove raw file */
1210	<	rmfile(rawfile);
1209	>	/* remove/rename raw file */
1210	>	if (vdef(RAWFILE)) {
1211	>	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1212	>	mvfile(rawfile, combuf);
1213	>	} else
1214	>	rmfile(rawfile);
1215		}
1216		}
1217
1218
1219	+	touch(fn) /* update a file */
1220	+	char *fn;
1221	+	{
1222	+	if (!silent)
1223	+	printf("\ttouch %s\n", fn);
1224	+	if (noaction)
1225	+	return(0);
1226	+	#ifdef notused
1227	+	if (access(fn, F_OK) == -1) /* create it */
1228	+	if (close(open(fn, O_WRONLY\|O_CREAT, 0666)) == -1)
1229	+	return(-1);
1230	+	#endif
1231	+	return(setfdate(fn, time((time_t *)NULL)));
1232	+	}
1233	+
1234	+
1235		runcom(cs) /* run command */
1236		char *cs;
1237		{
#	Line 1430 \| Line 1248 \| *rmfile(fn) / remove a file /*
1248		char *fn;
1249		{
1250		if (!silent)
1251	<	#ifdef MSDOS
1251	>	#ifdef _WIN32
1252		printf("\tdel %s\n", fn);
1253		#else
1254		printf("\trm -f %s\n", fn);
#	Line 1441 \| Line 1259 \| *char fn;**
1259		}
1260
1261
1262	<	#ifdef MSDOS
1262	>	mvfile(fold, fnew) /* move a file */
1263	>	char fold, fnew;
1264	>	{
1265	>	if (!silent)
1266	>	#ifdef _WIN32
1267	>	printf("\trename %s %s\n", fold, fnew);
1268	>	#else
1269	>	printf("\tmv %s %s\n", fold, fnew);
1270	>	#endif
1271	>	if (noaction)
1272	>	return(0);
1273	>	return(rename(fold, fnew));
1274	>	}
1275	>
1276	>
1277	>	#ifdef _WIN32
1278		setenv(vname, value) /* set an environment variable */
1279		char vname, value;
1280		{
#	Line 1453 \| Line 1286 \| *char vname, value;*
1286		sprintf(evp, "%s=%s", vname, value);
1287		if (putenv(evp) != 0) {
1288		fprintf(stderr, "%s: out of environment space\n", progname);
1289	<	exit(1);
1289	>	quit(1);
1290		}
1291		if (!silent)
1292		printf("set %s\n", evp);
#	Line 1466 \| Line 1299 \| int vc;
1299		{
1300		fprintf(stderr, "%s: bad value for variable '%s'\n",
1301		progname, vnam(vc));
1302	<	exit(1);
1302	>	quit(1);
1303		}
1304
1305
#	Line 1474 \| Line 1307 \| *syserr(s) / report a system error and exit /*
1307		char *s;
1308		{
1309		perror(s);
1310	<	exit(1);
1310	>	quit(1);
1311	>	}
1312	>
1313	>
1314	>	void
1315	>	quit(ec) /* exit program */
1316	>	int ec;
1317	>	{
1318	>	exit(ec);
1319		}

Diff Legend

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

Comparing ray/src/util/rad.c (file contents): Revision 2.33 by greg, Thu Nov 18 10:00:21 1993 UTC vs. Revision 2.64 by schorsch, Thu Jun 26 00:58:11 2003 UTC

Diff Legend

Comparing ray/src/util/rad.c (file contents):
Revision 2.33 by greg, Thu Nov 18 10:00:21 1993 UTC vs.
Revision 2.64 by schorsch, Thu Jun 26 00:58:11 2003 UTC