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

Comparing ray/src/util/rad.c (file contents):
Revision 2.32 by greg, Tue Nov 16 11:44:08 1993 UTC vs.
Revision 2.53 by greg, Thu Mar 20 12:50:07 1997 UTC

#	Line 1 \| Line 1
1	<	/* Copyright (c) 1993 Regents of the University of California */
1	>	/* Copyright (c) 1995 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 10 \| Line 10 \| static char SCCSid[] = "$SunId$ LBL";
10
11		#include "standard.h"
12		#include "paths.h"
13	+	#include "vars.h"
14		#include <ctype.h>
15	+	#include <sys/types.h>
16
15	–
16	–	typedef struct {
17	–	char name; / variable name */
18	–	short nick; /* # characters required for nickname */
19	–	short nass; /* # assignments made */
20	–	char value; / assigned value(s) */
21	–	int (fixval)(); / assignment checking function */
22	–	} VARIABLE;
23	–
24	–	int onevalue(), catvalues(), boolvalue(),
25	–	qualvalue(), fltvalue(), intvalue();
26	–
17		/* variables */
18		#define OBJECT 0 /* object files */
19		#define SCENE 1 /* scene files */
#	Line 37 \| Line 27 \| int onevalue(), catvalues(), boolvalue(),
27		#define ZONE 9 /* simulation zone */
28		#define QUALITY 10 /* desired rendering quality */
29		#define OCTREE 11 /* octree file name */
30	<	#define PICTURE 12 /* picture file name */
30	>	#define PICTURE 12 /* picture file root name */
31		#define AMBFILE 13 /* ambient file name */
32		#define OPTFILE 14 /* rendering options file */
33		#define EXPOSURE 15 /* picture exposure setting */
#	Line 48 \| Line 38 \| int onevalue(), catvalues(), boolvalue(),
38		#define PENUMBRAS 20 /* shadow penumbras are desired */
39		#define VARIABILITY 21 /* level of light variability */
40		#define REPORT 22 /* report frequency and errfile */
41	+	#define RAWFILE 23 /* raw picture file root name */
42	+	#define ZFILE 24 /* distance file root name */
43		/* total number of variables */
44	<	#define NVARS 23
44	>	int NVARS = 25;
45
46	<	VARIABLE vv[NVARS] = { /* variable-value pairs */
46	>	VARIABLE vv[] = { /* variable-value pairs */
47		{"objects", 3, 0, NULL, catvalues},
48		{"scene", 3, 0, NULL, catvalues},
49		{"materials", 3, 0, NULL, catvalues},
#	Line 75 \| Line 67 \| *VARIABLE vv[NVARS] = { / variable-value pairs /*
67		{"PENUMBRAS", 3, 0, NULL, boolvalue},
68		{"VARIABILITY", 3, 0, NULL, qualvalue},
69		{"REPORT", 3, 0, NULL, onevalue},
70	+	{"RAWFILE", 3, 0, NULL, onevalue},
71	+	{"ZFILE", 2, 0, NULL, onevalue},
72		};
73
80	–	VARIABLE *matchvar();
81	–	char *nvalue();
82	–
83	–	#define UPPER(c) ((c)&~0x20) /* ASCII trick */
84	–
85	–	#define vnam(vc) (vv[vc].name)
86	–	#define vdef(vc) (vv[vc].nass)
87	–	#define vval(vc) (vv[vc].value)
88	–	#define vint(vc) atoi(vval(vc))
89	–	#define vlet(vc) UPPER(vval(vc)[0])
90	–	#define vscale vlet
91	–	#define vbool(vc) (vlet(vc)=='T')
92	–
93	–	#define HIGH 'H'
94	–	#define MEDIUM 'M'
95	–	#define LOW 'L'
96	–
74		/* overture calculation file */
75		#ifdef NIX
76	<	char overfile[] = "overture.raw";
76	>	char overfile[] = "overture.unf";
77		#else
78		char overfile[] = "/dev/null";
79		#endif
80
81	<	extern unsigned long fdate(), time();
81	>	extern time_t fdate(), time();
82
83	<	unsigned long scenedate; /* date of latest scene or object file */
84	<	unsigned long octreedate; /* date of octree */
85	<	unsigned long matdate; /* date of latest material file */
86	<	unsigned long illumdate; /* date of last illum file */
83	>	time_t scenedate; /* date of latest scene or object file */
84	>	time_t octreedate; /* date of octree */
85	>	time_t matdate; /* date of latest material file */
86	>	time_t illumdate; /* date of last illum file */
87
88		char oct0name; / name of pre-mkillum octree */
89	<	unsigned long oct0date; /* date of pre-mkillum octree */
89	>	time_t oct0date; /* date of pre-mkillum octree */
90		char oct1name; / name of post-mkillum octree */
91	<	unsigned long oct1date; /* date of post-mkillum octree (>= matdate) */
91	>	time_t oct1date; /* date of post-mkillum octree (>= matdate) */
92
93	+	int nowarn = 0; /* no warnings */
94		int explicate = 0; /* explicate variables */
95		int silent = 0; /* do work silently */
96	+	int touchonly = 0; /* touch files only */
97		int noaction = 0; /* don't do anything */
98		int sayview = 0; /* print view out */
99		char rvdevice = NULL; / rview output device */
#	Line 133 \| Line 112 \| int argc;
112		char *argv[];
113		{
114		char ropts[512];
115	+	char popts[64];
116		int i;
117
118		progname = argv[0];
#	Line 145 \| Line 125 \| *char argv[];**
125		case 'n':
126		noaction++;
127		break;
128	+	case 't':
129	+	touchonly++;
130	+	break;
131		case 'e':
132		explicate++;
133		break;
#	Line 157 \| Line 140 \| *char argv[];**
140		case 'v':
141		viewselect = argv[++i];
142		break;
143	+	case 'w':
144	+	nowarn++;
145	+	break;
146		default:
147		goto userr;
148		}
#	Line 166 \| Line 152 \| *char argv[];**
152		/* assign Radiance root file name */
153		rootname(radname, rifname);
154		/* load variable values */
155	<	load(rifname);
155	>	loadvars(rifname);
156		/* get any additional assignments */
157		for (i++; i < argc; i++)
158	<	setvariable(argv[i]);
158	>	if (setvariable(argv[i], matchvar) < 0) {
159	>	fprintf(stderr, "%s: unknown variable: %s\n",
160	>	progname, argv[i]);
161	>	quit(1);
162	>	}
163		/* check assignments */
164		checkvalues();
165		/* check files and dates */
#	Line 178 \| Line 168 \| *char argv[];**
168		setdefaults();
169		/* print all values if requested */
170		if (explicate)
171	<	printvals();
171	>	printvars(stdout);
172		/* build octree (and run mkillum) */
173		oconv();
174		/* check date on ambient file */
175		checkambfile();
176		/* run simulation */
177	<	renderopts(ropts);
177	>	renderopts(ropts, popts);
178		xferopts(ropts);
179		if (rvdevice != NULL)
180	<	rview(ropts);
180	>	rview(ropts, popts);
181		else
182	<	rpict(ropts);
183	<	exit(0);
182	>	rpict(ropts, popts);
183	>	quit(0);
184		userr:
185		fprintf(stderr,
186	<	"Usage: %s [-s][-n][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
186	>	"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
187		progname);
188	<	exit(1);
188	>	quit(1);
189		}
190
191
#	Line 214 \| Line 204 \| *register char rn, fn;*
204		}
205
206
207	<	#define NOCHAR 127 /* constant for character to delete */
218	<
219	<
220	<	load(rfname) /* load Radiance simulation file */
221	<	char *rfname;
222	<	{
223	<	FILE *fp;
224	<	char buf[512];
225	<	register char *cp;
226	<
227	<	if (rfname == NULL)
228	<	fp = stdin;
229	<	else if ((fp = fopen(rfname, "r")) == NULL)
230	<	syserr(rfname);
231	<	while (fgetline(buf, sizeof(buf), fp) != NULL) {
232	<	for (cp = buf; *cp; cp++) {
233	<	switch (*cp) {
234	<	case '\\':
235	<	*cp++ = NOCHAR;
236	<	continue;
237	<	case '#':
238	<	*cp = '\0';
239	<	break;
240	<	default:
241	<	continue;
242	<	}
243	<	break;
244	<	}
245	<	setvariable(buf);
246	<	}
247	<	fclose(fp);
248	<	}
249	<
250	<
251	<	setvariable(ass) /* assign variable according to string */
252	<	register char *ass;
253	<	{
254	<	char varname[32];
255	<	char varval[512];
256	<	int n;
257	<	register char *cp;
258	<	register VARIABLE *vp;
259	<	register int i;
260	<
261	<	while (isspace(ass)) / skip leading space */
262	<	ass++;
263	<	cp = varname; /* extract name */
264	<	while (cp < varname+sizeof(varname)-1
265	<	&& ass && !isspace(ass) && *ass != '=')
266	<	cp++ = ass++;
267	<	*cp = '\0';
268	<	if (!varname[0])
269	<	return; /* no variable name! */
270	<	/* trim value */
271	<	while (isspace(ass) \|\| ass == '=')
272	<	ass++;
273	<	for (n = strlen(ass); n > 0; n--)
274	<	if (!isspace(ass[n-1]))
275	<	break;
276	<	if (!n) {
277	<	fprintf(stderr, "%s: warning - missing value for variable '%s'\n",
278	<	progname, varname);
279	<	return;
280	<	}
281	<	/* match variable from list */
282	<	vp = matchvar(varname);
283	<	if (vp == NULL) {
284	<	fprintf(stderr, "%s: unknown variable '%s'\n",
285	<	progname, varname);
286	<	exit(1);
287	<	}
288	<	/* assign new value */
289	<	if (i = vp->nass) {
290	<	cp = vp->value;
291	<	while (i--)
292	<	while (*cp++)
293	<	;
294	<	i = cp - vp->value;
295	<	vp->value = realloc(vp->value, i+n+1);
296	<	} else
297	<	vp->value = malloc(n+1);
298	<	if (vp->value == NULL)
299	<	syserr(progname);
300	<	cp = vp->value+i; /* copy value, squeezing spaces */
301	<	cp = ass;
302	<	for (i = 1; i <= n; i++) {
303	<	if (ass[i] == NOCHAR)
304	<	continue;
305	<	if (isspace(*cp))
306	<	while (isspace(ass[i]))
307	<	i++;
308	<	*++cp = ass[i];
309	<	}
310	<	if (isspace(cp)) / remove trailing space */
311	<	*cp = '\0';
312	<	vp->nass++;
313	<	}
314	<
315	<
316	<	VARIABLE *
317	<	matchvar(nam) /* match a variable by its name */
318	<	char *nam;
319	<	{
320	<	int n = strlen(nam);
321	<	register int i;
322	<
323	<	for (i = 0; i < NVARS; i++)
324	<	if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n))
325	<	return(vv+i);
326	<	return(NULL);
327	<	}
328	<
329	<
330	<	char *
331	<	nvalue(vp, n) /* return nth variable value */
332	<	VARIABLE *vp;
333	<	register int n;
334	<	{
335	<	register char *cp;
336	<
337	<	if (vp == NULL \| n < 0 \| n >= vp->nass)
338	<	return(NULL);
339	<	cp = vp->value;
340	<	while (n--)
341	<	while (*cp++)
342	<	;
343	<	return(cp);
344	<	}
345	<
346	<
347	<	checkvalues() /* check assignments */
348	<	{
349	<	register int i;
350	<
351	<	for (i = 0; i < NVARS; i++)
352	<	if (vv[i].fixval != NULL)
353	<	(*vv[i].fixval)(vv+i);
354	<	}
355	<
356	<
357	<	onevalue(vp) /* only one assignment for this variable */
358	<	register VARIABLE *vp;
359	<	{
360	<	if (vp->nass < 2)
361	<	return;
362	<	fprintf(stderr, "%s: warning - multiple assignment of variable '%s'\n",
363	<	progname, vp->name);
364	<	do
365	<	vp->value += strlen(vp->value)+1;
366	<	while (--vp->nass > 1);
367	<	}
368	<
369	<
370	<	catvalues(vp) /* concatenate variable values */
371	<	register VARIABLE *vp;
372	<	{
373	<	register char *cp;
374	<
375	<	if (vp->nass < 2)
376	<	return;
377	<	for (cp = vp->value; vp->nass > 1; vp->nass--) {
378	<	while (*cp)
379	<	cp++;
380	<	*cp++ = ' ';
381	<	}
382	<	}
383	<
384	<
385	<	int
386	<	badmatch(tv, cv) /* case insensitive truncated comparison */
387	<	register char tv, cv;
388	<	{
389	<	if (!tv) return(1); / null string cannot match */
390	<	do
391	<	if (UPPER(tv) != cv++)
392	<	return(1);
393	<	while (*++tv);
394	<	return(0); /* OK */
395	<	}
396	<
397	<
398	<	boolvalue(vp) /* check boolean for legal values */
399	<	register VARIABLE *vp;
400	<	{
401	<	if (!vp->nass) return;
402	<	onevalue(vp);
403	<	switch (UPPER(vp->value[0])) {
404	<	case 'T':
405	<	if (badmatch(vp->value, "TRUE")) break;
406	<	return;
407	<	case 'F':
408	<	if (badmatch(vp->value, "FALSE")) break;
409	<	return;
410	<	}
411	<	fprintf(stderr, "%s: illegal value for boolean variable '%s'\n",
412	<	progname, vp->name);
413	<	exit(1);
414	<	}
415	<
416	<
417	<	qualvalue(vp) /* check qualitative var. for legal values */
418	<	register VARIABLE *vp;
419	<	{
420	<	if (!vp->nass) return;
421	<	onevalue(vp);
422	<	switch (UPPER(vp->value[0])) {
423	<	case 'L':
424	<	if (badmatch(vp->value, "LOW")) break;
425	<	return;
426	<	case 'M':
427	<	if (badmatch(vp->value, "MEDIUM")) break;
428	<	return;
429	<	case 'H':
430	<	if (badmatch(vp->value, "HIGH")) break;
431	<	return;
432	<	}
433	<	fprintf(stderr, "%s: illegal value for qualitative variable '%s'\n",
434	<	progname, vp->name);
435	<	exit(1);
436	<	}
437	<
438	<
439	<	intvalue(vp) /* check integer variable for legal values */
440	<	register VARIABLE *vp;
441	<	{
442	<	if (!vp->nass) return;
443	<	onevalue(vp);
444	<	if (isint(vp->value)) return;
445	<	fprintf(stderr, "%s: illegal value for integer variable '%s'\n",
446	<	progname, vp->name);
447	<	exit(1);
448	<	}
449	<
450	<
451	<	fltvalue(vp) /* check float variable for legal values */
452	<	register VARIABLE *vp;
453	<	{
454	<	if (!vp->nass) return;
455	<	onevalue(vp);
456	<	if (isflt(vp->value)) return;
457	<	fprintf(stderr, "%s: illegal value for real variable '%s'\n",
458	<	progname, vp->name);
459	<	exit(1);
460	<	}
461	<
462	<
463	<	unsigned long
207	>	time_t
208		checklast(fnames) /* check files and find most recent */
209		register char *fnames;
210		{
211		char thisfile[MAXPATH];
212	<	unsigned long thisdate, lastdate = 0;
212	>	time_t thisdate, lastdate = 0;
213		register char *cp;
214
215		if (fnames == NULL)
#	Line 513 \| Line 257 \| int pred;
257
258		checkfiles() /* check for existence and modified times */
259		{
260	<	unsigned long objdate;
260	>	time_t objdate;
261
262		if (!vdef(OCTREE)) {
263		if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL)
#	Line 536 \| 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 548 \| 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 566 \| 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 584 \| 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 639 \| Line 383 \| *setdefaults() / set default values for unassigned v**
383		}
384
385
642	–	printvals() /* print variable values */
643	–	{
644	–	register int i, j;
645	–
646	–	for (i = 0; i < NVARS; i++)
647	–	for (j = 0; j < vdef(i); j++)
648	–	printf("%s= %s\n", vnam(i), nvalue(vv+i, j));
649	–	fflush(stdout);
650	–	}
651	–
652	–
386		oconv() /* run oconv and mkillum if necessary */
387		{
388		static char illumtmp[] = "ilXXXXXX";
389	<	char combuf[512], ocopts[64], mkopts[64];
389	>	char combuf[1024], ocopts[64], mkopts[64];
390
391		oconvopts(ocopts); /* get options */
392		if (octreedate < scenedate) { /* check date on original octree */
393	<	/* build command */
394	<	if (vdef(MATERIAL))
395	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
396	<	vval(MATERIAL), vval(SCENE), vval(OCTREE));
397	<	else
398	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
399	<	vval(SCENE), vval(OCTREE));
400	<
401	<	if (runcom(combuf)) { /* run it */
402	<	fprintf(stderr,
393	>	if (touchonly && octreedate)
394	>	touch(vval(OCTREE));
395	>	else { /* build command */
396	>	if (vdef(MATERIAL))
397	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
398	>	vval(MATERIAL), vval(SCENE),
399	>	vval(OCTREE));
400	>	else
401	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
402	>	vval(SCENE), vval(OCTREE));
403	>
404	>	if (runcom(combuf)) { /* run it */
405	>	fprintf(stderr,
406		"%s: error generating octree\n\t%s removed\n",
407	<	progname, vval(OCTREE));
408	<	unlink(vval(OCTREE));
409	<	exit(1);
407	>	progname, vval(OCTREE));
408	>	unlink(vval(OCTREE));
409	>	quit(1);
410	>	}
411		}
412	<	octreedate = time(0);
412	>	octreedate = time((time_t *)NULL);
413	>	if (octreedate < scenedate) /* in case clock is off */
414	>	octreedate = scenedate;
415		}
416		if (oct1name == vval(OCTREE)) /* no mkillum? */
417		oct1date = octreedate > matdate ? octreedate : matdate;
#	Line 681 \| Line 420 \| *oconv() / run oconv and mkillum if necessary /*
420		return;
421		/* make octree0 */
422		if (oct0date < scenedate \| oct0date < illumdate) {
423	<	/* build command */
423	>	if (touchonly && oct0date)
424	>	touch(oct0name);
425	>	else { /* build command */
426	>	if (octreedate)
427	>	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
428	>	vval(OCTREE), vval(ILLUM), oct0name);
429	>	else if (vdef(MATERIAL))
430	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
431	>	vval(MATERIAL), vval(ILLUM), oct0name);
432	>	else
433	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
434	>	vval(ILLUM), oct0name);
435	>	if (runcom(combuf)) { /* run it */
436	>	fprintf(stderr,
437	>	"%s: error generating octree\n\t%s removed\n",
438	>	progname, oct0name);
439	>	unlink(oct0name);
440	>	quit(1);
441	>	}
442	>	}
443	>	oct0date = time((time_t *)NULL);
444	>	if (oct0date < octreedate) /* in case clock is off */
445	>	oct0date = octreedate;
446	>	if (oct0date < illumdate) /* ditto */
447	>	oct0date = illumdate;
448	>	}
449	>	if (touchonly && oct1date)
450	>	touch(oct1name);
451	>	else {
452	>	mkillumopts(mkopts); /* build mkillum command */
453	>	mktemp(illumtmp);
454	>	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
455	>	oct0name, vval(ILLUM), illumtmp);
456	>	if (runcom(combuf)) { /* run it */
457	>	fprintf(stderr, "%s: error running mkillum\n",
458	>	progname);
459	>	unlink(illumtmp);
460	>	quit(1);
461	>	}
462	>	/* make octree1 (frozen) */
463		if (octreedate)
464	<	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
465	<	vval(OCTREE), vval(ILLUM), oct0name);
464	>	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
465	>	vval(OCTREE), illumtmp, oct1name);
466		else if (vdef(MATERIAL))
467	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
468	<	vval(MATERIAL), vval(ILLUM), oct0name);
467	>	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
468	>	vval(MATERIAL), illumtmp, oct1name);
469		else
470	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
471	<	vval(ILLUM), oct0name);
470	>	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
471	>	illumtmp, oct1name);
472		if (runcom(combuf)) { /* run it */
473		fprintf(stderr,
474		"%s: error generating octree\n\t%s removed\n",
475	<	progname, oct0name);
476	<	unlink(oct0name);
477	<	exit(1);
475	>	progname, oct1name);
476	>	unlink(oct1name);
477	>	unlink(illumtmp);
478	>	quit(1);
479		}
480	<	oct0date = time(0);
480	>	rmfile(illumtmp);
481		}
482	<	mkillumopts(mkopts); /* build mkillum command */
483	<	mktemp(illumtmp);
484	<	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
706	<	oct0name, vval(ILLUM), illumtmp);
707	<	if (runcom(combuf)) { /* run it */
708	<	fprintf(stderr, "%s: error running mkillum\n", progname);
709	<	unlink(illumtmp);
710	<	exit(1);
711	<	}
712	<	/* make octree1 (frozen) */
713	<	if (octreedate)
714	<	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
715	<	vval(OCTREE), illumtmp, oct1name);
716	<	else if (vdef(MATERIAL))
717	<	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
718	<	vval(MATERIAL), illumtmp, oct1name);
719	<	else
720	<	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
721	<	illumtmp, oct1name);
722	<	if (runcom(combuf)) { /* run it */
723	<	fprintf(stderr,
724	<	"%s: error generating octree\n\t%s removed\n",
725	<	progname, oct1name);
726	<	unlink(oct1name);
727	<	exit(1);
728	<	}
729	<	oct1date = time(0);
730	<	rmfile(illumtmp);
482	>	oct1date = time((time_t *)NULL);
483	>	if (oct1date < oct0date) /* in case clock is off */
484	>	oct1date = oct0date;
485		}
486
487
#	Line 766 \| Line 520 \| *register char mo;**
520
521		checkambfile() /* check date on ambient file */
522		{
523	<	unsigned long afdate;
523	>	time_t afdate;
524
525		if (!vdef(AMBFILE))
526		return;
527		if (!(afdate = fdate(vval(AMBFILE))))
528		return;
529		if (oct1date > afdate)
530	<	rmfile(vval(AMBFILE));
530	>	if (touchonly)
531	>	touch(vval(AMBFILE));
532	>	else
533	>	rmfile(vval(AMBFILE));
534		}
535
536
#	Line 782 \| Line 539 \| *ambval() / compute ambient value /*
539		{
540		if (vdef(EXPOSURE)) {
541		if (vval(EXPOSURE)[0] == '+' \|\| vval(EXPOSURE)[0] == '-')
542	<	return(.5/pow(2.,atof(vval(EXPOSURE))));
543	<	return(.5/atof(vval(EXPOSURE)));
542	>	return(.5/pow(2.,vflt(EXPOSURE)));
543	>	return(.5/vflt(EXPOSURE));
544		}
545		if (vlet(ZONE) == 'E')
546		return(10.);
#	Line 793 \| Line 550 \| *ambval() / compute ambient value /*
550		}
551
552
553	<	renderopts(op) /* set rendering options */
554	<	char *op;
553	>	renderopts(op, po) /* set rendering options */
554	>	char op, po;
555		{
556		switch(vscale(QUALITY)) {
557		case LOW:
558	<	lowqopts(op);
558	>	lowqopts(op, po);
559		break;
560		case MEDIUM:
561	<	medqopts(op);
561	>	medqopts(op, po);
562		break;
563		case HIGH:
564	<	hiqopts(op);
564	>	hiqopts(op, po);
565		break;
566		}
567		}
568
569
570	<	lowqopts(op) /* low quality rendering options */
570	>	lowqopts(op, po) /* low quality rendering options */
571		register char *op;
572	+	char *po;
573		{
574		double d, org[3], siz[3];
575
576		*op = '\0';
577	+	*po = '\0';
578		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
579		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
580		badvalue(ZONE);
581		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
582	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
583	+	badvalue(ZONE);
584		getoctcube(org, &d);
585		d *= 3./(siz[0]+siz[1]+siz[2]);
586		switch (vscale(DETAIL)) {
587		case LOW:
588	<	op = addarg(op, "-ps 16 -dp 64");
588	>	po = addarg(po, "-ps 16");
589	>	op = addarg(op, "-dp 64");
590		sprintf(op, " -ar %d", (int)(4*d));
591		op += strlen(op);
592		break;
593		case MEDIUM:
594	<	op = addarg(op, "-ps 8 -dp 128");
594	>	po = addarg(po, "-ps 8");
595	>	op = addarg(op, "-dp 128");
596		sprintf(op, " -ar %d", (int)(8*d));
597		op += strlen(op);
598		break;
599		case HIGH:
600	<	op = addarg(op, "-ps 4 -dp 256");
600	>	po = addarg(po, "-ps 4");
601	>	op = addarg(op, "-dp 256");
602		sprintf(op, " -ar %d", (int)(16*d));
603		op += strlen(op);
604		break;
605		}
606	<	op = addarg(op, "-pt .16");
606	>	po = addarg(po, "-pt .16");
607		if (vbool(PENUMBRAS))
608		op = addarg(op, "-ds .4");
609		else
#	Line 852 \| Line 616 \| *register char op;**
616		overture = 0;
617		switch (vscale(VARIABILITY)) {
618		case LOW:
619	<	op = addarg(op, "-aa .4 -ad 64");
619	>	op = addarg(op, "-aw 128 -aa .4 -ad 64");
620		break;
621		case MEDIUM:
622	<	op = addarg(op, "-aa .3 -ad 128");
622	>	op = addarg(op, "-aw 1024 -aa .3 -ad 128");
623		break;
624		case HIGH:
625		op = addarg(op, "-aa .25 -ad 256");
#	Line 871 \| Line 635 \| *register char op;**
635		}
636
637
638	<	medqopts(op) /* medium quality rendering options */
638	>	medqopts(op, po) /* medium quality rendering options */
639		register char *op;
640	+	char *po;
641		{
642	<	double d, org[3], siz[3];
642	>	double d, org[3], siz[3], asz;
643
644		*op = '\0';
645	+	*po = '\0';
646		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
647		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
648		badvalue(ZONE);
649		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
650	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
651	+	badvalue(ZONE);
652		getoctcube(org, &d);
653	<	d *= 3./(siz[0]+siz[1]+siz[2]);
653	>	asz = (siz[0]+siz[1]+siz[2])/3.;
654	>	d /= asz;
655		switch (vscale(DETAIL)) {
656		case LOW:
657	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
657	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
658		op = addarg(op, "-dp 256");
659		sprintf(op, " -ar %d", (int)(8*d));
660		op += strlen(op);
661	+	sprintf(op, " -ms %.2g", asz/20.);
662	+	op += strlen(op);
663		break;
664		case MEDIUM:
665	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
665	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
666		op = addarg(op, "-dp 512");
667		sprintf(op, " -ar %d", (int)(16*d));
668		op += strlen(op);
669	+	sprintf(op, " -ms %.2g", asz/40.);
670	+	op += strlen(op);
671		break;
672		case HIGH:
673	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
673	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
674		op = addarg(op, "-dp 1024");
675		sprintf(op, " -ar %d", (int)(32*d));
676		op += strlen(op);
677	+	sprintf(op, " -ms %.2g", asz/80.);
678	+	op += strlen(op);
679		break;
680		}
681	<	op = addarg(op, "-pt .08");
681	>	po = addarg(po, "-pt .08");
682		if (vbool(PENUMBRAS))
683		op = addarg(op, "-ds .2 -dj .5");
684		else
#	Line 920 \| Line 695 \| *register char op;**
695		overture = 0;
696		switch (vscale(VARIABILITY)) {
697		case LOW:
698	<	op = addarg(op, "-aa .25 -ad 196 -as 0");
698	>	op = addarg(op, "-aw 128 -aa .25 -ad 196 -as 0");
699		break;
700		case MEDIUM:
701	<	op = addarg(op, "-aa .2 -ad 400 -as 64");
701	>	op = addarg(op, "-aw 1024 -aa .2 -ad 400 -as 64");
702		break;
703		case HIGH:
704		op = addarg(op, "-aa .15 -ad 768 -as 196");
#	Line 938 \| Line 713 \| *register char op;**
713		}
714
715
716	<	hiqopts(op) /* high quality rendering options */
716	>	hiqopts(op, po) /* high quality rendering options */
717		register char *op;
718	+	char *po;
719		{
720	<	double d, org[3], siz[3];
720	>	double d, org[3], siz[3], asz;
721
722		*op = '\0';
723	+	*po = '\0';
724		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
725		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
726		badvalue(ZONE);
727		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
728	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
729	+	badvalue(ZONE);
730		getoctcube(org, &d);
731	<	d *= 3./(siz[0]+siz[1]+siz[2]);
731	>	asz = (siz[0]+siz[1]+siz[2])/3.;
732	>	d /= asz;
733		switch (vscale(DETAIL)) {
734		case LOW:
735	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
735	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
736		op = addarg(op, "-dp 1024");
737		sprintf(op, " -ar %d", (int)(16*d));
738		op += strlen(op);
739	+	sprintf(op, " -ms %.2g", asz/40.);
740	+	op += strlen(op);
741		break;
742		case MEDIUM:
743	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
743	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
744		op = addarg(op, "-dp 2048");
745		sprintf(op, " -ar %d", (int)(32*d));
746		op += strlen(op);
747	+	sprintf(op, " -ms %.2g", asz/80.);
748	+	op += strlen(op);
749		break;
750		case HIGH:
751	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
751	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
752		op = addarg(op, "-dp 4096");
753		sprintf(op, " -ar %d", (int)(64*d));
754		op += strlen(op);
755	+	sprintf(op, " -ms %.2g", asz/160.);
756	+	op += strlen(op);
757		break;
758		}
759	<	op = addarg(op, "-pt .04");
759	>	po = addarg(po, "-pt .04");
760		if (vbool(PENUMBRAS))
761	<	op = addarg(op, "-ds .1 -dj .7");
761	>	op = addarg(op, "-ds .1 -dj .65");
762		else
763		op = addarg(op, "-ds .2");
764		op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
#	Line 985 \| Line 771 \| *register char op;**
771		overture = 0;
772		switch (vscale(VARIABILITY)) {
773		case LOW:
774	<	op = addarg(op, "-aa .15 -ad 256 -as 0");
774	>	op = addarg(op, "-aw 128 -aa .15 -ad 256 -as 0");
775		break;
776		case MEDIUM:
777	<	op = addarg(op, "-aa .125 -ad 512 -as 256");
777	>	op = addarg(op, "-aw 1024 -aa .125 -ad 512 -as 256");
778		break;
779		case HIGH:
780		op = addarg(op, "-aa .08 -ad 1024 -as 512");
#	Line 1014 \| Line 800 \| *char ro;**
800		return;
801		if (vdef(OPTFILE)) {
802		for (cp = ro; cp[1]; cp++)
803	<	if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3]))
803	>	if (isspace(cp[1]) && (cp[2] == '@' \|\|
804	>	(cp[2] == '-' && isalpha(cp[3]))))
805		*cp = '\n';
806		else
807		*cp = cp[1];
#	Line 1109 \| Line 896 \| *register char vs;**
896		zpos = -1; vs++;
897		}
898		viewtype = 'v';
899	<	if (vs == 'v' \| vs == 'l' \| vs == 'a' \| vs == 'h')
899	>	if (vs == 'v' \| vs == 'l' \| vs == 'a' \| vs == 'h' \| *vs == 'c')
900		viewtype = *vs++;
901		cp = viewopts;
902		if ((!vs \|\| isspace(vs)) && (xpos\|ypos\|zpos)) { /* got one! */
#	Line 1120 \| Line 907 \| *register char vs;**
907		badvalue(ZONE);
908		for (i = 0; i < 3; i++) {
909		dim[i] -= cent[i];
910	+	if (dim[i] <= FTINY)
911	+	badvalue(ZONE);
912		cent[i] += .5*dim[i];
913		}
914		mult = vlet(ZONE)=='E' ? 2. : .45 ;
#	Line 1162 \| Line 951 \| *register char vs;**
951		case 'h':
952		cp = addarg(cp, "-vh 180 -vv 180");
953		break;
954	+	case 'c':
955	+	cp = addarg(cp, "-vh 180 -vv 90");
956	+	break;
957		}
958		} else {
959		while (!isspace(vs)) / else skip id */
#	Line 1207 \| Line 999 \| *char vn; /* returned view name /*
999		}
1000		/* view number? */
1001		if (isint(viewselect))
1002	<	return(specview(nvalue(vv+VIEW, atoi(viewselect)-1)));
1002	>	return(specview(nvalue(VIEW, atoi(viewselect)-1)));
1003		/* check list */
1004	<	while ((mv = nvalue(vv+VIEW, n++)) != NULL)
1004	>	while ((mv = nvalue(VIEW, n++)) != NULL)
1005		if (matchword(viewselect, mv))
1006		return(specview(mv));
1007		return(specview(viewselect)); /* standard view? */
1008		}
1009	<	mv = nvalue(vv+VIEW, n); /* use view n */
1009	>	mv = nvalue(VIEW, n); /* use view n */
1010		if (vn != NULL & mv != NULL) {
1011		register char *mv2 = mv;
1012		if (*mv2 != '-')
#	Line 1283 \| Line 1075 \| *register char vopts;**
1075		}
1076
1077
1078	<	rview(opts) /* run rview with first view */
1079	<	char *opts;
1078	>	rview(opts, po) /* run rview with first view */
1079	>	char opts, po;
1080		{
1081		char *vw;
1082		char combuf[512];
1083		/* build command */
1084	<	if ((vw = getview(0, NULL)) == NULL)
1084	>	if (touchonly \|\| (vw = getview(0, NULL)) == NULL)
1085		return;
1086		if (sayview)
1087		printview(vw);
1088	<	sprintf(combuf, "rview %s%s -R %s ", vw, opts, rifname);
1088	>	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1089		if (rvdevice != NULL)
1090		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1091		if (vdef(EXPOSURE))
#	Line 1301 \| Line 1093 \| *char opts;**
1093		strcat(combuf, oct1name);
1094		if (runcom(combuf)) { /* run it */
1095		fprintf(stderr, "%s: error running rview\n", progname);
1096	<	exit(1);
1096	>	quit(1);
1097		}
1098		}
1099
1100
1101	<	rpict(opts) /* run rpict and pfilt for each view */
1102	<	char *opts;
1101	>	rpict(opts, po) /* run rpict and pfilt for each view */
1102	>	char opts, po;
1103		{
1104		char combuf[1024];
1105	<	char rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
1105	>	char rawfile[MAXPATH], picfile[MAXPATH];
1106	>	char zopt[MAXPATH+4], rep[MAXPATH+16], res[32];
1107		char pfopts[128];
1108		char vs[32], *vw;
1109		int vn, mult;
1110	+	time_t rfdt, pfdt;
1111		/* get pfilt options */
1112		pfiltopts(pfopts);
1113		/* get resolution, reporting */
#	Line 1362 \| Line 1156 \| *char opts;**
1156		if (!vs[0])
1157		sprintf(vs, "%d", vn);
1158		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1159	+	if (vdef(ZFILE))
1160	+	sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1161	+	else
1162	+	zopt[0] = '\0';
1163		/* check date on picture */
1164	<	if (fdate(picfile) >= oct1date)
1164	>	pfdt = fdate(picfile);
1165	>	if (pfdt >= oct1date)
1166		continue;
1167	+	/* get raw file name */
1168	+	sprintf(rawfile, "%s_%s.unf",
1169	+	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs);
1170	+	rfdt = fdate(rawfile);
1171	+	if (touchonly) { /* update times only */
1172	+	if (rfdt) {
1173	+	if (rfdt < oct1date)
1174	+	touch(rawfile);
1175	+	} else if (pfdt && pfdt < oct1date)
1176	+	touch(picfile);
1177	+	continue;
1178	+	}
1179		/* build rpict command */
1180	<	sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1181	<	if (fdate(rawfile) >= oct1date) /* recover */
1182	<	sprintf(combuf, "rpict%s%s -ro %s %s",
1372	<	rep, opts, rawfile, oct1name);
1180	>	if (rfdt >= oct1date) /* recover */
1181	>	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1182	>	rep, po, opts, zopt, rawfile, oct1name);
1183		else {
1184		if (overture) { /* run overture calculation */
1185		sprintf(combuf,
#	Line 1380 \| Line 1190 \| *char opts;**
1190		fprintf(stderr,
1191		"%s: error in overture for view %s\n",
1192		progname, vs);
1193	<	exit(1);
1193	>	quit(1);
1194		}
1195		#ifdef NIX
1196		rmfile(overfile);
1197		#endif
1198		}
1199	<	sprintf(combuf, "rpict%s %s %s%s %s > %s",
1200	<	rep, vw, res, opts,
1201	<	oct1name, rawfile);
1199	>	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1200	>	rep, vw, res, po, opts, zopt,
1201	>	oct1name, rawfile);
1202		}
1203		if (runcom(combuf)) { /* run rpict */
1204		fprintf(stderr, "%s: error rendering view %s\n",
1205		progname, vs);
1206	<	exit(1);
1206	>	quit(1);
1207		}
1208	+	if (!vdef(RAWFILE) \|\| strcmp(vval(RAWFILE),vval(PICTURE))) {
1209		/* build pfilt command */
1210	<	if (mult > 1)
1211	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1210	>	if (mult > 1)
1211	>	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1212		pfopts, mult, mult, rawfile, picfile);
1213	<	else
1214	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1215	<	rawfile, picfile);
1216	<	if (runcom(combuf)) { /* run pfilt */
1217	<	fprintf(stderr,
1218	<	"%s: error filtering view %s\n\t%s removed\n",
1219	<	progname, vs, picfile);
1220	<	unlink(picfile);
1221	<	exit(1);
1213	>	else
1214	>	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1215	>	rawfile, picfile);
1216	>	if (runcom(combuf)) { /* run pfilt */
1217	>	fprintf(stderr,
1218	>	"%s: error filtering view %s\n\t%s removed\n",
1219	>	progname, vs, picfile);
1220	>	unlink(picfile);
1221	>	quit(1);
1222	>	}
1223		}
1224	<	/* remove raw file */
1225	<	rmfile(rawfile);
1224	>	/* remove/rename raw file */
1225	>	if (vdef(RAWFILE)) {
1226	>	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1227	>	mvfile(rawfile, combuf);
1228	>	} else
1229	>	rmfile(rawfile);
1230		}
1231		}
1232
1233
1234	+	touch(fn) /* update a file */
1235	+	char *fn;
1236	+	{
1237	+	if (!silent)
1238	+	printf("\ttouch %s\n", fn);
1239	+	if (noaction)
1240	+	return(0);
1241	+	#ifdef notused
1242	+	if (access(fn, F_OK) == -1) /* create it */
1243	+	if (close(open(fn, O_WRONLY\|O_CREAT, 0666)) == -1)
1244	+	return(-1);
1245	+	#endif
1246	+	return(setfdate(fn, time((time_t *)NULL)));
1247	+	}
1248	+
1249	+
1250		runcom(cs) /* run command */
1251		char *cs;
1252		{
#	Line 1442 \| Line 1274 \| *char fn;**
1274		}
1275
1276
1277	+	mvfile(fold, fnew) /* move a file */
1278	+	char fold, fnew;
1279	+	{
1280	+	if (!silent)
1281		#ifdef MSDOS
1282	+	printf("\trename %s %s\n", fold, fnew);
1283	+	#else
1284	+	printf("\tmv %s %s\n", fold, fnew);
1285	+	#endif
1286	+	if (noaction)
1287	+	return(0);
1288	+	return(rename(fold, fnew));
1289	+	}
1290	+
1291	+
1292	+	#ifdef MSDOS
1293		setenv(vname, value) /* set an environment variable */
1294		char vname, value;
1295		{
#	Line 1454 \| Line 1301 \| *char vname, value;*
1301		sprintf(evp, "%s=%s", vname, value);
1302		if (putenv(evp) != 0) {
1303		fprintf(stderr, "%s: out of environment space\n", progname);
1304	<	exit(1);
1304	>	quit(1);
1305		}
1306		if (!silent)
1307		printf("set %s\n", evp);
#	Line 1467 \| Line 1314 \| int vc;
1314		{
1315		fprintf(stderr, "%s: bad value for variable '%s'\n",
1316		progname, vnam(vc));
1317	<	exit(1);
1317	>	quit(1);
1318		}
1319
1320
#	Line 1475 \| Line 1322 \| *syserr(s) / report a system error and exit /*
1322		char *s;
1323		{
1324		perror(s);
1325	<	exit(1);
1325	>	quit(1);
1326	>	}
1327	>
1328	>
1329	>	quit(ec) /* exit program */
1330	>	int ec;
1331	>	{
1332	>	exit(ec);
1333		}

Diff Legend

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

Comparing ray/src/util/rad.c (file contents): Revision 2.32 by greg, Tue Nov 16 11:44:08 1993 UTC vs. Revision 2.53 by greg, Thu Mar 20 12:50:07 1997 UTC

Diff Legend

Comparing ray/src/util/rad.c (file contents):
Revision 2.32 by greg, Tue Nov 16 11:44:08 1993 UTC vs.
Revision 2.53 by greg, Thu Mar 20 12:50:07 1997 UTC