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

Comparing ray/src/util/rad.c (file contents):
Revision 2.29 by greg, Sat Oct 30 10:47:05 1993 UTC vs.
Revision 2.65 by schorsch, Mon Jun 30 14:59:13 2003 UTC

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

Diff Legend

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

Comparing ray/src/util/rad.c (file contents): Revision 2.29 by greg, Sat Oct 30 10:47:05 1993 UTC vs. Revision 2.65 by schorsch, Mon Jun 30 14:59:13 2003 UTC

Diff Legend

Comparing ray/src/util/rad.c (file contents):
Revision 2.29 by greg, Sat Oct 30 10:47:05 1993 UTC vs.
Revision 2.65 by schorsch, Mon Jun 30 14:59:13 2003 UTC