ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/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.69 by schorsch, Mon Jul 14 20:02:30 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	+	#include <time.h>
12
13	+	#include "platform.h"
14	+	#include "view.h"
15	+	#include "paths.h"
16	+	#include "vars.h"
17
18	<	typedef struct {
19	<	char    *name;          /* variable name */
20	<	short   nick;           /* # characters required for nickname */
21	<	short   nass;           /* # assignments made */
22	<	char    *value;         /* assigned value(s) */
23	<	int     (*fixval)();    /* assignment checking function */
24	<	} VARIABLE;
18	>	#ifdef _WIN32
19	>	#define DELCMD "del"
20	>	#define RENAMECMD "rename"
21	>	#else
22	>	#define DELCMD "rm -f"
23	>	#define RENAMECMD "mv"
24	>	#endif
25
26	<	int     onevalue(), catvalues();
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 */
44	<	#define EXPOSURE        15              /* picture exposure setting */
45	<	#define RESOLUTION      16              /* maximum picture resolution */
46	<	#define UP              17              /* view up (X, Y or Z) */
47	<	#define INDIRECT        18              /* indirection in lighting */
48	<	#define DETAIL          19              /* level of scene detail */
49	<	#define PENUMBRAS       20              /* shadow penumbras are desired */
50	<	#define VARIABILITY     21              /* level of light variability */
51	<	#define REPORT          22              /* report frequency and errfile */
26	>	/* variables (alphabetical by name) */
27	>	#define AMBFILE         0               /* ambient file name */
28	>	#define DETAIL          1               /* level of scene detail */
29	>	#define EXPOSURE        2               /* picture exposure setting */
30	>	#define EYESEP          3               /* interocular distance */
31	>	#define ILLUM           4               /* mkillum input files */
32	>	#define INDIRECT        5               /* indirection in lighting */
33	>	#define MATERIAL        6               /* material files */
34	>	#define MKILLUM         7               /* mkillum options */
35	>	#define OBJECT          8               /* object files */
36	>	#define OCONV           9               /* oconv options */
37	>	#define OCTREE          10              /* octree file name */
38	>	#define OPTFILE         11              /* rendering options file */
39	>	#define PENUMBRAS       12              /* shadow penumbras are desired */
40	>	#define PFILT           13              /* pfilt options */
41	>	#define PICTURE         14              /* picture file root name */
42	>	#define QUALITY         15              /* desired rendering quality */
43	>	#define RAWFILE         16              /* raw picture file root name */
44	>	#define RENDER          17              /* rendering options */
45	>	#define REPORT          18              /* report frequency and errfile */
46	>	#define RESOLUTION      19              /* maximum picture resolution */
47	>	#define SCENE           20              /* scene files */
48	>	#define UP              21              /* view up (X, Y or Z) */
49	>	#define VARIABILITY     22              /* level of light variability */
50	>	#define VIEWS           23              /* view(s) for picture(s) */
51	>	#define ZFILE           24              /* distance file root name */
52	>	#define ZONE            25              /* simulation zone */
53		/* total number of variables */
54	<	#define NVARS           23
54	>	int NVARS = 26;
55
56	<	VARIABLE        vv[NVARS] = {           /* variable-value pairs */
57	<	{"objects",     3,      0,      NULL,   catvalues},
58	<	{"scene",       3,      0,      NULL,   catvalues},
59	<	{"materials",   3,      0,      NULL,   catvalues},
56	>	VARIABLE        vv[] = {                /* variable-value pairs */
57	>	{"AMBFILE",     3,      0,      NULL,   onevalue},
58	>	{"DETAIL",      3,      0,      NULL,   qualvalue},
59	>	{"EXPOSURE",    3,      0,      NULL,   fltvalue},
60	>	{"EYESEP",      3,      0,      NULL,   fltvalue},
61		{"illum",       3,      0,      NULL,   catvalues},
62	+	{"INDIRECT",    3,      0,      NULL,   intvalue},
63	+	{"materials",   3,      0,      NULL,   catvalues},
64		{"mkillum",     3,      0,      NULL,   catvalues},
65	<	{"render",      3,      0,      NULL,   catvalues},
65	>	{"objects",     3,      0,      NULL,   catvalues},
66		{"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},
67		{"OCTREE",      3,      0,      NULL,   onevalue},
66	–	{"PICTURE",     3,      0,      NULL,   onevalue},
67	–	{"AMBFILE",     3,      0,      NULL,   onevalue},
68		{"OPTFILE",     3,      0,      NULL,   onevalue},
69	<	{"EXPOSURE",    3,      0,      NULL,   onevalue},
69	>	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
70	>	{"pfilt",       2,      0,      NULL,   catvalues},
71	>	{"PICTURE",     3,      0,      NULL,   onevalue},
72	>	{"QUALITY",     3,      0,      NULL,   qualvalue},
73	>	{"RAWFILE",     3,      0,      NULL,   onevalue},
74	>	{"render",      3,      0,      NULL,   catvalues},
75	>	{"REPORT",      3,      0,      NULL,   onevalue},
76		{"RESOLUTION",  3,      0,      NULL,   onevalue},
77	+	{"scene",       3,      0,      NULL,   catvalues},
78		{"UP",          2,      0,      NULL,   onevalue},
79	<	{"INDIRECT",    3,      0,      NULL,   onevalue},
80	<	{"DETAIL",      3,      0,      NULL,   onevalue},
81	<	{"PENUMBRAS",   3,      0,      NULL,   onevalue},
82	<	{"VARIABILITY", 3,      0,      NULL,   onevalue},
76	<	{"REPORT",      3,      0,      NULL,   onevalue},
79	>	{"VARIABILITY", 3,      0,      NULL,   qualvalue},
80	>	{"view",        2,      0,      NULL,   NULL},
81	>	{"ZFILE",       2,      0,      NULL,   onevalue},
82	>	{"ZONE",        2,      0,      NULL,   onevalue},
83		};
84
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	–
85		/* overture calculation file */
86	<	#ifdef NIX
87	<	char    overfile[] = "overture.raw";
86	>	#ifdef NULL_DEVICE
87	>	char    overfile[] = NULL_DEVICE;
88		#else
89	<	char    overfile[] = "/dev/null";
89	>	char    overfile[] = "overture.unf";
90		#endif
91
108	–	extern unsigned long    fdate(), time();
92
93	<	unsigned long   scenedate;      /* date of latest scene or object file */
94	<	unsigned long   octreedate;     /* date of octree */
95	<	unsigned long   matdate;        /* date of latest material file */
96	<	unsigned long   illumdate;      /* date of last illum file */
93	>	time_t  scenedate;              /* date of latest scene or object file */
94	>	time_t  octreedate;             /* date of octree */
95	>	time_t  matdate;                /* date of latest material file */
96	>	time_t  illumdate;              /* date of last illum file */
97
98		char    *oct0name;              /* name of pre-mkillum octree */
99	<	unsigned long   oct0date;       /* date of pre-mkillum octree */
99	>	time_t  oct0date;               /* date of pre-mkillum octree */
100		char    *oct1name;              /* name of post-mkillum octree */
101	<	unsigned long   oct1date;       /* date of post-mkillum octree (>= matdate) */
101	>	time_t  oct1date;               /* date of post-mkillum octree (>= matdate) */
102
103	+	int     nowarn = 0;             /* no warnings */
104		int     explicate = 0;          /* explicate variables */
105		int     silent = 0;             /* do work silently */
106	<	int     noaction = 0;           /* don't do anything */
106	>	int     touchonly = 0;          /* touch files only */
107	>	int     nprocs = 1;             /* maximum executing processes */
108		int     sayview = 0;            /* print view out */
109		char    *rvdevice = NULL;       /* rview output device */
110		char    *viewselect = NULL;     /* specific view only */
111
112		int     overture = 0;           /* overture calculation needed */
113
114	+	int     children_running = 0;   /* set negative in children */
115	+
116		char    *progname;              /* global argv[0] */
117		char    *rifname;               /* global rad input file name */
118
119	<	char    radname[MAXPATH];       /* root Radiance file name */
119	>	char    radname[PATH_MAX];      /* root Radiance file name */
120
121	+	#define inchild()       (children_running < 0)
122
123	+
124		main(argc, argv)
125		int     argc;
126		char    *argv[];
127		{
128		char    ropts[512];
129	+	char    popts[64];
130		int     i;
131
132		progname = argv[0];
#	Line 147 | Line 137 | char   *argv[];
137		silent++;
138		break;
139		case 'n':
140	<	noaction++;
140	>	nprocs = 0;
141		break;
142	+	case 'N':
143	+	nprocs = atoi(argv[++i]);
144	+	if (nprocs < 0)
145	+	nprocs = 0;
146	+	break;
147	+	case 't':
148	+	touchonly++;
149	+	break;
150		case 'e':
151		explicate++;
152		break;
#	Line 161 | Line 159 | char   *argv[];
159		case 'v':
160		viewselect = argv[++i];
161		break;
162	+	case 'w':
163	+	nowarn++;
164	+	break;
165		default:
166		goto userr;
167		}
168		if (i >= argc)
169		goto userr;
170		rifname = argv[i];
171	+	/* check command-line options */
172	+	if (nprocs > 1 & viewselect != NULL)
173	+	nprocs = 1;
174		/* assign Radiance root file name */
175		rootname(radname, rifname);
176		/* load variable values */
177	<	load(rifname);
177	>	loadvars(rifname);
178		/* get any additional assignments */
179		for (i++; i < argc; i++)
180	<	setvariable(argv[i]);
180	>	if (setvariable(argv[i], matchvar) < 0) {
181	>	fprintf(stderr, "%s: unknown variable: %s\n",
182	>	progname, argv[i]);
183	>	quit(1);
184	>	}
185		/* check assignments */
186		checkvalues();
187		/* check files and dates */
#	Line 182 | Line 190 | char   *argv[];
190		setdefaults();
191		/* print all values if requested */
192		if (explicate)
193	<	printvals();
193	>	printvars(stdout);
194		/* build octree (and run mkillum) */
195		oconv();
196		/* check date on ambient file */
197		checkambfile();
198		/* run simulation */
199	<	renderopts(ropts);
199	>	renderopts(ropts, popts);
200		xferopts(ropts);
201		if (rvdevice != NULL)
202	<	rview(ropts);
202	>	rview(ropts, popts);
203		else
204	<	rpict(ropts);
205	<	exit(0);
204	>	rpict(ropts, popts);
205	>	quit(0);
206		userr:
207		fprintf(stderr,
208	<	"Usage: %s [-s][-n][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
208	>	"Usage: %s [-w][-s][-n|-N npr][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
209		progname);
210	<	exit(1);
210	>	quit(1);
211		}
212
213
#	Line 218 | Line 226 | register char  *rn, *fn;
226		}
227
228
229	<	#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
229	>	time_t
230		checklast(fnames)                       /* check files and find most recent */
231		register char   *fnames;
232		{
233	<	char    thisfile[MAXPATH];
234	<	unsigned long   thisdate, lastdate = 0;
411	<	register char   *cp;
233	>	char    thisfile[PATH_MAX];
234	>	time_t  thisdate, lastdate = 0;
235
236		if (fnames == NULL)
237		return(0);
238	<	while (*fnames) {
239	<	while (isspace(*fnames)) fnames++;
240	<	cp = thisfile;
241	<	while (*fnames && !isspace(*fnames))
419	<	*cp++ = *fnames++;
420	<	*cp = '\0';
238	>	while ((fnames = nextword(thisfile, PATH_MAX, fnames)) != NULL) {
239	>	if (thisfile[0] == '!' ||
240	>	(thisfile[0] == '\\' && thisfile[1] == '!'))
241	>	continue;
242		if (!(thisdate = fdate(thisfile)))
243		syserr(thisfile);
244		if (thisdate > lastdate)
#	Line 432 | Line 253 | newfname(orig, pred)           /* create modified file name */
253		char    *orig;
254		int     pred;
255		{
435	–	extern char     *rindex();
256		register char   *cp;
257		register int    n;
258		int     suffix;
#	Line 455 | Line 275 | int    pred;
275
276		checkfiles()                    /* check for existence and modified times */
277		{
278	<	unsigned long   objdate;
278	>	time_t  objdate;
279
280		if (!vdef(OCTREE)) {
281		if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL)
282		syserr(progname);
283		sprintf(vval(OCTREE), "%s.oct", radname);
284		vdef(OCTREE)++;
285	+	} else if (vval(OCTREE)[0] == '!') {
286	+	fprintf(stderr, "%s: illegal '%s' specification\n",
287	+	progname, vnam(OCTREE));
288	+	quit(1);
289		}
290		octreedate = fdate(vval(OCTREE));
291		if (vdef(ILLUM)) {              /* illum requires secondary octrees */
#	Line 478 | Line 302 | checkfiles()                   /* check for existence and modified tim
302		if (!octreedate & !scenedate & !illumdate) {
303		fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname,
304		vnam(OCTREE), vnam(SCENE), vnam(ILLUM));
305	<	exit(1);
305	>	quit(1);
306		}
307		matdate = checklast(vval(MATERIAL));
308		}
#	Line 490 | Line 314 | double org[3], *sizp;
314		extern FILE     *popen();
315		static double   oorg[3], osiz = 0.;
316		double  min[3], max[3];
317	<	char    buf[512];
317	>	char    buf[1024];
318		FILE    *fp;
319		register int    i;
320
321		if (osiz <= FTINY)
322	<	if (noaction && fdate(oct1name) <
322	>	if (!nprocs && fdate(oct1name) <
323		(scenedate>illumdate?scenedate:illumdate)) {
324		/* run getbbox */
325		sprintf(buf, "getbbox -w -h %s",
#	Line 508 | Line 332 | double org[3], *sizp;
332		fprintf(stderr,
333		"%s: error reading bounding box from getbbox\n",
334		progname);
335	<	exit(1);
335	>	quit(1);
336		}
337		for (i = 0; i < 3; i++)
338		if (max[i] - min[i] > osiz)
#	Line 526 | Line 350 | double org[3], *sizp;
350		fprintf(stderr,
351		"%s: error reading bounding cube from getinfo\n",
352		progname);
353	<	exit(1);
353	>	quit(1);
354		}
355		pclose(fp);
356		}
#	Line 536 | Line 360 | double org[3], *sizp;
360
361		setdefaults()                   /* set default values for unassigned var's */
362		{
363	<	double  org[3], size;
363	>	double  org[3], lim[3], size;
364		char    buf[128];
365
366		if (!vdef(ZONE)) {
#	Line 546 | Line 370 | setdefaults()                  /* set default values for unassigned v
370		vval(ZONE) = savqstr(buf);
371		vdef(ZONE)++;
372		}
373	+	if (!vdef(EYESEP)) {
374	+	if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf",
375	+	&org[0], &lim[0], &org[1], &lim[1],
376	+	&org[2], &lim[2]) != 6)
377	+	badvalue(ZONE);
378	+	sprintf(buf, "%f",
379	+	0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2]));
380	+	vval(EYESEP) = savqstr(buf);
381	+	vdef(EYESEP)++;
382	+	}
383		if (!vdef(INDIRECT)) {
384		vval(INDIRECT) = "0";
385		vdef(INDIRECT)++;
#	Line 562 | Line 396 | setdefaults()                  /* set default values for unassigned v
396		vval(PICTURE) = radname;
397		vdef(PICTURE)++;
398		}
399	<	if (!vdef(VIEW)) {
400	<	vval(VIEW) = "X";
401	<	vdef(VIEW)++;
399	>	if (!vdef(VIEWS)) {
400	>	vval(VIEWS) = "X";
401	>	vdef(VIEWS)++;
402		}
403		if (!vdef(DETAIL)) {
404		vval(DETAIL) = "M";
#	Line 581 | Line 415 | setdefaults()                  /* set default values for unassigned v
415		}
416
417
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	–
418		oconv()                         /* run oconv and mkillum if necessary */
419		{
420		static char     illumtmp[] = "ilXXXXXX";
421	<	char    combuf[512], ocopts[64], mkopts[64];
421	>	char    combuf[PATH_MAX], ocopts[64], mkopts[64];
422
423		oconvopts(ocopts);              /* get options */
424		if (octreedate < scenedate) {   /* check date on original octree */
425	<	/* build command */
426	<	if (vdef(MATERIAL))
427	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
428	<	vval(MATERIAL), vval(SCENE), vval(OCTREE));
429	<	else
430	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
431	<	vval(SCENE), vval(OCTREE));
432	<
433	<	if (runcom(combuf)) {           /* run it */
434	<	fprintf(stderr,
425	>	if (touchonly && octreedate)
426	>	touch(vval(OCTREE));
427	>	else {                          /* build command */
428	>	if (vdef(MATERIAL))
429	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
430	>	vval(MATERIAL), vval(SCENE),
431	>	vval(OCTREE));
432	>	else
433	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
434	>	vval(SCENE), vval(OCTREE));
435	>
436	>	if (runcom(combuf)) {           /* run it */
437	>	fprintf(stderr,
438		"%s: error generating octree\n\t%s removed\n",
439	<	progname, vval(OCTREE));
440	<	unlink(vval(OCTREE));
441	<	exit(1);
439	>	progname, vval(OCTREE));
440	>	unlink(vval(OCTREE));
441	>	quit(1);
442	>	}
443		}
444	<	octreedate = time(0);
444	>	octreedate = time((time_t *)NULL);
445	>	if (octreedate < scenedate)     /* in case clock is off */
446	>	octreedate = scenedate;
447		}
448		if (oct1name == vval(OCTREE))           /* no mkillum? */
449		oct1date = octreedate > matdate ? octreedate : matdate;
#	Line 623 | Line 452 | oconv()                                /* run oconv and mkillum if necessary */
452		return;
453		/* make octree0 */
454		if (oct0date < scenedate | oct0date < illumdate) {
455	<	/* build command */
455	>	if (touchonly && oct0date)
456	>	touch(oct0name);
457	>	else {                          /* build command */
458	>	if (octreedate)
459	>	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
460	>	vval(OCTREE), vval(ILLUM), oct0name);
461	>	else if (vdef(MATERIAL))
462	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
463	>	vval(MATERIAL), vval(ILLUM), oct0name);
464	>	else
465	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
466	>	vval(ILLUM), oct0name);
467	>	if (runcom(combuf)) {           /* run it */
468	>	fprintf(stderr,
469	>	"%s: error generating octree\n\t%s removed\n",
470	>	progname, oct0name);
471	>	unlink(oct0name);
472	>	quit(1);
473	>	}
474	>	}
475	>	oct0date = time((time_t *)NULL);
476	>	if (oct0date < octreedate)      /* in case clock is off */
477	>	oct0date = octreedate;
478	>	if (oct0date < illumdate)       /* ditto */
479	>	oct0date = illumdate;
480	>	}
481	>	if (touchonly && oct1date)
482	>	touch(oct1name);
483	>	else {
484	>	mkillumopts(mkopts);            /* build mkillum command */
485	>	mktemp(illumtmp);
486	>	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
487	>	oct0name, vval(ILLUM), illumtmp);
488	>	if (runcom(combuf)) {                   /* run it */
489	>	fprintf(stderr, "%s: error running mkillum\n",
490	>	progname);
491	>	unlink(illumtmp);
492	>	quit(1);
493	>	}
494	>	/* make octree1 (frozen) */
495		if (octreedate)
496	<	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
497	<	vval(OCTREE), vval(ILLUM), oct0name);
496	>	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
497	>	vval(OCTREE), illumtmp, oct1name);
498		else if (vdef(MATERIAL))
499	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
500	<	vval(MATERIAL), vval(ILLUM), oct0name);
499	>	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
500	>	vval(MATERIAL), illumtmp, oct1name);
501		else
502	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
503	<	vval(ILLUM), oct0name);
502	>	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
503	>	illumtmp, oct1name);
504		if (runcom(combuf)) {           /* run it */
505		fprintf(stderr,
506		"%s: error generating octree\n\t%s removed\n",
507	<	progname, oct0name);
508	<	unlink(oct0name);
509	<	exit(1);
507	>	progname, oct1name);
508	>	unlink(oct1name);
509	>	unlink(illumtmp);
510	>	quit(1);
511		}
512	<	oct0date = time(0);
512	>	rmfile(illumtmp);
513		}
514	<	mkillumopts(mkopts);                    /* build mkillum command */
515	<	mktemp(illumtmp);
516	<	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);
514	>	oct1date = time((time_t *)NULL);
515	>	if (oct1date < oct0date)        /* in case clock is off */
516	>	oct1date = oct0date;
517		}
518
519
#	Line 708 | Line 552 | register char  *mo;
552
553		checkambfile()                  /* check date on ambient file */
554		{
555	<	unsigned long   afdate;
555	>	time_t  afdate;
556
557		if (!vdef(AMBFILE))
558		return;
559		if (!(afdate = fdate(vval(AMBFILE))))
560		return;
561		if (oct1date > afdate)
562	<	rmfile(vval(AMBFILE));
562	>	if (touchonly)
563	>	touch(vval(AMBFILE));
564	>	else
565	>	rmfile(vval(AMBFILE));
566		}
567
568
#	Line 723 | Line 570 | double
570		ambval()                                /* compute ambient value */
571		{
572		if (vdef(EXPOSURE)) {
726	–	if (!isflt(vval(EXPOSURE)))
727	–	badvalue(EXPOSURE);
573		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
574	<	return(.5/pow(2.,atof(vval(EXPOSURE))));
575	<	return(.5/atof(vval(EXPOSURE)));
574	>	return(.5/pow(2.,vflt(EXPOSURE)));
575	>	return(.5/vflt(EXPOSURE));
576		}
577		if (vlet(ZONE) == 'E')
578		return(10.);
#	Line 737 | Line 582 | ambval()                               /* compute ambient value */
582		}
583
584
585	<	lowqopts(op)                            /* low quality rendering options */
585	>	renderopts(op, po)                      /* set rendering options */
586	>	char    *op, *po;
587	>	{
588	>	switch(vscale(QUALITY)) {
589	>	case LOW:
590	>	lowqopts(op, po);
591	>	break;
592	>	case MEDIUM:
593	>	medqopts(op, po);
594	>	break;
595	>	case HIGH:
596	>	hiqopts(op, po);
597	>	break;
598	>	}
599	>	}
600	>
601	>
602	>	lowqopts(op, po)                        /* low quality rendering options */
603		register char   *op;
604	+	char    *po;
605		{
606		double  d, org[3], siz[3];
607
608		*op = '\0';
609	+	*po = '\0';
610		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
611		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
612		badvalue(ZONE);
613		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
614	+	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
615	+	badvalue(ZONE);
616		getoctcube(org, &d);
617		d *= 3./(siz[0]+siz[1]+siz[2]);
618		switch (vscale(DETAIL)) {
619		case LOW:
620	<	op = addarg(op, "-ps 16 -dp 64");
620	>	po = addarg(po, "-ps 16");
621	>	op = addarg(op, "-dp 64");
622		sprintf(op, " -ar %d", (int)(4*d));
623		op += strlen(op);
624		break;
625		case MEDIUM:
626	<	op = addarg(op, "-ps 8 -dp 128");
626	>	po = addarg(po, "-ps 8");
627	>	op = addarg(op, "-dp 128");
628		sprintf(op, " -ar %d", (int)(8*d));
629		op += strlen(op);
630		break;
631		case HIGH:
632	<	op = addarg(op, "-ps 4 -dp 256");
632	>	po = addarg(po, "-ps 4");
633	>	op = addarg(op, "-dp 256");
634		sprintf(op, " -ar %d", (int)(16*d));
635		op += strlen(op);
636		break;
637		}
638	<	op = addarg(op, "-pt .16");
638	>	po = addarg(po, "-pt .16");
639		if (vbool(PENUMBRAS))
640		op = addarg(op, "-ds .4");
641		else
#	Line 798 | Line 667 | register char  *op;
667		}
668
669
670	<	medqopts(op)                            /* medium quality rendering options */
670	>	medqopts(op, po)                        /* medium quality rendering options */
671		register char   *op;
672	+	char    *po;
673		{
674	<	double  d, org[3], siz[3];
674	>	double  d, org[3], siz[3], asz;
675
676		*op = '\0';
677	+	*po = '\0';
678		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
679		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
680		badvalue(ZONE);
681		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
682	+	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
683	+	badvalue(ZONE);
684		getoctcube(org, &d);
685	<	d *= 3./(siz[0]+siz[1]+siz[2]);
685	>	asz = (siz[0]+siz[1]+siz[2])/3.;
686	>	d /= asz;
687		switch (vscale(DETAIL)) {
688		case LOW:
689	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
689	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
690		op = addarg(op, "-dp 256");
691		sprintf(op, " -ar %d", (int)(8*d));
692		op += strlen(op);
693	+	sprintf(op, " -ms %.2g", asz/20.);
694	+	op += strlen(op);
695		break;
696		case MEDIUM:
697	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
697	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
698		op = addarg(op, "-dp 512");
699		sprintf(op, " -ar %d", (int)(16*d));
700		op += strlen(op);
701	+	sprintf(op, " -ms %.2g", asz/40.);
702	+	op += strlen(op);
703		break;
704		case HIGH:
705	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
705	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
706		op = addarg(op, "-dp 1024");
707		sprintf(op, " -ar %d", (int)(32*d));
708		op += strlen(op);
709	+	sprintf(op, " -ms %.2g", asz/80.);
710	+	op += strlen(op);
711		break;
712		}
713	<	op = addarg(op, "-pt .08");
713	>	po = addarg(po, "-pt .08");
714		if (vbool(PENUMBRAS))
715	<	op = addarg(op, "-ds .2 -dj .35");
715	>	op = addarg(op, "-ds .2 -dj .5");
716		else
717		op = addarg(op, "-ds .3");
718		op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
#	Line 865 | Line 745 | register char  *op;
745		}
746
747
748	<	hiqopts(op)                             /* high quality rendering options */
748	>	hiqopts(op, po)                         /* high quality rendering options */
749		register char   *op;
750	+	char    *po;
751		{
752	<	double  d, org[3], siz[3];
752	>	double  d, org[3], siz[3], asz;
753
754		*op = '\0';
755	+	*po = '\0';
756		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
757		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
758		badvalue(ZONE);
759		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
760	+	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
761	+	badvalue(ZONE);
762		getoctcube(org, &d);
763	<	d *= 3./(siz[0]+siz[1]+siz[2]);
763	>	asz = (siz[0]+siz[1]+siz[2])/3.;
764	>	d /= asz;
765		switch (vscale(DETAIL)) {
766		case LOW:
767	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
767	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
768		op = addarg(op, "-dp 1024");
769		sprintf(op, " -ar %d", (int)(16*d));
770		op += strlen(op);
771	+	sprintf(op, " -ms %.2g", asz/40.);
772	+	op += strlen(op);
773		break;
774		case MEDIUM:
775	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
775	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
776		op = addarg(op, "-dp 2048");
777		sprintf(op, " -ar %d", (int)(32*d));
778		op += strlen(op);
779	+	sprintf(op, " -ms %.2g", asz/80.);
780	+	op += strlen(op);
781		break;
782		case HIGH:
783	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
783	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
784		op = addarg(op, "-dp 4096");
785		sprintf(op, " -ar %d", (int)(64*d));
786		op += strlen(op);
787	+	sprintf(op, " -ms %.2g", asz/160.);
788	+	op += strlen(op);
789		break;
790		}
791	<	op = addarg(op, "-pt .04");
791	>	po = addarg(po, "-pt .04");
792		if (vbool(PENUMBRAS))
793	<	op = addarg(op, "-ds .1 -dj .7");
793	>	op = addarg(op, "-ds .1 -dj .65");
794		else
795		op = addarg(op, "-ds .2");
796		op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
#	Line 941 | Line 832 | char   *ro;
832		return;
833		if (vdef(OPTFILE)) {
834		for (cp = ro; cp[1]; cp++)
835	<	if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3]))
835	>	if (isspace(cp[1]) && (cp[2] == '@' ||
836	>	(cp[2] == '-' && isalpha(cp[3]))))
837		*cp = '\n';
838		else
839		*cp = cp[1];
#	Line 951 | Line 843 | char   *ro;
843		syserr(vval(OPTFILE));
844		sprintf(ro, " @%s", vval(OPTFILE));
845		}
846	<	#ifdef MSDOS
846	>	#ifdef _WIN32
847		else if (n > 50) {
848		setenv("ROPT", ro+1);
849		strcpy(ro, " $ROPT");
#	Line 970 | Line 862 | register char  *po;
862		}
863		switch (vscale(QUALITY)) {
864		case MEDIUM:
865	<	po = addarg(po, "-r 1");
865	>	po = addarg(po, "-r .6");
866		break;
867		case HIGH:
868		po = addarg(po, "-m .25");
#	Line 1036 | Line 928 | register char  *vs;
928		zpos = -1; vs++;
929		}
930		viewtype = 'v';
931	<	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h')
931	>	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c')
932		viewtype = *vs++;
933		cp = viewopts;
934		if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {       /* got one! */
#	Line 1047 | Line 939 | register char  *vs;
939		badvalue(ZONE);
940		for (i = 0; i < 3; i++) {
941		dim[i] -= cent[i];
942	+	if (dim[i] <= FTINY)
943	+	badvalue(ZONE);
944		cent[i] += .5*dim[i];
945		}
946		mult = vlet(ZONE)=='E' ? 2. : .45 ;
#	Line 1089 | Line 983 | register char  *vs;
983		case 'h':
984		cp = addarg(cp, "-vh 180 -vv 180");
985		break;
986	+	case 'c':
987	+	cp = addarg(cp, "-vh 180 -vv 90");
988	+	break;
989		}
990		} else {
991		while (!isspace(*vs))           /* else skip id */
#	Line 1102 | Line 999 | register char  *vs;
999		if (cp == viewopts)             /* append any additional options */
1000		vs++;           /* skip prefixed space if unneeded */
1001		strcpy(cp, vs);
1002	<	#ifdef MSDOS
1002	>	#ifdef _WIN32
1003		if (strlen(viewopts) > 40) {
1004		setenv("VIEW", viewopts);
1005		return("$VIEW");
#	Line 1134 | Line 1031 | char   *vn;            /* returned view name */
1031		}
1032		/* view number? */
1033		if (isint(viewselect))
1034	<	return(specview(nvalue(vv+VIEW, atoi(viewselect)-1)));
1034	>	return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
1035		/* check list */
1036	<	while ((mv = nvalue(vv+VIEW, n++)) != NULL)
1036	>	while ((mv = nvalue(VIEWS, n++)) != NULL)
1037		if (matchword(viewselect, mv))
1038		return(specview(mv));
1039		return(specview(viewselect));   /* standard view? */
1040		}
1041	<	mv = nvalue(vv+VIEW, n);                /* use view n */
1041	>	mv = nvalue(VIEWS, n);          /* use view n */
1042		if (vn != NULL & mv != NULL) {
1043		register char   *mv2 = mv;
1044		if (*mv2 != '-')
#	Line 1153 | Line 1050 | char   *vn;            /* returned view name */
1050		}
1051
1052
1053	<	printview(vopts)                        /* print out selected view */
1053	>	int
1054	>	myprintview(vopts, fp)                  /* print out selected view */
1055		register char   *vopts;
1056	+	FILE    *fp;
1057		{
1058	<	extern char     *atos(), *getenv();
1059	<	char    buf[256];
1161	<	FILE    *fp;
1058	>	VIEW    vwr;
1059	>	char    buf[128];
1060		register char   *cp;
1061	<
1061	>	again:
1062		if (vopts == NULL)
1063		return(-1);
1064	<	fputs("VIEW=", stdout);
1065	<	do {
1066	<	if (matchword(vopts, "-vf")) {          /* expand view file */
1067	<	vopts = sskip(vopts);
1068	<	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
1064	>	#ifdef _WIN32
1065	>	if (vopts[0] == '$') {
1066	>	vopts = getenv(vopts+1);
1067	>	goto again;
1068	>	}
1069		#endif
1070	<	while (*vopts && !isspace(*vopts))
1071	<	putchar(*vopts++);
1072	<	}
1073	<	} while (*vopts++);
1074	<	putchar('\n');
1070	>	copystruct(&vwr, &stdview);
1071	>	sscanview(&vwr, cp=vopts);              /* set initial options */
1072	>	while ((cp = strstr(cp, "-vf ")) != NULL &&
1073	>	*atos(buf, sizeof(buf), cp += 4)) {
1074	>	viewfile(buf, &vwr, NULL);      /* load -vf file */
1075	>	sscanview(&vwr, cp);            /* reset tail */
1076	>	}
1077	>	fputs(VIEWSTR, fp);
1078	>	fprintview(&vwr, fp);                   /* print full spec. */
1079	>	fputc('\n', fp);
1080		return(0);
1081		}
1082
1083
1084	<	rview(opts)                             /* run rview with first view */
1085	<	char    *opts;
1084	>	rview(opts, po)                         /* run rview with first view */
1085	>	char    *opts, *po;
1086		{
1087		char    *vw;
1088	<	char    combuf[512];
1088	>	char    combuf[PATH_MAX];
1089		/* build command */
1090	<	if ((vw = getview(0, NULL)) == NULL)
1090	>	if (touchonly || (vw = getview(0, NULL)) == NULL)
1091		return;
1092		if (sayview)
1093	<	printview(vw);
1094	<	sprintf(combuf, "rview %s%s -R %s ", vw, opts, rifname);
1093	>	myprintview(vw, stdout);
1094	>	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1095		if (rvdevice != NULL)
1096		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1097	+	if (vdef(EXPOSURE))
1098	+	sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1099		strcat(combuf, oct1name);
1100		if (runcom(combuf)) {           /* run it */
1101		fprintf(stderr, "%s: error running rview\n", progname);
1102	<	exit(1);
1102	>	quit(1);
1103		}
1104		}
1105
1106
1107	<	rpict(opts)                             /* run rpict and pfilt for each view */
1108	<	char    *opts;
1107	>	rpict(opts, po)                         /* run rpict and pfilt for each view */
1108	>	char    *opts, *po;
1109		{
1110	<	char    combuf[1024];
1111	<	char    rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
1110	>	char    combuf[PATH_MAX];
1111	>	char    rawfile[PATH_MAX], picfile[PATH_MAX];
1112	>	char    zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
1113	>	char    rppopt[128], *pfile = NULL;
1114		char    pfopts[128];
1115		char    vs[32], *vw;
1116		int     vn, mult;
1117	+	FILE    *fp;
1118	+	time_t  rfdt, pfdt;
1119		/* get pfilt options */
1120		pfiltopts(pfopts);
1121		/* get resolution, reporting */
1122	<	mult = vscale(QUALITY)+1;
1122	>	switch (vscale(QUALITY)) {
1123	>	case LOW:
1124	>	mult = 1;
1125	>	break;
1126	>	case MEDIUM:
1127	>	mult = 2;
1128	>	break;
1129	>	case HIGH:
1130	>	mult = 3;
1131	>	break;
1132	>	}
1133		{
1134		int     xres, yres;
1135		double  aspect;
#	Line 1269 | Line 1156 | char   *opts;
1156		else
1157		badvalue(REPORT);
1158		}
1159	<	/* do each view */
1160	<	vn = 0;
1159	>	/* set up parallel rendering */
1160	>	if (nprocs > 1 & !vdef(ZFILE)) {
1161	>	strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1162	>	pfile = rppopt+9;
1163	>	if (mktemp(pfile) == NULL)
1164	>	pfile = NULL;
1165	>	}
1166	>	vn = 0;                                 /* do each view */
1167		while ((vw = getview(vn++, vs)) != NULL) {
1168		if (sayview)
1169	<	printview(vw);
1169	>	myprintview(vw, stdout);
1170		if (!vs[0])
1171		sprintf(vs, "%d", vn);
1172		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1173	+	if (vdef(ZFILE))
1174	+	sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1175	+	else
1176	+	zopt[0] = '\0';
1177		/* check date on picture */
1178	<	if (fdate(picfile) >= oct1date)
1178	>	pfdt = fdate(picfile);
1179	>	if (pfdt >= oct1date)
1180		continue;
1181	+	/* get raw file name */
1182	+	sprintf(rawfile, "%s_%s.unf",
1183	+	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs);
1184	+	rfdt = fdate(rawfile);
1185	+	if (touchonly) {                /* update times only */
1186	+	if (rfdt) {
1187	+	if (rfdt < oct1date)
1188	+	touch(rawfile);
1189	+	} else if (pfdt && pfdt < oct1date)
1190	+	touch(picfile);
1191	+	continue;
1192	+	}
1193	+	if (next_process()) {           /* parallel running? */
1194	+	if (pfile != NULL)
1195	+	sleep(20);
1196	+	continue;
1197	+	}
1198	+	/* XXX Remember to call finish_process() */
1199		/* build rpict command */
1200	<	sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1201	<	if (fdate(rawfile) >= oct1date)         /* recover */
1202	<	sprintf(combuf, "rpict%s%s -ro %s %s",
1203	<	rep, opts, rawfile, oct1name);
1204	<	else {
1200	>	if (rfdt >= oct1date) {         /* recover */
1201	>	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1202	>	rep, po, opts, zopt, rawfile, oct1name);
1203	>	if (runcom(combuf))     /* run rpict */
1204	>	goto rperror;
1205	>	} else {
1206		if (overture) {         /* run overture calculation */
1207		sprintf(combuf,
1208		"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
#	Line 1295 | Line 1212 | char   *opts;
1212		fprintf(stderr,
1213		"%s: error in overture for view %s\n",
1214		progname, vs);
1215	<	exit(1);
1215	>	quit(1);
1216		}
1217	<	#ifdef NIX
1217	>	#ifndef NULL_DEVICE
1218		rmfile(overfile);
1219		#endif
1220		}
1221	<	sprintf(combuf, "rpict%s %s %s%s %s > %s",
1222	<	rep, vw, res, opts,
1223	<	oct1name, rawfile);
1221	>	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1222	>	rep, vw, res, po, opts,
1223	>	zopt, oct1name, rawfile);
1224	>	if (pfile != NULL && inchild()) {
1225	>	/* rpict persistent mode */
1226	>	if (!silent)
1227	>	printf("\t%s\n", combuf);
1228	>	sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
1229	>	rep, rppopt, res, po, opts,
1230	>	oct1name, rawfile);
1231	>	fflush(stdout);
1232	>	fp = popen(combuf, "w");
1233	>	if (fp == NULL)
1234	>	goto rperror;
1235	>	myprintview(vw, fp);
1236	>	if (pclose(fp))
1237	>	goto rperror;
1238	>	} else {                /* rpict normal mode */
1239	>	if (runcom(combuf))
1240	>	goto rperror;
1241	>	}
1242		}
1243	<	if (runcom(combuf)) {           /* run rpict */
1309	<	fprintf(stderr, "%s: error rendering view %s\n",
1310	<	progname, vs);
1311	<	exit(1);
1312	<	}
1243	>	if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1244		/* build pfilt command */
1245	<	if (mult > 1)
1246	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1245	>	if (mult > 1)
1246	>	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1247		pfopts, mult, mult, rawfile, picfile);
1248	<	else
1249	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1250	<	rawfile, picfile);
1251	<	if (runcom(combuf)) {           /* run pfilt */
1252	<	fprintf(stderr,
1253	<	"%s: error filtering view %s\n\t%s removed\n",
1254	<	progname, vs, picfile);
1255	<	unlink(picfile);
1256	<	exit(1);
1248	>	else
1249	>	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1250	>	rawfile, picfile);
1251	>	if (runcom(combuf)) {   /* run pfilt */
1252	>	fprintf(stderr,
1253	>	"%s: error filtering view %s\n\t%s removed\n",
1254	>	progname, vs, picfile);
1255	>	unlink(picfile);
1256	>	quit(1);
1257	>	}
1258		}
1259	<	/* remove raw file */
1260	<	rmfile(rawfile);
1259	>	/* remove/rename raw file */
1260	>	if (vdef(RAWFILE)) {
1261	>	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1262	>	mvfile(rawfile, combuf);
1263	>	} else
1264	>	rmfile(rawfile);
1265	>	finish_process();               /* leave if child */
1266		}
1267	+	wait_process(1);                /* wait for children to finish */
1268	+	if (pfile != NULL) {            /* clean up rpict persistent mode */
1269	+	int     pid;
1270	+	fp = fopen(pfile, "r");
1271	+	if (fp != NULL) {
1272	+	if (fscanf(fp, "%*s %d", &pid) != 1 ||
1273	+	kill(pid, 1) == -1)
1274	+	unlink(pfile);
1275	+	fclose(fp);
1276	+	}
1277	+	}
1278	+	return;
1279	+	rperror:
1280	+	fprintf(stderr, "%s: error rendering view %s\n", progname, vs);
1281	+	quit(1);
1282		}
1283
1284
1285	+	touch(fn)                       /* update a file */
1286	+	char    *fn;
1287	+	{
1288	+	if (!silent)
1289	+	printf("\ttouch %s\n", fn);
1290	+	if (!nprocs)
1291	+	return(0);
1292	+	#ifdef notused
1293	+	if (access(fn, F_OK) == -1)             /* create it */
1294	+	if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
1295	+	return(-1);
1296	+	#endif
1297	+	return(setfdate(fn, time((time_t *)NULL)));
1298	+	}
1299	+
1300	+
1301		runcom(cs)                      /* run command */
1302		char    *cs;
1303		{
1304		if (!silent)            /* echo it */
1305		printf("\t%s\n", cs);
1306	<	if (noaction)
1306	>	if (!nprocs)
1307		return(0);
1308		fflush(stdout);         /* flush output and pass to shell */
1309		return(system(cs));
#	Line 1346 | Line 1314 | rmfile(fn)                     /* remove a file */
1314		char    *fn;
1315		{
1316		if (!silent)
1317	<	#ifdef MSDOS
1318	<	printf("\tdel %s\n", fn);
1351	<	#else
1352	<	printf("\trm -f %s\n", fn);
1353	<	#endif
1354	<	if (noaction)
1317	>	printf("\t%s %s\n", DELCMD, fn);
1318	>	if (!nprocs)
1319		return(0);
1320		return(unlink(fn));
1321		}
1322
1323
1324	<	#ifdef MSDOS
1324	>	mvfile(fold, fnew)              /* move a file */
1325	>	char    *fold, *fnew;
1326	>	{
1327	>	if (!silent)
1328	>	printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
1329	>	if (!nprocs)
1330	>	return(0);
1331	>	return(rename(fold, fnew));
1332	>	}
1333	>
1334	>
1335	>	#ifdef RHAS_FORK_EXEC
1336	>	int
1337	>	next_process()                  /* fork the next process (max. nprocs) */
1338	>	{
1339	>	int     child_pid;
1340	>
1341	>	if (nprocs <= 1)
1342	>	return(0);              /* it's us or no one */
1343	>	if (inchild()) {
1344	>	fprintf(stderr, "%s: internal error 1 in spawn_process()\n",
1345	>	progname);
1346	>	quit(1);
1347	>	}
1348	>	if (children_running >= nprocs)
1349	>	wait_process(0);        /* wait for someone to finish */
1350	>	fflush(stdout);
1351	>	child_pid = fork();             /* split process */
1352	>	if (child_pid == 0) {           /* we're the child */
1353	>	children_running = -1;
1354	>	return(0);
1355	>	}
1356	>	if (child_pid > 0) {            /* we're the parent */
1357	>	++children_running;
1358	>	return(1);
1359	>	}
1360	>	fprintf(stderr, "%s: warning -- fork() failed\n", progname);
1361	>	return(0);
1362	>	}
1363	>
1364	>	wait_process(all)                       /* wait for process(es) to finish */
1365	>	int     all;
1366	>	{
1367	>	int     ourstatus = 0;
1368	>	int     pid, status;
1369	>
1370	>	if (all)
1371	>	all = children_running;
1372	>	else if (children_running > 0)
1373	>	all = 1;
1374	>	while (all-- > 0) {
1375	>	pid = wait(&status);
1376	>	if (pid < 0)
1377	>	syserr(progname);
1378	>	status = status>>8 & 0xff;
1379	>	--children_running;
1380	>	if (status != 0) {      /* child's problem is our problem */
1381	>	if (ourstatus == 0 & children_running > 0)
1382	>	fprintf(stderr, "%s: waiting for remaining processes\n",
1383	>	progname);
1384	>	ourstatus = status;
1385	>	all = children_running;
1386	>	}
1387	>	}
1388	>	if (ourstatus != 0)
1389	>	quit(ourstatus);        /* bad status from child */
1390	>	}
1391	>	#else   /* ! RHAS_FORK_EXEC */
1392	>	int
1393	>	next_process()
1394	>	{
1395	>	return(0);                      /* cannot start new process */
1396	>	}
1397	>	wait_process(all)
1398	>	int     all;
1399	>	{
1400	>	(void)all;                      /* no one to wait for */
1401	>	}
1402	>	int
1403	>	kill(pid, sig) /* win|unix_process.c should also wait and kill */
1404	>	int pid, sig;
1405	>	{
1406	>	return 0;
1407	>	}
1408	>	#endif  /* ! RHAS_FORK_EXEC */
1409	>
1410	>	finish_process()                        /* exit a child process */
1411	>	{
1412	>	if (!inchild())
1413	>	return;                 /* in parent -- noop */
1414	>	exit(0);
1415	>	}
1416	>
1417	>	#ifdef _WIN32
1418		setenv(vname, value)            /* set an environment variable */
1419		char    *vname, *value;
1420		{
#	Line 1369 | Line 1426 | char   *vname, *value;
1426		sprintf(evp, "%s=%s", vname, value);
1427		if (putenv(evp) != 0) {
1428		fprintf(stderr, "%s: out of environment space\n", progname);
1429	<	exit(1);
1429	>	quit(1);
1430		}
1431		if (!silent)
1432		printf("set %s\n", evp);
#	Line 1382 | Line 1439 | int    vc;
1439		{
1440		fprintf(stderr, "%s: bad value for variable '%s'\n",
1441		progname, vnam(vc));
1442	<	exit(1);
1442	>	quit(1);
1443		}
1444
1445
#	Line 1390 | Line 1447 | syserr(s)                      /* report a system error and exit */
1447		char    *s;
1448		{
1449		perror(s);
1450	<	exit(1);
1450	>	quit(1);
1451	>	}
1452	>
1453	>
1454	>	void
1455	>	quit(ec)                        /* exit program */
1456	>	int     ec;
1457	>	{
1458	>	exit(ec);
1459		}

Diff Legend

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