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

Comparing ray/src/util/rad.c (file contents):
Revision 2.33 by greg, Thu Nov 18 10:00:21 1993 UTC vs.
Revision 2.50 by greg, Fri Jan 5 14:43:03 1996 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]);
#	Line 178 \| Line 164 \| *char argv[];**
164		setdefaults();
165		/* print all values if requested */
166		if (explicate)
167	<	printvals();
167	>	printvars(stdout);
168		/* build octree (and run mkillum) */
169		oconv();
170		/* check date on ambient file */
171		checkambfile();
172		/* run simulation */
173	<	renderopts(ropts);
173	>	renderopts(ropts, popts);
174		xferopts(ropts);
175		if (rvdevice != NULL)
176	<	rview(ropts);
176	>	rview(ropts, popts);
177		else
178	<	rpict(ropts);
178	>	rpict(ropts, popts);
179		exit(0);
180		userr:
181		fprintf(stderr,
182	<	"Usage: %s [-s][-n][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
182	>	"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
183		progname);
184		exit(1);
185		}
#	Line 214 \| Line 200 \| *register char rn, fn;*
200		}
201
202
203	<	#define NOCHAR 127 /* constant for character to delete */
218	<
219	<
220	<	load(rfname) /* load Radiance simulation file */
221	<	char *rfname;
222	<	{
223	<	FILE *fp;
224	<	char buf[512];
225	<	register char *cp;
226	<
227	<	if (rfname == NULL)
228	<	fp = stdin;
229	<	else if ((fp = fopen(rfname, "r")) == NULL)
230	<	syserr(rfname);
231	<	while (fgetline(buf, sizeof(buf), fp) != NULL) {
232	<	for (cp = buf; *cp; cp++) {
233	<	switch (*cp) {
234	<	case '\\':
235	<	*cp++ = NOCHAR;
236	<	continue;
237	<	case '#':
238	<	*cp = '\0';
239	<	break;
240	<	default:
241	<	continue;
242	<	}
243	<	break;
244	<	}
245	<	setvariable(buf);
246	<	}
247	<	fclose(fp);
248	<	}
249	<
250	<
251	<	setvariable(ass) /* assign variable according to string */
252	<	register char *ass;
253	<	{
254	<	char varname[32];
255	<	int n;
256	<	register char *cp;
257	<	register VARIABLE *vp;
258	<	register int i;
259	<
260	<	while (isspace(ass)) / skip leading space */
261	<	ass++;
262	<	cp = varname; /* extract name */
263	<	while (cp < varname+sizeof(varname)-1
264	<	&& ass && !isspace(ass) && *ass != '=')
265	<	cp++ = ass++;
266	<	*cp = '\0';
267	<	if (!varname[0])
268	<	return; /* no variable name! */
269	<	/* trim value */
270	<	while (isspace(ass) \|\| ass == '=')
271	<	ass++;
272	<	for (n = strlen(ass); n > 0; n--)
273	<	if (!isspace(ass[n-1]))
274	<	break;
275	<	if (!n) {
276	<	fprintf(stderr, "%s: warning - missing value for variable '%s'\n",
277	<	progname, varname);
278	<	return;
279	<	}
280	<	/* match variable from list */
281	<	vp = matchvar(varname);
282	<	if (vp == NULL) {
283	<	fprintf(stderr, "%s: unknown variable '%s'\n",
284	<	progname, varname);
285	<	exit(1);
286	<	}
287	<	/* assign new value */
288	<	if (i = vp->nass) {
289	<	cp = vp->value;
290	<	while (i--)
291	<	while (*cp++)
292	<	;
293	<	i = cp - vp->value;
294	<	vp->value = realloc(vp->value, i+n+1);
295	<	} else
296	<	vp->value = malloc(n+1);
297	<	if (vp->value == NULL)
298	<	syserr(progname);
299	<	cp = vp->value+i; /* copy value, squeezing spaces */
300	<	cp = ass;
301	<	for (i = 1; i <= n; i++) {
302	<	if (ass[i] == NOCHAR)
303	<	continue;
304	<	if (isspace(*cp))
305	<	while (isspace(ass[i]))
306	<	i++;
307	<	*++cp = ass[i];
308	<	}
309	<	if (isspace(cp)) / remove trailing space */
310	<	*cp = '\0';
311	<	vp->nass++;
312	<	}
313	<
314	<
315	<	VARIABLE *
316	<	matchvar(nam) /* match a variable by its name */
317	<	char *nam;
318	<	{
319	<	int n = strlen(nam);
320	<	register int i;
321	<
322	<	for (i = 0; i < NVARS; i++)
323	<	if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n))
324	<	return(vv+i);
325	<	return(NULL);
326	<	}
327	<
328	<
329	<	char *
330	<	nvalue(vp, n) /* return nth variable value */
331	<	VARIABLE *vp;
332	<	register int n;
333	<	{
334	<	register char *cp;
335	<
336	<	if (vp == NULL \| n < 0 \| n >= vp->nass)
337	<	return(NULL);
338	<	cp = vp->value;
339	<	while (n--)
340	<	while (*cp++)
341	<	;
342	<	return(cp);
343	<	}
344	<
345	<
346	<	checkvalues() /* check assignments */
347	<	{
348	<	register int i;
349	<
350	<	for (i = 0; i < NVARS; i++)
351	<	if (vv[i].fixval != NULL)
352	<	(*vv[i].fixval)(vv+i);
353	<	}
354	<
355	<
356	<	onevalue(vp) /* only one assignment for this variable */
357	<	register VARIABLE *vp;
358	<	{
359	<	if (vp->nass < 2)
360	<	return;
361	<	fprintf(stderr, "%s: warning - multiple assignment of variable '%s'\n",
362	<	progname, vp->name);
363	<	do
364	<	vp->value += strlen(vp->value)+1;
365	<	while (--vp->nass > 1);
366	<	}
367	<
368	<
369	<	catvalues(vp) /* concatenate variable values */
370	<	register VARIABLE *vp;
371	<	{
372	<	register char *cp;
373	<
374	<	if (vp->nass < 2)
375	<	return;
376	<	for (cp = vp->value; vp->nass > 1; vp->nass--) {
377	<	while (*cp)
378	<	cp++;
379	<	*cp++ = ' ';
380	<	}
381	<	}
382	<
383	<
384	<	int
385	<	badmatch(tv, cv) /* case insensitive truncated comparison */
386	<	register char tv, cv;
387	<	{
388	<	if (!tv) return(1); / null string cannot match */
389	<	do
390	<	if (UPPER(tv) != cv++)
391	<	return(1);
392	<	while (*++tv);
393	<	return(0); /* OK */
394	<	}
395	<
396	<
397	<	boolvalue(vp) /* check boolean for legal values */
398	<	register VARIABLE *vp;
399	<	{
400	<	if (!vp->nass) return;
401	<	onevalue(vp);
402	<	switch (UPPER(vp->value[0])) {
403	<	case 'T':
404	<	if (badmatch(vp->value, "TRUE")) break;
405	<	return;
406	<	case 'F':
407	<	if (badmatch(vp->value, "FALSE")) break;
408	<	return;
409	<	}
410	<	fprintf(stderr, "%s: illegal value for boolean variable '%s'\n",
411	<	progname, vp->name);
412	<	exit(1);
413	<	}
414	<
415	<
416	<	qualvalue(vp) /* check qualitative var. for legal values */
417	<	register VARIABLE *vp;
418	<	{
419	<	if (!vp->nass) return;
420	<	onevalue(vp);
421	<	switch (UPPER(vp->value[0])) {
422	<	case 'L':
423	<	if (badmatch(vp->value, "LOW")) break;
424	<	return;
425	<	case 'M':
426	<	if (badmatch(vp->value, "MEDIUM")) break;
427	<	return;
428	<	case 'H':
429	<	if (badmatch(vp->value, "HIGH")) break;
430	<	return;
431	<	}
432	<	fprintf(stderr, "%s: illegal value for qualitative variable '%s'\n",
433	<	progname, vp->name);
434	<	exit(1);
435	<	}
436	<
437	<
438	<	intvalue(vp) /* check integer variable for legal values */
439	<	register VARIABLE *vp;
440	<	{
441	<	if (!vp->nass) return;
442	<	onevalue(vp);
443	<	if (isint(vp->value)) return;
444	<	fprintf(stderr, "%s: illegal value for integer variable '%s'\n",
445	<	progname, vp->name);
446	<	exit(1);
447	<	}
448	<
449	<
450	<	fltvalue(vp) /* check float variable for legal values */
451	<	register VARIABLE *vp;
452	<	{
453	<	if (!vp->nass) return;
454	<	onevalue(vp);
455	<	if (isflt(vp->value)) return;
456	<	fprintf(stderr, "%s: illegal value for real variable '%s'\n",
457	<	progname, vp->name);
458	<	exit(1);
459	<	}
460	<
461	<
462	<	unsigned long
203	>	time_t
204		checklast(fnames) /* check files and find most recent */
205		register char *fnames;
206		{
207		char thisfile[MAXPATH];
208	<	unsigned long thisdate, lastdate = 0;
208	>	time_t thisdate, lastdate = 0;
209		register char *cp;
210
211		if (fnames == NULL)
#	Line 512 \| 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)
#	Line 547 \| Line 288 \| *double org[3], sizp;**
288		extern FILE *popen();
289		static double oorg[3], osiz = 0.;
290		double min[3], max[3];
291	<	char buf[512];
291	>	char buf[1024];
292		FILE *fp;
293		register int i;
294
#	Line 638 \| Line 379 \| *setdefaults() / set default values for unassigned v**
379		}
380
381
641	–	printvals() /* print variable values */
642	–	{
643	–	register int i, j;
644	–
645	–	for (i = 0; i < NVARS; i++)
646	–	for (j = 0; j < vdef(i); j++)
647	–	printf("%s= %s\n", vnam(i), nvalue(vv+i, j));
648	–	fflush(stdout);
649	–	}
650	–
651	–
382		oconv() /* run oconv and mkillum if necessary */
383		{
384		static char illumtmp[] = "ilXXXXXX";
385	<	char combuf[512], ocopts[64], mkopts[64];
385	>	char combuf[1024], ocopts[64], mkopts[64];
386
387		oconvopts(ocopts); /* get options */
388		if (octreedate < scenedate) { /* check date on original octree */
389	<	/* build command */
390	<	if (vdef(MATERIAL))
391	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
392	<	vval(MATERIAL), vval(SCENE), vval(OCTREE));
393	<	else
394	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
395	<	vval(SCENE), vval(OCTREE));
396	<
397	<	if (runcom(combuf)) { /* run it */
398	<	fprintf(stderr,
389	>	if (touchonly && octreedate)
390	>	touch(vval(OCTREE));
391	>	else { /* build command */
392	>	if (vdef(MATERIAL))
393	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
394	>	vval(MATERIAL), vval(SCENE),
395	>	vval(OCTREE));
396	>	else
397	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
398	>	vval(SCENE), vval(OCTREE));
399	>
400	>	if (runcom(combuf)) { /* run it */
401	>	fprintf(stderr,
402		"%s: error generating octree\n\t%s removed\n",
403	<	progname, vval(OCTREE));
404	<	unlink(vval(OCTREE));
405	<	exit(1);
403	>	progname, vval(OCTREE));
404	>	unlink(vval(OCTREE));
405	>	exit(1);
406	>	}
407		}
408	<	octreedate = time(0);
408	>	octreedate = time((time_t *)NULL);
409	>	if (octreedate < scenedate) /* in case clock is off */
410	>	octreedate = scenedate;
411		}
412		if (oct1name == vval(OCTREE)) /* no mkillum? */
413		oct1date = octreedate > matdate ? octreedate : matdate;
#	Line 680 \| Line 416 \| *oconv() / run oconv and mkillum if necessary /*
416		return;
417		/* make octree0 */
418		if (oct0date < scenedate \| oct0date < illumdate) {
419	<	/* build command */
419	>	if (touchonly && oct0date)
420	>	touch(oct0name);
421	>	else { /* build command */
422	>	if (octreedate)
423	>	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
424	>	vval(OCTREE), vval(ILLUM), oct0name);
425	>	else if (vdef(MATERIAL))
426	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
427	>	vval(MATERIAL), vval(ILLUM), oct0name);
428	>	else
429	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
430	>	vval(ILLUM), oct0name);
431	>	if (runcom(combuf)) { /* run it */
432	>	fprintf(stderr,
433	>	"%s: error generating octree\n\t%s removed\n",
434	>	progname, oct0name);
435	>	unlink(oct0name);
436	>	exit(1);
437	>	}
438	>	}
439	>	oct0date = time((time_t *)NULL);
440	>	if (oct0date < octreedate) /* in case clock is off */
441	>	oct0date = octreedate;
442	>	if (oct0date < illumdate) /* ditto */
443	>	oct0date = illumdate;
444	>	}
445	>	if (touchonly && oct1date)
446	>	touch(oct1name);
447	>	else {
448	>	mkillumopts(mkopts); /* build mkillum command */
449	>	mktemp(illumtmp);
450	>	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
451	>	oct0name, vval(ILLUM), illumtmp);
452	>	if (runcom(combuf)) { /* run it */
453	>	fprintf(stderr, "%s: error running mkillum\n",
454	>	progname);
455	>	unlink(illumtmp);
456	>	exit(1);
457	>	}
458	>	/* make octree1 (frozen) */
459		if (octreedate)
460	<	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
461	<	vval(OCTREE), vval(ILLUM), oct0name);
460	>	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
461	>	vval(OCTREE), illumtmp, oct1name);
462		else if (vdef(MATERIAL))
463	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
464	<	vval(MATERIAL), vval(ILLUM), oct0name);
463	>	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
464	>	vval(MATERIAL), illumtmp, oct1name);
465		else
466	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
467	<	vval(ILLUM), oct0name);
466	>	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
467	>	illumtmp, oct1name);
468		if (runcom(combuf)) { /* run it */
469		fprintf(stderr,
470		"%s: error generating octree\n\t%s removed\n",
471	<	progname, oct0name);
472	<	unlink(oct0name);
471	>	progname, oct1name);
472	>	unlink(oct1name);
473	>	unlink(illumtmp);
474		exit(1);
475		}
476	<	oct0date = time(0);
476	>	rmfile(illumtmp);
477		}
478	<	mkillumopts(mkopts); /* build mkillum command */
479	<	mktemp(illumtmp);
480	<	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
705	<	oct0name, vval(ILLUM), illumtmp);
706	<	if (runcom(combuf)) { /* run it */
707	<	fprintf(stderr, "%s: error running mkillum\n", progname);
708	<	unlink(illumtmp);
709	<	exit(1);
710	<	}
711	<	/* make octree1 (frozen) */
712	<	if (octreedate)
713	<	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
714	<	vval(OCTREE), illumtmp, oct1name);
715	<	else if (vdef(MATERIAL))
716	<	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
717	<	vval(MATERIAL), illumtmp, oct1name);
718	<	else
719	<	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
720	<	illumtmp, oct1name);
721	<	if (runcom(combuf)) { /* run it */
722	<	fprintf(stderr,
723	<	"%s: error generating octree\n\t%s removed\n",
724	<	progname, oct1name);
725	<	unlink(oct1name);
726	<	exit(1);
727	<	}
728	<	oct1date = time(0);
729	<	rmfile(illumtmp);
478	>	oct1date = time((time_t *)NULL);
479	>	if (oct1date < oct0date) /* in case clock is off */
480	>	oct1date = oct0date;
481		}
482
483
#	Line 765 \| Line 516 \| *register char mo;**
516
517		checkambfile() /* check date on ambient file */
518		{
519	<	unsigned long afdate;
519	>	time_t afdate;
520
521		if (!vdef(AMBFILE))
522		return;
523		if (!(afdate = fdate(vval(AMBFILE))))
524		return;
525		if (oct1date > afdate)
526	<	rmfile(vval(AMBFILE));
526	>	if (touchonly)
527	>	touch(vval(AMBFILE));
528	>	else
529	>	rmfile(vval(AMBFILE));
530		}
531
532
#	Line 781 \| Line 535 \| *ambval() / compute ambient value /*
535		{
536		if (vdef(EXPOSURE)) {
537		if (vval(EXPOSURE)[0] == '+' \|\| vval(EXPOSURE)[0] == '-')
538	<	return(.5/pow(2.,atof(vval(EXPOSURE))));
539	<	return(.5/atof(vval(EXPOSURE)));
538	>	return(.5/pow(2.,vflt(EXPOSURE)));
539	>	return(.5/vflt(EXPOSURE));
540		}
541		if (vlet(ZONE) == 'E')
542		return(10.);
#	Line 792 \| Line 546 \| *ambval() / compute ambient value /*
546		}
547
548
549	<	renderopts(op) /* set rendering options */
550	<	char *op;
549	>	renderopts(op, po) /* set rendering options */
550	>	char op, po;
551		{
552		switch(vscale(QUALITY)) {
553		case LOW:
554	<	lowqopts(op);
554	>	lowqopts(op, po);
555		break;
556		case MEDIUM:
557	<	medqopts(op);
557	>	medqopts(op, po);
558		break;
559		case HIGH:
560	<	hiqopts(op);
560	>	hiqopts(op, po);
561		break;
562		}
563		}
564
565
566	<	lowqopts(op) /* low quality rendering options */
566	>	lowqopts(op, po) /* low quality rendering options */
567		register char *op;
568	+	char *po;
569		{
570		double d, org[3], siz[3];
571
572		*op = '\0';
573	+	*po = '\0';
574		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
575		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
576		badvalue(ZONE);
577		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
578	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
579	+	badvalue(ZONE);
580		getoctcube(org, &d);
581		d *= 3./(siz[0]+siz[1]+siz[2]);
582		switch (vscale(DETAIL)) {
583		case LOW:
584	<	op = addarg(op, "-ps 16 -dp 64");
584	>	po = addarg(po, "-ps 16");
585	>	op = addarg(op, "-dp 64");
586		sprintf(op, " -ar %d", (int)(4*d));
587		op += strlen(op);
588		break;
589		case MEDIUM:
590	<	op = addarg(op, "-ps 8 -dp 128");
590	>	po = addarg(po, "-ps 8");
591	>	op = addarg(op, "-dp 128");
592		sprintf(op, " -ar %d", (int)(8*d));
593		op += strlen(op);
594		break;
595		case HIGH:
596	<	op = addarg(op, "-ps 4 -dp 256");
596	>	po = addarg(po, "-ps 4");
597	>	op = addarg(op, "-dp 256");
598		sprintf(op, " -ar %d", (int)(16*d));
599		op += strlen(op);
600		break;
601		}
602	<	op = addarg(op, "-pt .16");
602	>	po = addarg(po, "-pt .16");
603		if (vbool(PENUMBRAS))
604		op = addarg(op, "-ds .4");
605		else
#	Line 870 \| Line 631 \| *register char op;**
631		}
632
633
634	<	medqopts(op) /* medium quality rendering options */
634	>	medqopts(op, po) /* medium quality rendering options */
635		register char *op;
636	+	char *po;
637		{
638	<	double d, org[3], siz[3];
638	>	double d, org[3], siz[3], asz;
639
640		*op = '\0';
641	+	*po = '\0';
642		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
643		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
644		badvalue(ZONE);
645		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
646	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
647	+	badvalue(ZONE);
648		getoctcube(org, &d);
649	<	d *= 3./(siz[0]+siz[1]+siz[2]);
649	>	asz = (siz[0]+siz[1]+siz[2])/3.;
650	>	d /= asz;
651		switch (vscale(DETAIL)) {
652		case LOW:
653	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
653	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
654		op = addarg(op, "-dp 256");
655		sprintf(op, " -ar %d", (int)(8*d));
656		op += strlen(op);
657	+	sprintf(op, " -ms %.2g", asz/20.);
658	+	op += strlen(op);
659		break;
660		case MEDIUM:
661	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
661	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
662		op = addarg(op, "-dp 512");
663		sprintf(op, " -ar %d", (int)(16*d));
664		op += strlen(op);
665	+	sprintf(op, " -ms %.2g", asz/40.);
666	+	op += strlen(op);
667		break;
668		case HIGH:
669	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
669	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
670		op = addarg(op, "-dp 1024");
671		sprintf(op, " -ar %d", (int)(32*d));
672		op += strlen(op);
673	+	sprintf(op, " -ms %.2g", asz/80.);
674	+	op += strlen(op);
675		break;
676		}
677	<	op = addarg(op, "-pt .08");
677	>	po = addarg(po, "-pt .08");
678		if (vbool(PENUMBRAS))
679		op = addarg(op, "-ds .2 -dj .5");
680		else
#	Line 937 \| Line 709 \| *register char op;**
709		}
710
711
712	<	hiqopts(op) /* high quality rendering options */
712	>	hiqopts(op, po) /* high quality rendering options */
713		register char *op;
714	+	char *po;
715		{
716	<	double d, org[3], siz[3];
716	>	double d, org[3], siz[3], asz;
717
718		*op = '\0';
719	+	*po = '\0';
720		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
721		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
722		badvalue(ZONE);
723		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
724	+	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
725	+	badvalue(ZONE);
726		getoctcube(org, &d);
727	<	d *= 3./(siz[0]+siz[1]+siz[2]);
727	>	asz = (siz[0]+siz[1]+siz[2])/3.;
728	>	d /= asz;
729		switch (vscale(DETAIL)) {
730		case LOW:
731	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
731	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
732		op = addarg(op, "-dp 1024");
733		sprintf(op, " -ar %d", (int)(16*d));
734		op += strlen(op);
735	+	sprintf(op, " -ms %.2g", asz/40.);
736	+	op += strlen(op);
737		break;
738		case MEDIUM:
739	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
739	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
740		op = addarg(op, "-dp 2048");
741		sprintf(op, " -ar %d", (int)(32*d));
742		op += strlen(op);
743	+	sprintf(op, " -ms %.2g", asz/80.);
744	+	op += strlen(op);
745		break;
746		case HIGH:
747	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
747	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
748		op = addarg(op, "-dp 4096");
749		sprintf(op, " -ar %d", (int)(64*d));
750		op += strlen(op);
751	+	sprintf(op, " -ms %.2g", asz/160.);
752	+	op += strlen(op);
753		break;
754		}
755	<	op = addarg(op, "-pt .04");
755	>	po = addarg(po, "-pt .04");
756		if (vbool(PENUMBRAS))
757	<	op = addarg(op, "-ds .1 -dj .7");
757	>	op = addarg(op, "-ds .1 -dj .65");
758		else
759		op = addarg(op, "-ds .2");
760		op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
#	Line 1013 \| Line 796 \| *char ro;**
796		return;
797		if (vdef(OPTFILE)) {
798		for (cp = ro; cp[1]; cp++)
799	<	if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3]))
799	>	if (isspace(cp[1]) && (cp[2] == '@' \|\|
800	>	(cp[2] == '-' && isalpha(cp[3]))))
801		*cp = '\n';
802		else
803		*cp = cp[1];
#	Line 1108 \| Line 892 \| *register char vs;**
892		zpos = -1; vs++;
893		}
894		viewtype = 'v';
895	<	if (vs == 'v' \| vs == 'l' \| vs == 'a' \| vs == 'h')
895	>	if (vs == 'v' \| vs == 'l' \| vs == 'a' \| vs == 'h' \| *vs == 'c')
896		viewtype = *vs++;
897		cp = viewopts;
898		if ((!vs \|\| isspace(vs)) && (xpos\|ypos\|zpos)) { /* got one! */
#	Line 1119 \| Line 903 \| *register char vs;**
903		badvalue(ZONE);
904		for (i = 0; i < 3; i++) {
905		dim[i] -= cent[i];
906	+	if (dim[i] <= FTINY)
907	+	badvalue(ZONE);
908		cent[i] += .5*dim[i];
909		}
910		mult = vlet(ZONE)=='E' ? 2. : .45 ;
#	Line 1161 \| Line 947 \| *register char vs;**
947		case 'h':
948		cp = addarg(cp, "-vh 180 -vv 180");
949		break;
950	+	case 'c':
951	+	cp = addarg(cp, "-vh 180 -vv 90");
952	+	break;
953		}
954		} else {
955		while (!isspace(vs)) / else skip id */
#	Line 1282 \| Line 1071 \| *register char vopts;**
1071		}
1072
1073
1074	<	rview(opts) /* run rview with first view */
1075	<	char *opts;
1074	>	rview(opts, po) /* run rview with first view */
1075	>	char opts, po;
1076		{
1077		char *vw;
1078		char combuf[512];
1079		/* build command */
1080	<	if ((vw = getview(0, NULL)) == NULL)
1080	>	if (touchonly \|\| (vw = getview(0, NULL)) == NULL)
1081		return;
1082		if (sayview)
1083		printview(vw);
1084	<	sprintf(combuf, "rview %s%s -R %s ", vw, opts, rifname);
1084	>	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1085		if (rvdevice != NULL)
1086		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1087		if (vdef(EXPOSURE))
#	Line 1305 \| Line 1094 \| *char opts;**
1094		}
1095
1096
1097	<	rpict(opts) /* run rpict and pfilt for each view */
1098	<	char *opts;
1097	>	rpict(opts, po) /* run rpict and pfilt for each view */
1098	>	char opts, po;
1099		{
1100		char combuf[1024];
1101	<	char rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
1101	>	char rawfile[MAXPATH], picfile[MAXPATH];
1102	>	char zopt[MAXPATH+4], rep[MAXPATH+16], res[32];
1103		char pfopts[128];
1104		char vs[32], *vw;
1105		int vn, mult;
1106	+	time_t rfdt, pfdt;
1107		/* get pfilt options */
1108		pfiltopts(pfopts);
1109		/* get resolution, reporting */
#	Line 1361 \| Line 1152 \| *char opts;**
1152		if (!vs[0])
1153		sprintf(vs, "%d", vn);
1154		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1155	+	if (vdef(ZFILE))
1156	+	sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1157	+	else
1158	+	zopt[0] = '\0';
1159		/* check date on picture */
1160	<	if (fdate(picfile) >= oct1date)
1160	>	pfdt = fdate(picfile);
1161	>	if (pfdt >= oct1date)
1162		continue;
1163	+	/* get raw file name */
1164	+	sprintf(rawfile, "%s_%s.unf",
1165	+	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs);
1166	+	rfdt = fdate(rawfile);
1167	+	if (touchonly) { /* update times only */
1168	+	if (rfdt) {
1169	+	if (rfdt < oct1date)
1170	+	touch(rawfile);
1171	+	} else if (pfdt && pfdt < oct1date)
1172	+	touch(picfile);
1173	+	continue;
1174	+	}
1175		/* build rpict command */
1176	<	sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1177	<	if (fdate(rawfile) >= oct1date) /* recover */
1178	<	sprintf(combuf, "rpict%s%s -ro %s %s",
1371	<	rep, opts, rawfile, oct1name);
1176	>	if (rfdt >= oct1date) /* recover */
1177	>	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1178	>	rep, po, opts, zopt, rawfile, oct1name);
1179		else {
1180		if (overture) { /* run overture calculation */
1181		sprintf(combuf,
#	Line 1385 \| Line 1192 \| *char opts;**
1192		rmfile(overfile);
1193		#endif
1194		}
1195	<	sprintf(combuf, "rpict%s %s %s%s %s > %s",
1196	<	rep, vw, res, opts,
1197	<	oct1name, rawfile);
1195	>	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1196	>	rep, vw, res, po, opts, zopt,
1197	>	oct1name, rawfile);
1198		}
1199		if (runcom(combuf)) { /* run rpict */
1200		fprintf(stderr, "%s: error rendering view %s\n",
1201		progname, vs);
1202		exit(1);
1203		}
1204	+	if (!vdef(RAWFILE) \|\| strcmp(vval(RAWFILE),vval(PICTURE))) {
1205		/* build pfilt command */
1206	<	if (mult > 1)
1207	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1206	>	if (mult > 1)
1207	>	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1208		pfopts, mult, mult, rawfile, picfile);
1209	<	else
1210	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1211	<	rawfile, picfile);
1212	<	if (runcom(combuf)) { /* run pfilt */
1213	<	fprintf(stderr,
1214	<	"%s: error filtering view %s\n\t%s removed\n",
1215	<	progname, vs, picfile);
1216	<	unlink(picfile);
1217	<	exit(1);
1209	>	else
1210	>	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1211	>	rawfile, picfile);
1212	>	if (runcom(combuf)) { /* run pfilt */
1213	>	fprintf(stderr,
1214	>	"%s: error filtering view %s\n\t%s removed\n",
1215	>	progname, vs, picfile);
1216	>	unlink(picfile);
1217	>	exit(1);
1218	>	}
1219		}
1220	<	/* remove raw file */
1221	<	rmfile(rawfile);
1220	>	/* remove/rename raw file */
1221	>	if (vdef(RAWFILE)) {
1222	>	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1223	>	mvfile(rawfile, combuf);
1224	>	} else
1225	>	rmfile(rawfile);
1226		}
1227		}
1228
1229
1230	+	touch(fn) /* update a file */
1231	+	char *fn;
1232	+	{
1233	+	if (!silent)
1234	+	printf("\ttouch %s\n", fn);
1235	+	if (noaction)
1236	+	return(0);
1237	+	#ifdef notused
1238	+	if (access(fn, F_OK) == -1) /* create it */
1239	+	if (close(open(fn, O_WRONLY\|O_CREAT, 0666)) == -1)
1240	+	return(-1);
1241	+	#endif
1242	+	return(setfdate(fn, time((time_t *)NULL)));
1243	+	}
1244	+
1245	+
1246		runcom(cs) /* run command */
1247		char *cs;
1248		{
#	Line 1438 \| Line 1267 \| *char fn;**
1267		if (noaction)
1268		return(0);
1269		return(unlink(fn));
1270	+	}
1271	+
1272	+
1273	+	mvfile(fold, fnew) /* move a file */
1274	+	char fold, fnew;
1275	+	{
1276	+	if (!silent)
1277	+	#ifdef MSDOS
1278	+	printf("\trename %s %s\n", fold, fnew);
1279	+	#else
1280	+	printf("\tmv %s %s\n", fold, fnew);
1281	+	#endif
1282	+	if (noaction)
1283	+	return(0);
1284	+	return(rename(fold, fnew));
1285		}
1286
1287

Diff Legend

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

Comparing ray/src/util/rad.c (file contents): Revision 2.33 by greg, Thu Nov 18 10:00:21 1993 UTC vs. Revision 2.50 by greg, Fri Jan 5 14:43:03 1996 UTC

Diff Legend

Comparing ray/src/util/rad.c (file contents):
Revision 2.33 by greg, Thu Nov 18 10:00:21 1993 UTC vs.
Revision 2.50 by greg, Fri Jan 5 14:43:03 1996 UTC