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

Comparing ray/src/util/rad.c (file contents):
Revision 2.27 by greg, Sat Sep 25 13:21:35 1993 UTC vs.
Revision 2.62 by greg, Fri Mar 21 18:48:46 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 "view.h"
10		#include "paths.h"
11	+	#include "vars.h"
12		#include <ctype.h>
13
14	<
15	<	typedef struct {
16	<	char name; / variable name */
17	<	short nick; /* # characters required for nickname */
18	<	short nass; /* # assignments made */
19	<	char value; / assigned value(s) */
20	<	int (fixval)(); / assignment checking function */
21	<	} VARIABLE;
22	<
23	<	int onevalue(), catvalues();
24	<
25	<	/* variables */
26	<	#define OBJECT 0 /* object files */
27	<	#define SCENE 1 /* scene files */
28	<	#define MATERIAL 2 /* material files */
29	<	#define ILLUM 3 /* mkillum input files */
30	<	#define MKILLUM 4 /* mkillum options */
31	<	#define RENDER 5 /* rendering options */
32	<	#define OCONV 6 /* oconv options */
33	<	#define PFILT 7 /* pfilt options */
34	<	#define VIEW 8 /* view(s) for picture(s) */
35	<	#define ZONE 9 /* simulation zone */
36	<	#define QUALITY 10 /* desired rendering quality */
37	<	#define OCTREE 11 /* octree file name */
38	<	#define PICTURE 12 /* picture file name */
39	<	#define AMBFILE 13 /* ambient file name */
40	<	#define OPTFILE 14 /* rendering options file */
42	<	#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 */
14	>	/* variables (alphabetical by name) */
15	>	#define AMBFILE 0 /* ambient file name */
16	>	#define DETAIL 1 /* level of scene detail */
17	>	#define EXPOSURE 2 /* picture exposure setting */
18	>	#define EYESEP 3 /* interocular distance */
19	>	#define ILLUM 4 /* mkillum input files */
20	>	#define INDIRECT 5 /* indirection in lighting */
21	>	#define MATERIAL 6 /* material files */
22	>	#define MKILLUM 7 /* mkillum options */
23	>	#define OBJECT 8 /* object files */
24	>	#define OCONV 9 /* oconv options */
25	>	#define OCTREE 10 /* octree file name */
26	>	#define OPTFILE 11 /* rendering options file */
27	>	#define PENUMBRAS 12 /* shadow penumbras are desired */
28	>	#define PFILT 13 /* pfilt options */
29	>	#define PICTURE 14 /* picture file root name */
30	>	#define QUALITY 15 /* desired rendering quality */
31	>	#define RAWFILE 16 /* raw picture file root name */
32	>	#define RENDER 17 /* rendering options */
33	>	#define REPORT 18 /* report frequency and errfile */
34	>	#define RESOLUTION 19 /* maximum picture resolution */
35	>	#define SCENE 20 /* scene files */
36	>	#define UP 21 /* view up (X, Y or Z) */
37	>	#define VARIABILITY 22 /* level of light variability */
38	>	#define VIEWS 23 /* view(s) for picture(s) */
39	>	#define ZFILE 24 /* distance file root name */
40	>	#define ZONE 25 /* simulation zone */
41		/* total number of variables */
42	<	#define NVARS 23
42	>	int NVARS = 26;
43
44	<	VARIABLE vv[NVARS] = { /* variable-value pairs */
45	<	{"objects", 3, 0, NULL, catvalues},
46	<	{"scene", 3, 0, NULL, catvalues},
47	<	{"materials", 3, 0, NULL, catvalues},
44	>	VARIABLE vv[] = { /* variable-value pairs */
45	>	{"AMBFILE", 3, 0, NULL, onevalue},
46	>	{"DETAIL", 3, 0, NULL, qualvalue},
47	>	{"EXPOSURE", 3, 0, NULL, fltvalue},
48	>	{"EYESEP", 3, 0, NULL, fltvalue},
49		{"illum", 3, 0, NULL, catvalues},
50	+	{"INDIRECT", 3, 0, NULL, intvalue},
51	+	{"materials", 3, 0, NULL, catvalues},
52		{"mkillum", 3, 0, NULL, catvalues},
53	<	{"render", 3, 0, NULL, catvalues},
53	>	{"objects", 3, 0, NULL, catvalues},
54		{"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},
55		{"OCTREE", 3, 0, NULL, onevalue},
66	–	{"PICTURE", 3, 0, NULL, onevalue},
67	–	{"AMBFILE", 3, 0, NULL, onevalue},
56		{"OPTFILE", 3, 0, NULL, onevalue},
57	<	{"EXPOSURE", 3, 0, NULL, onevalue},
57	>	{"PENUMBRAS", 3, 0, NULL, boolvalue},
58	>	{"pfilt", 2, 0, NULL, catvalues},
59	>	{"PICTURE", 3, 0, NULL, onevalue},
60	>	{"QUALITY", 3, 0, NULL, qualvalue},
61	>	{"RAWFILE", 3, 0, NULL, onevalue},
62	>	{"render", 3, 0, NULL, catvalues},
63	>	{"REPORT", 3, 0, NULL, onevalue},
64		{"RESOLUTION", 3, 0, NULL, onevalue},
65	+	{"scene", 3, 0, NULL, catvalues},
66		{"UP", 2, 0, NULL, onevalue},
67	<	{"INDIRECT", 3, 0, NULL, onevalue},
68	<	{"DETAIL", 3, 0, NULL, onevalue},
69	<	{"PENUMBRAS", 3, 0, NULL, onevalue},
70	<	{"VARIABILITY", 3, 0, NULL, onevalue},
76	<	{"REPORT", 3, 0, NULL, onevalue},
67	>	{"VARIABILITY", 3, 0, NULL, qualvalue},
68	>	{"view", 2, 0, NULL, NULL},
69	>	{"ZFILE", 2, 0, NULL, onevalue},
70	>	{"ZONE", 2, 0, NULL, onevalue},
71		};
72
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	–
73		/* overture calculation file */
74		#ifdef NIX
75	<	char overfile[] = "overture.raw";
75	>	char overfile[] = "overture.unf";
76		#else
77		char overfile[] = "/dev/null";
78		#endif
79
80	<	extern unsigned long fdate(), time();
80	>	extern time_t time();
81
82	<	unsigned long scenedate; /* date of latest scene or object file */
83	<	unsigned long octreedate; /* date of octree */
84	<	unsigned long matdate; /* date of latest material file */
85	<	unsigned long illumdate; /* date of last illum file */
82	>	time_t scenedate; /* date of latest scene or object file */
83	>	time_t octreedate; /* date of octree */
84	>	time_t matdate; /* date of latest material file */
85	>	time_t illumdate; /* date of last illum file */
86
87		char oct0name; / name of pre-mkillum octree */
88	<	unsigned long oct0date; /* date of pre-mkillum octree */
88	>	time_t oct0date; /* date of pre-mkillum octree */
89		char oct1name; / name of post-mkillum octree */
90	<	unsigned long oct1date; /* date of post-mkillum octree (>= matdate) */
90	>	time_t oct1date; /* date of post-mkillum octree (>= matdate) */
91
92	+	int nowarn = 0; /* no warnings */
93		int explicate = 0; /* explicate variables */
94		int silent = 0; /* do work silently */
95	+	int touchonly = 0; /* touch files only */
96		int noaction = 0; /* don't do anything */
97		int sayview = 0; /* print view out */
98		char rvdevice = NULL; / rview output device */
#	Line 137 \| Line 111 \| int argc;
111		char *argv[];
112		{
113		char ropts[512];
114	+	char popts[64];
115		int i;
116
117		progname = argv[0];
#	Line 149 \| Line 124 \| *char argv[];**
124		case 'n':
125		noaction++;
126		break;
127	+	case 't':
128	+	touchonly++;
129	+	break;
130		case 'e':
131		explicate++;
132		break;
#	Line 161 \| Line 139 \| *char argv[];**
139		case 'v':
140		viewselect = argv[++i];
141		break;
142	+	case 'w':
143	+	nowarn++;
144	+	break;
145		default:
146		goto userr;
147		}
#	Line 170 \| Line 151 \| *char argv[];**
151		/* assign Radiance root file name */
152		rootname(radname, rifname);
153		/* load variable values */
154	<	load(rifname);
154	>	loadvars(rifname);
155		/* get any additional assignments */
156		for (i++; i < argc; i++)
157	<	setvariable(argv[i]);
157	>	if (setvariable(argv[i], matchvar) < 0) {
158	>	fprintf(stderr, "%s: unknown variable: %s\n",
159	>	progname, argv[i]);
160	>	quit(1);
161	>	}
162		/* check assignments */
163		checkvalues();
164		/* check files and dates */
#	Line 182 \| Line 167 \| *char argv[];**
167		setdefaults();
168		/* print all values if requested */
169		if (explicate)
170	<	printvals();
170	>	printvars(stdout);
171		/* build octree (and run mkillum) */
172		oconv();
173		/* check date on ambient file */
174		checkambfile();
175		/* run simulation */
176	<	renderopts(ropts);
176	>	renderopts(ropts, popts);
177		xferopts(ropts);
178		if (rvdevice != NULL)
179	<	rview(ropts);
179	>	rview(ropts, popts);
180		else
181	<	rpict(ropts);
182	<	exit(0);
181	>	rpict(ropts, popts);
182	>	quit(0);
183		userr:
184		fprintf(stderr,
185	<	"Usage: %s [-s][-n][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
185	>	"Usage: %s [-w][-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
186		progname);
187	<	exit(1);
187	>	quit(1);
188		}
189
190
#	Line 218 \| Line 203 \| *register char rn, fn;*
203		}
204
205
206	<	#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
206	>	time_t
207		checklast(fnames) /* check files and find most recent */
208		register char *fnames;
209		{
210		char thisfile[MAXPATH];
211	<	unsigned long thisdate, lastdate = 0;
411	<	register char *cp;
211	>	time_t thisdate, lastdate = 0;
212
213		if (fnames == NULL)
214		return(0);
215	<	while (*fnames) {
216	<	while (isspace(*fnames)) fnames++;
217	<	cp = thisfile;
218	<	while (fnames && !isspace(fnames))
419	<	cp++ = fnames++;
420	<	*cp = '\0';
215	>	while ((fnames = nextword(thisfile, MAXPATH, fnames)) != NULL) {
216	>	if (thisfile[0] == '!' \|\|
217	>	(thisfile[0] == '\\' && thisfile[1] == '!'))
218	>	continue;
219		if (!(thisdate = fdate(thisfile)))
220		syserr(thisfile);
221		if (thisdate > lastdate)
#	Line 455 \| Line 253 \| int pred;
253
254		checkfiles() /* check for existence and modified times */
255		{
256	<	unsigned long objdate;
256	>	time_t objdate;
257
258		if (!vdef(OCTREE)) {
259		if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL)
260		syserr(progname);
261		sprintf(vval(OCTREE), "%s.oct", radname);
262		vdef(OCTREE)++;
263	+	} else if (vval(OCTREE)[0] == '!') {
264	+	fprintf(stderr, "%s: illegal '%s' specification\n",
265	+	progname, vnam(OCTREE));
266	+	quit(1);
267		}
268		octreedate = fdate(vval(OCTREE));
269		if (vdef(ILLUM)) { /* illum requires secondary octrees */
#	Line 478 \| Line 280 \| *checkfiles() / check for existence and modified tim**
280		if (!octreedate & !scenedate & !illumdate) {
281		fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname,
282		vnam(OCTREE), vnam(SCENE), vnam(ILLUM));
283	<	exit(1);
283	>	quit(1);
284		}
285		matdate = checklast(vval(MATERIAL));
286		}
#	Line 490 \| Line 292 \| *double org[3], sizp;**
292		extern FILE *popen();
293		static double oorg[3], osiz = 0.;
294		double min[3], max[3];
295	<	char buf[512];
295	>	char buf[1024];
296		FILE *fp;
297		register int i;
298
#	Line 508 \| Line 310 \| *double org[3], sizp;**
310		fprintf(stderr,
311		"%s: error reading bounding box from getbbox\n",
312		progname);
313	<	exit(1);
313	>	quit(1);
314		}
315		for (i = 0; i < 3; i++)
316		if (max[i] - min[i] > osiz)
#	Line 526 \| Line 328 \| *double org[3], sizp;**
328		fprintf(stderr,
329		"%s: error reading bounding cube from getinfo\n",
330		progname);
331	<	exit(1);
331	>	quit(1);
332		}
333		pclose(fp);
334		}
#	Line 536 \| Line 338 \| *double org[3], sizp;**
338
339		setdefaults() /* set default values for unassigned var's */
340		{
341	<	double org[3], size;
341	>	double org[3], lim[3], size;
342		char buf[128];
343
344		if (!vdef(ZONE)) {
#	Line 546 \| Line 348 \| *setdefaults() / set default values for unassigned v**
348		vval(ZONE) = savqstr(buf);
349		vdef(ZONE)++;
350		}
351	+	if (!vdef(EYESEP)) {
352	+	if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf",
353	+	&org[0], &lim[0], &org[1], &lim[1],
354	+	&org[2], &lim[2]) != 6)
355	+	badvalue(ZONE);
356	+	sprintf(buf, "%f",
357	+	0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2]));
358	+	vval(EYESEP) = savqstr(buf);
359	+	vdef(EYESEP)++;
360	+	}
361		if (!vdef(INDIRECT)) {
362		vval(INDIRECT) = "0";
363		vdef(INDIRECT)++;
#	Line 562 \| Line 374 \| *setdefaults() / set default values for unassigned v**
374		vval(PICTURE) = radname;
375		vdef(PICTURE)++;
376		}
377	<	if (!vdef(VIEW)) {
378	<	vval(VIEW) = "X";
379	<	vdef(VIEW)++;
377	>	if (!vdef(VIEWS)) {
378	>	vval(VIEWS) = "X";
379	>	vdef(VIEWS)++;
380		}
381		if (!vdef(DETAIL)) {
382		vval(DETAIL) = "M";
#	Line 581 \| Line 393 \| *setdefaults() / set default values for unassigned v**
393		}
394
395
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	–
396		oconv() /* run oconv and mkillum if necessary */
397		{
398		static char illumtmp[] = "ilXXXXXX";
399	<	char combuf[512], ocopts[64], mkopts[64];
399	>	char combuf[1024], ocopts[64], mkopts[64];
400
401		oconvopts(ocopts); /* get options */
402		if (octreedate < scenedate) { /* check date on original octree */
403	<	/* build command */
404	<	if (vdef(MATERIAL))
405	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
406	<	vval(MATERIAL), vval(SCENE), vval(OCTREE));
407	<	else
408	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
409	<	vval(SCENE), vval(OCTREE));
410	<
411	<	if (runcom(combuf)) { /* run it */
412	<	fprintf(stderr,
403	>	if (touchonly && octreedate)
404	>	touch(vval(OCTREE));
405	>	else { /* build command */
406	>	if (vdef(MATERIAL))
407	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
408	>	vval(MATERIAL), vval(SCENE),
409	>	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,
416		"%s: error generating octree\n\t%s removed\n",
417	<	progname, vval(OCTREE));
418	<	unlink(vval(OCTREE));
419	<	exit(1);
417	>	progname, vval(OCTREE));
418	>	unlink(vval(OCTREE));
419	>	quit(1);
420	>	}
421		}
422	<	octreedate = time(0);
422	>	octreedate = time((time_t *)NULL);
423	>	if (octreedate < scenedate) /* in case clock is off */
424	>	octreedate = scenedate;
425		}
426		if (oct1name == vval(OCTREE)) /* no mkillum? */
427		oct1date = octreedate > matdate ? octreedate : matdate;
#	Line 623 \| Line 430 \| *oconv() / run oconv and mkillum if necessary /*
430		return;
431		/* make octree0 */
432		if (oct0date < scenedate \| oct0date < illumdate) {
433	<	/* build command */
433	>	if (touchonly && oct0date)
434	>	touch(oct0name);
435	>	else { /* build command */
436	>	if (octreedate)
437	>	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
438	>	vval(OCTREE), vval(ILLUM), oct0name);
439	>	else if (vdef(MATERIAL))
440	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
441	>	vval(MATERIAL), vval(ILLUM), oct0name);
442	>	else
443	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
444	>	vval(ILLUM), oct0name);
445	>	if (runcom(combuf)) { /* run it */
446	>	fprintf(stderr,
447	>	"%s: error generating octree\n\t%s removed\n",
448	>	progname, oct0name);
449	>	unlink(oct0name);
450	>	quit(1);
451	>	}
452	>	}
453	>	oct0date = time((time_t *)NULL);
454	>	if (oct0date < octreedate) /* in case clock is off */
455	>	oct0date = octreedate;
456	>	if (oct0date < illumdate) /* ditto */
457	>	oct0date = illumdate;
458	>	}
459	>	if (touchonly && oct1date)
460	>	touch(oct1name);
461	>	else {
462	>	mkillumopts(mkopts); /* build mkillum command */
463	>	mktemp(illumtmp);
464	>	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
465	>	oct0name, vval(ILLUM), illumtmp);
466	>	if (runcom(combuf)) { /* run it */
467	>	fprintf(stderr, "%s: error running mkillum\n",
468	>	progname);
469	>	unlink(illumtmp);
470	>	quit(1);
471	>	}
472	>	/* make octree1 (frozen) */
473		if (octreedate)
474	<	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
475	<	vval(OCTREE), vval(ILLUM), oct0name);
474	>	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
475	>	vval(OCTREE), illumtmp, oct1name);
476		else if (vdef(MATERIAL))
477	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
478	<	vval(MATERIAL), vval(ILLUM), oct0name);
477	>	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
478	>	vval(MATERIAL), illumtmp, oct1name);
479		else
480	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
481	<	vval(ILLUM), oct0name);
480	>	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
481	>	illumtmp, oct1name);
482		if (runcom(combuf)) { /* run it */
483		fprintf(stderr,
484		"%s: error generating octree\n\t%s removed\n",
485	<	progname, oct0name);
486	<	unlink(oct0name);
487	<	exit(1);
485	>	progname, oct1name);
486	>	unlink(oct1name);
487	>	unlink(illumtmp);
488	>	quit(1);
489		}
490	<	oct0date = time(0);
490	>	rmfile(illumtmp);
491		}
492	<	mkillumopts(mkopts); /* build mkillum command */
493	<	mktemp(illumtmp);
494	<	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);
492	>	oct1date = time((time_t *)NULL);
493	>	if (oct1date < oct0date) /* in case clock is off */
494	>	oct1date = oct0date;
495		}
496
497
#	Line 708 \| Line 530 \| *register char mo;**
530
531		checkambfile() /* check date on ambient file */
532		{
533	<	unsigned long afdate;
533	>	time_t afdate;
534
535		if (!vdef(AMBFILE))
536		return;
537		if (!(afdate = fdate(vval(AMBFILE))))
538		return;
539		if (oct1date > afdate)
540	<	rmfile(vval(AMBFILE));
540	>	if (touchonly)
541	>	touch(vval(AMBFILE));
542	>	else
543	>	rmfile(vval(AMBFILE));
544		}
545
546
#	Line 723 \| Line 548 \| double
548		ambval() /* compute ambient value */
549		{
550		if (vdef(EXPOSURE)) {
726	–	if (!isflt(vval(EXPOSURE)))
727	–	badvalue(EXPOSURE);
551		if (vval(EXPOSURE)[0] == '+' \|\| vval(EXPOSURE)[0] == '-')
552	<	return(.5/pow(2.,atof(vval(EXPOSURE))));
553	<	return(.5/atof(vval(EXPOSURE)));
552	>	return(.5/pow(2.,vflt(EXPOSURE)));
553	>	return(.5/vflt(EXPOSURE));
554		}
555		if (vlet(ZONE) == 'E')
556		return(10.);
#	Line 737 \| Line 560 \| *ambval() / compute ambient value /*
560		}
561
562
563	<	lowqopts(op) /* low quality rendering options */
563	>	renderopts(op, po) /* set rendering options */
564	>	char op, po;
565	>	{
566	>	switch(vscale(QUALITY)) {
567	>	case LOW:
568	>	lowqopts(op, po);
569	>	break;
570	>	case MEDIUM:
571	>	medqopts(op, po);
572	>	break;
573	>	case HIGH:
574	>	hiqopts(op, po);
575	>	break;
576	>	}
577	>	}
578	>
579	>
580	>	lowqopts(op, po) /* low quality rendering options */
581		register char *op;
582	+	char *po;
583		{
584		double d, org[3], siz[3];
585
586		*op = '\0';
587	+	*po = '\0';
588		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
589		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
590		badvalue(ZONE);
591		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
592	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
593	+	badvalue(ZONE);
594		getoctcube(org, &d);
595		d *= 3./(siz[0]+siz[1]+siz[2]);
596		switch (vscale(DETAIL)) {
597		case LOW:
598	<	op = addarg(op, "-ps 16 -dp 64");
598	>	po = addarg(po, "-ps 16");
599	>	op = addarg(op, "-dp 64");
600		sprintf(op, " -ar %d", (int)(4*d));
601		op += strlen(op);
602		break;
603		case MEDIUM:
604	<	op = addarg(op, "-ps 8 -dp 128");
604	>	po = addarg(po, "-ps 8");
605	>	op = addarg(op, "-dp 128");
606		sprintf(op, " -ar %d", (int)(8*d));
607		op += strlen(op);
608		break;
609		case HIGH:
610	<	op = addarg(op, "-ps 4 -dp 256");
610	>	po = addarg(po, "-ps 4");
611	>	op = addarg(op, "-dp 256");
612		sprintf(op, " -ar %d", (int)(16*d));
613		op += strlen(op);
614		break;
615		}
616	<	op = addarg(op, "-pt .16");
616	>	po = addarg(po, "-pt .16");
617		if (vbool(PENUMBRAS))
618		op = addarg(op, "-ds .4");
619		else
#	Line 798 \| Line 645 \| *register char op;**
645		}
646
647
648	<	medqopts(op) /* medium quality rendering options */
648	>	medqopts(op, po) /* medium quality rendering options */
649		register char *op;
650	+	char *po;
651		{
652	<	double d, org[3], siz[3];
652	>	double d, org[3], siz[3], asz;
653
654		*op = '\0';
655	+	*po = '\0';
656		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
657		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
658		badvalue(ZONE);
659		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
660	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
661	+	badvalue(ZONE);
662		getoctcube(org, &d);
663	<	d *= 3./(siz[0]+siz[1]+siz[2]);
663	>	asz = (siz[0]+siz[1]+siz[2])/3.;
664	>	d /= asz;
665		switch (vscale(DETAIL)) {
666		case LOW:
667	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
667	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
668		op = addarg(op, "-dp 256");
669		sprintf(op, " -ar %d", (int)(8*d));
670		op += strlen(op);
671	+	sprintf(op, " -ms %.2g", asz/20.);
672	+	op += strlen(op);
673		break;
674		case MEDIUM:
675	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
675	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
676		op = addarg(op, "-dp 512");
677		sprintf(op, " -ar %d", (int)(16*d));
678		op += strlen(op);
679	+	sprintf(op, " -ms %.2g", asz/40.);
680	+	op += strlen(op);
681		break;
682		case HIGH:
683	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
683	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
684		op = addarg(op, "-dp 1024");
685		sprintf(op, " -ar %d", (int)(32*d));
686		op += strlen(op);
687	+	sprintf(op, " -ms %.2g", asz/80.);
688	+	op += strlen(op);
689		break;
690		}
691	<	op = addarg(op, "-pt .08");
691	>	po = addarg(po, "-pt .08");
692		if (vbool(PENUMBRAS))
693	<	op = addarg(op, "-ds .2 -dj .35");
693	>	op = addarg(op, "-ds .2 -dj .5");
694		else
695		op = addarg(op, "-ds .3");
696		op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
#	Line 865 \| Line 723 \| *register char op;**
723		}
724
725
726	<	hiqopts(op) /* high quality rendering options */
726	>	hiqopts(op, po) /* high quality rendering options */
727		register char *op;
728	+	char *po;
729		{
730	<	double d, org[3], siz[3];
730	>	double d, org[3], siz[3], asz;
731
732		*op = '\0';
733	+	*po = '\0';
734		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
735		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
736		badvalue(ZONE);
737		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
738	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
739	+	badvalue(ZONE);
740		getoctcube(org, &d);
741	<	d *= 3./(siz[0]+siz[1]+siz[2]);
741	>	asz = (siz[0]+siz[1]+siz[2])/3.;
742	>	d /= asz;
743		switch (vscale(DETAIL)) {
744		case LOW:
745	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
745	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
746		op = addarg(op, "-dp 1024");
747		sprintf(op, " -ar %d", (int)(16*d));
748		op += strlen(op);
749	+	sprintf(op, " -ms %.2g", asz/40.);
750	+	op += strlen(op);
751		break;
752		case MEDIUM:
753	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
753	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
754		op = addarg(op, "-dp 2048");
755		sprintf(op, " -ar %d", (int)(32*d));
756		op += strlen(op);
757	+	sprintf(op, " -ms %.2g", asz/80.);
758	+	op += strlen(op);
759		break;
760		case HIGH:
761	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
761	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
762		op = addarg(op, "-dp 4096");
763		sprintf(op, " -ar %d", (int)(64*d));
764		op += strlen(op);
765	+	sprintf(op, " -ms %.2g", asz/160.);
766	+	op += strlen(op);
767		break;
768		}
769	<	op = addarg(op, "-pt .04");
769	>	po = addarg(po, "-pt .04");
770		if (vbool(PENUMBRAS))
771	<	op = addarg(op, "-ds .1 -dj .7");
771	>	op = addarg(op, "-ds .1 -dj .65");
772		else
773		op = addarg(op, "-ds .2");
774		op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
#	Line 941 \| Line 810 \| *char ro;**
810		return;
811		if (vdef(OPTFILE)) {
812		for (cp = ro; cp[1]; cp++)
813	<	if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3]))
813	>	if (isspace(cp[1]) && (cp[2] == '@' \|\|
814	>	(cp[2] == '-' && isalpha(cp[3]))))
815		*cp = '\n';
816		else
817		*cp = cp[1];
#	Line 970 \| Line 840 \| *register char po;**
840		}
841		switch (vscale(QUALITY)) {
842		case MEDIUM:
843	<	po = addarg(po, "-r 1");
843	>	po = addarg(po, "-r .6");
844		break;
845		case HIGH:
846		po = addarg(po, "-m .25");
#	Line 1036 \| Line 906 \| *register char vs;**
906		zpos = -1; vs++;
907		}
908		viewtype = 'v';
909	<	if (vs == 'v' \| vs == 'l' \| vs == 'a' \| vs == 'h')
909	>	if (vs == 'v' \| vs == 'l' \| vs == 'a' \| vs == 'h' \| *vs == 'c')
910		viewtype = *vs++;
911		cp = viewopts;
912		if ((!vs \|\| isspace(vs)) && (xpos\|ypos\|zpos)) { /* got one! */
#	Line 1047 \| Line 917 \| *register char vs;**
917		badvalue(ZONE);
918		for (i = 0; i < 3; i++) {
919		dim[i] -= cent[i];
920	+	if (dim[i] <= FTINY)
921	+	badvalue(ZONE);
922		cent[i] += .5*dim[i];
923		}
924		mult = vlet(ZONE)=='E' ? 2. : .45 ;
#	Line 1089 \| Line 961 \| *register char vs;**
961		case 'h':
962		cp = addarg(cp, "-vh 180 -vv 180");
963		break;
964	+	case 'c':
965	+	cp = addarg(cp, "-vh 180 -vv 90");
966	+	break;
967		}
968		} else {
969		while (!isspace(vs)) / else skip id */
#	Line 1134 \| Line 1009 \| *char vn; /* returned view name /*
1009		}
1010		/* view number? */
1011		if (isint(viewselect))
1012	<	return(specview(nvalue(vv+VIEW, atoi(viewselect)-1)));
1012	>	return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
1013		/* check list */
1014	<	while ((mv = nvalue(vv+VIEW, n++)) != NULL)
1014	>	while ((mv = nvalue(VIEWS, n++)) != NULL)
1015		if (matchword(viewselect, mv))
1016		return(specview(mv));
1017		return(specview(viewselect)); /* standard view? */
1018		}
1019	<	mv = nvalue(vv+VIEW, n); /* use view n */
1019	>	mv = nvalue(VIEWS, n); /* use view n */
1020		if (vn != NULL & mv != NULL) {
1021		register char *mv2 = mv;
1022		if (*mv2 != '-')
#	Line 1156 \| Line 1031 \| *char vn; /* returned view name /*
1031		printview(vopts) /* print out selected view */
1032		register char *vopts;
1033		{
1034	<	extern char atos(), getenv();
1035	<	char buf[256];
1161	<	FILE *fp;
1034	>	VIEW vwr;
1035	>	char buf[128];
1036		register char *cp;
1037	<
1037	>	again:
1038		if (vopts == NULL)
1039		return(-1);
1166	–	fputs("VIEW=", stdout);
1167	–	do {
1168	–	if (matchword(vopts, "-vf")) { /* expand view file */
1169	–	vopts = sskip(vopts);
1170	–	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(' ');
1040		#ifdef MSDOS
1041	<	if (vopts == '$') { / expand env. var. */
1042	<	if (!*atos(buf, sizeof(buf), vopts+1))
1043	<	return(-1);
1044	<	if ((cp = getenv(buf)) == NULL)
1199	<	return(-1);
1200	<	fputs(cp, stdout);
1201	<	vopts = sskip(vopts);
1202	<	} else
1041	>	if (vopts[0] == '$') {
1042	>	vopts = getenv(vopts+1);
1043	>	goto again;
1044	>	}
1045		#endif
1046	<	while (vopts && !isspace(vopts))
1047	<	putchar(*vopts++);
1048	<	}
1049	<	} while (*vopts++);
1050	<	putchar('\n');
1046	>	copystruct(&vwr, &stdview);
1047	>	sscanview(&vwr, cp=vopts); /* set initial options */
1048	>	while ((cp = strstr(cp, "-vf ")) != NULL &&
1049	>	*atos(buf, sizeof(buf), cp += 4)) {
1050	>	viewfile(buf, &vwr, NULL); /* load -vf file */
1051	>	sscanview(&vwr, cp); /* reset tail */
1052	>	}
1053	>	fputs(VIEWSTR, stdout);
1054	>	fprintview(&vwr, stdout); /* print full spec. */
1055	>	fputc('\n', stdout);
1056		return(0);
1057		}
1058
1059
1060	<	rview(opts) /* run rview with first view */
1061	<	char *opts;
1060	>	rview(opts, po) /* run rview with first view */
1061	>	char opts, po;
1062		{
1063		char *vw;
1064		char combuf[512];
1065		/* build command */
1066	<	if ((vw = getview(0, NULL)) == NULL)
1066	>	if (touchonly \|\| (vw = getview(0, NULL)) == NULL)
1067		return;
1068		if (sayview)
1069		printview(vw);
1070	<	sprintf(combuf, "rview %s%s -R %s ", vw, opts, rifname);
1070	>	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1071		if (rvdevice != NULL)
1072		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1073	+	if (vdef(EXPOSURE))
1074	+	sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1075		strcat(combuf, oct1name);
1076		if (runcom(combuf)) { /* run it */
1077		fprintf(stderr, "%s: error running rview\n", progname);
1078	<	exit(1);
1078	>	quit(1);
1079		}
1080		}
1081
1082
1083	<	rpict(opts) /* run rpict and pfilt for each view */
1084	<	char *opts;
1083	>	rpict(opts, po) /* run rpict and pfilt for each view */
1084	>	char opts, po;
1085		{
1086		char combuf[1024];
1087	<	char rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
1087	>	char rawfile[MAXPATH], picfile[MAXPATH];
1088	>	char zopt[MAXPATH+4], rep[MAXPATH+16], res[32];
1089		char pfopts[128];
1090		char vs[32], *vw;
1091		int vn, mult;
1092	+	time_t rfdt, pfdt;
1093		/* get pfilt options */
1094		pfiltopts(pfopts);
1095		/* get resolution, reporting */
1096	<	mult = vscale(QUALITY)+1;
1096	>	switch (vscale(QUALITY)) {
1097	>	case LOW:
1098	>	mult = 1;
1099	>	break;
1100	>	case MEDIUM:
1101	>	mult = 2;
1102	>	break;
1103	>	case HIGH:
1104	>	mult = 3;
1105	>	break;
1106	>	}
1107		{
1108		int xres, yres;
1109		double aspect;
#	Line 1277 \| Line 1138 \| *char opts;**
1138		if (!vs[0])
1139		sprintf(vs, "%d", vn);
1140		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1141	+	if (vdef(ZFILE))
1142	+	sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1143	+	else
1144	+	zopt[0] = '\0';
1145		/* check date on picture */
1146	<	if (fdate(picfile) >= oct1date)
1146	>	pfdt = fdate(picfile);
1147	>	if (pfdt >= oct1date)
1148		continue;
1149	+	/* get raw file name */
1150	+	sprintf(rawfile, "%s_%s.unf",
1151	+	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs);
1152	+	rfdt = fdate(rawfile);
1153	+	if (touchonly) { /* update times only */
1154	+	if (rfdt) {
1155	+	if (rfdt < oct1date)
1156	+	touch(rawfile);
1157	+	} else if (pfdt && pfdt < oct1date)
1158	+	touch(picfile);
1159	+	continue;
1160	+	}
1161		/* build rpict command */
1162	<	sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1163	<	if (fdate(rawfile) >= oct1date) /* recover */
1164	<	sprintf(combuf, "rpict%s%s -ro %s %s",
1287	<	rep, opts, rawfile, oct1name);
1162	>	if (rfdt >= oct1date) /* recover */
1163	>	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1164	>	rep, po, opts, zopt, rawfile, oct1name);
1165		else {
1166		if (overture) { /* run overture calculation */
1167		sprintf(combuf,
#	Line 1295 \| Line 1172 \| *char opts;**
1172		fprintf(stderr,
1173		"%s: error in overture for view %s\n",
1174		progname, vs);
1175	<	exit(1);
1175	>	quit(1);
1176		}
1177		#ifdef NIX
1178		rmfile(overfile);
1179		#endif
1180		}
1181	<	sprintf(combuf, "rpict%s %s %s%s %s > %s",
1182	<	rep, vw, res, opts,
1181	>	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1182	>	rep, vw, res, po, opts, zopt,
1183		oct1name, rawfile);
1184		}
1185		if (runcom(combuf)) { /* run rpict */
1186		fprintf(stderr, "%s: error rendering view %s\n",
1187		progname, vs);
1188	<	exit(1);
1188	>	quit(1);
1189		}
1190	+	if (!vdef(RAWFILE) \|\| strcmp(vval(RAWFILE),vval(PICTURE))) {
1191		/* build pfilt command */
1192	<	if (mult > 1)
1193	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1192	>	if (mult > 1)
1193	>	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1194		pfopts, mult, mult, rawfile, picfile);
1195	<	else
1196	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1197	<	rawfile, picfile);
1198	<	if (runcom(combuf)) { /* run pfilt */
1199	<	fprintf(stderr,
1200	<	"%s: error filtering view %s\n\t%s removed\n",
1201	<	progname, vs, picfile);
1202	<	unlink(picfile);
1203	<	exit(1);
1195	>	else
1196	>	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1197	>	rawfile, picfile);
1198	>	if (runcom(combuf)) { /* run pfilt */
1199	>	fprintf(stderr,
1200	>	"%s: error filtering view %s\n\t%s removed\n",
1201	>	progname, vs, picfile);
1202	>	unlink(picfile);
1203	>	quit(1);
1204	>	}
1205		}
1206	<	/* remove raw file */
1207	<	rmfile(rawfile);
1206	>	/* remove/rename raw file */
1207	>	if (vdef(RAWFILE)) {
1208	>	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1209	>	mvfile(rawfile, combuf);
1210	>	} else
1211	>	rmfile(rawfile);
1212		}
1213		}
1214
1215
1216	+	touch(fn) /* update a file */
1217	+	char *fn;
1218	+	{
1219	+	if (!silent)
1220	+	printf("\ttouch %s\n", fn);
1221	+	if (noaction)
1222	+	return(0);
1223	+	#ifdef notused
1224	+	if (access(fn, F_OK) == -1) /* create it */
1225	+	if (close(open(fn, O_WRONLY\|O_CREAT, 0666)) == -1)
1226	+	return(-1);
1227	+	#endif
1228	+	return(setfdate(fn, time((time_t *)NULL)));
1229	+	}
1230	+
1231	+
1232		runcom(cs) /* run command */
1233		char *cs;
1234		{
#	Line 1357 \| Line 1256 \| *char fn;**
1256		}
1257
1258
1259	+	mvfile(fold, fnew) /* move a file */
1260	+	char fold, fnew;
1261	+	{
1262	+	if (!silent)
1263		#ifdef MSDOS
1264	+	printf("\trename %s %s\n", fold, fnew);
1265	+	#else
1266	+	printf("\tmv %s %s\n", fold, fnew);
1267	+	#endif
1268	+	if (noaction)
1269	+	return(0);
1270	+	return(rename(fold, fnew));
1271	+	}
1272	+
1273	+
1274	+	#ifdef MSDOS
1275		setenv(vname, value) /* set an environment variable */
1276		char vname, value;
1277		{
#	Line 1369 \| Line 1283 \| *char vname, value;*
1283		sprintf(evp, "%s=%s", vname, value);
1284		if (putenv(evp) != 0) {
1285		fprintf(stderr, "%s: out of environment space\n", progname);
1286	<	exit(1);
1286	>	quit(1);
1287		}
1288		if (!silent)
1289		printf("set %s\n", evp);
#	Line 1382 \| Line 1296 \| int vc;
1296		{
1297		fprintf(stderr, "%s: bad value for variable '%s'\n",
1298		progname, vnam(vc));
1299	<	exit(1);
1299	>	quit(1);
1300		}
1301
1302
#	Line 1390 \| Line 1304 \| *syserr(s) / report a system error and exit /*
1304		char *s;
1305		{
1306		perror(s);
1307	<	exit(1);
1307	>	quit(1);
1308	>	}
1309	>
1310	>
1311	>	void
1312	>	quit(ec) /* exit program */
1313	>	int ec;
1314	>	{
1315	>	exit(ec);
1316		}

Diff Legend

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

Comparing ray/src/util/rad.c (file contents): Revision 2.27 by greg, Sat Sep 25 13:21:35 1993 UTC vs. Revision 2.62 by greg, Fri Mar 21 18:48:46 2003 UTC

Diff Legend

Comparing ray/src/util/rad.c (file contents):
Revision 2.27 by greg, Sat Sep 25 13:21:35 1993 UTC vs.
Revision 2.62 by greg, Fri Mar 21 18:48:46 2003 UTC