ViewVC Help

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

root/Development/ray/src/util/rad.c

Comparing ray/src/util/rad.c (file contents):
Revision 2.54 by gregl, Fri Jan 23 15:15:59 1998 UTC vs.
Revision 2.58 by gwlarson, Mon Oct 19 16:21:41 1998 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1995 Regents of the University of California */
1	>	/* Copyright (c) 1998 Silicon Graphics, Inc. */
2
3		#ifndef lint
4	<	static char SCCSid[] = "$SunId$ LBL";
4	>	static char SCCSid[] = "$SunId$ SGI";
5		#endif
6
7		/*
#	Line 9 | Line 9 | static char SCCSid[] = "$SunId$ LBL";
9		*/
10
11		#include "standard.h"
12	+	#include "view.h"
13		#include "paths.h"
14		#include "vars.h"
15		#include <ctype.h>
16		#include <sys/types.h>
17
18	<	/* variables */
19	<	#define OBJECT          0               /* object files */
20	<	#define SCENE           1               /* scene files */
21	<	#define MATERIAL        2               /* material files */
22	<	#define ILLUM           3               /* mkillum input files */
23	<	#define MKILLUM         4               /* mkillum options */
24	<	#define RENDER          5               /* rendering options */
25	<	#define OCONV           6               /* oconv options */
26	<	#define PFILT           7               /* pfilt options */
27	<	#define VIEW            8               /* view(s) for picture(s) */
28	<	#define ZONE            9               /* simulation zone */
29	<	#define QUALITY         10              /* desired rendering quality */
30	<	#define OCTREE          11              /* octree file name */
31	<	#define PICTURE         12              /* picture file root name */
32	<	#define AMBFILE         13              /* ambient file name */
33	<	#define OPTFILE         14              /* rendering options file */
34	<	#define EXPOSURE        15              /* picture exposure setting */
35	<	#define RESOLUTION      16              /* maximum picture resolution */
36	<	#define UP              17              /* view up (X, Y or Z) */
37	<	#define INDIRECT        18              /* indirection in lighting */
38	<	#define DETAIL          19              /* level of scene detail */
39	<	#define PENUMBRAS       20              /* shadow penumbras are desired */
40	<	#define VARIABILITY     21              /* level of light variability */
41	<	#define REPORT          22              /* report frequency and errfile */
42	<	#define RAWFILE         23              /* raw picture file root name */
18	>	/* variables (alphabetical by name) */
19	>	#define AMBFILE         0               /* ambient file name */
20	>	#define DETAIL          1               /* level of scene detail */
21	>	#define EXPOSURE        2               /* picture exposure setting */
22	>	#define EYESEP          3               /* interocular distance */
23	>	#define ILLUM           4               /* mkillum input files */
24	>	#define INDIRECT        5               /* indirection in lighting */
25	>	#define MATERIAL        6               /* material files */
26	>	#define MKILLUM         7               /* mkillum options */
27	>	#define OBJECT          8               /* object files */
28	>	#define OCONV           9               /* oconv options */
29	>	#define OCTREE          10              /* octree file name */
30	>	#define OPTFILE         11              /* rendering options file */
31	>	#define PENUMBRAS       12              /* shadow penumbras are desired */
32	>	#define PFILT           13              /* pfilt options */
33	>	#define PICTURE         14              /* picture file root name */
34	>	#define QUALITY         15              /* desired rendering quality */
35	>	#define RAWFILE         16              /* raw picture file root name */
36	>	#define RENDER          17              /* rendering options */
37	>	#define REPORT          18              /* report frequency and errfile */
38	>	#define RESOLUTION      19              /* maximum picture resolution */
39	>	#define SCENE           20              /* scene files */
40	>	#define UP              21              /* view up (X, Y or Z) */
41	>	#define VARIABILITY     22              /* level of light variability */
42	>	#define VIEWS           23              /* view(s) for picture(s) */
43		#define ZFILE           24              /* distance file root name */
44	+	#define ZONE            25              /* simulation zone */
45		/* total number of variables */
46	<	int NVARS = 25;
46	>	int NVARS = 26;
47
48		VARIABLE        vv[] = {                /* variable-value pairs */
49	<	{"objects",     3,      0,      NULL,   catvalues},
50	<	{"scene",       3,      0,      NULL,   catvalues},
51	<	{"materials",   3,      0,      NULL,   catvalues},
49	>	{"AMBFILE",     3,      0,      NULL,   onevalue},
50	>	{"DETAIL",      3,      0,      NULL,   qualvalue},
51	>	{"EXPOSURE",    3,      0,      NULL,   fltvalue},
52	>	{"EYESEP",      3,      0,      NULL,   fltvalue},
53		{"illum",       3,      0,      NULL,   catvalues},
54	+	{"INDIRECT",    3,      0,      NULL,   intvalue},
55	+	{"materials",   3,      0,      NULL,   catvalues},
56		{"mkillum",     3,      0,      NULL,   catvalues},
57	<	{"render",      3,      0,      NULL,   catvalues},
57	>	{"objects",     3,      0,      NULL,   catvalues},
58		{"oconv",       3,      0,      NULL,   catvalues},
54	–	{"pfilt",       2,      0,      NULL,   catvalues},
55	–	{"view",        2,      0,      NULL,   NULL},
56	–	{"ZONE",        2,      0,      NULL,   onevalue},
57	–	{"QUALITY",     3,      0,      NULL,   qualvalue},
59		{"OCTREE",      3,      0,      NULL,   onevalue},
59	–	{"PICTURE",     3,      0,      NULL,   onevalue},
60	–	{"AMBFILE",     3,      0,      NULL,   onevalue},
60		{"OPTFILE",     3,      0,      NULL,   onevalue},
61	<	{"EXPOSURE",    3,      0,      NULL,   fltvalue},
61	>	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
62	>	{"pfilt",       2,      0,      NULL,   catvalues},
63	>	{"PICTURE",     3,      0,      NULL,   onevalue},
64	>	{"QUALITY",     3,      0,      NULL,   qualvalue},
65	>	{"RAWFILE",     3,      0,      NULL,   onevalue},
66	>	{"render",      3,      0,      NULL,   catvalues},
67	>	{"REPORT",      3,      0,      NULL,   onevalue},
68		{"RESOLUTION",  3,      0,      NULL,   onevalue},
69	+	{"scene",       3,      0,      NULL,   catvalues},
70		{"UP",          2,      0,      NULL,   onevalue},
65	–	{"INDIRECT",    3,      0,      NULL,   intvalue},
66	–	{"DETAIL",      3,      0,      NULL,   qualvalue},
67	–	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
71		{"VARIABILITY", 3,      0,      NULL,   qualvalue},
72	<	{"REPORT",      3,      0,      NULL,   onevalue},
70	<	{"RAWFILE",     3,      0,      NULL,   onevalue},
72	>	{"view",        2,      0,      NULL,   NULL},
73		{"ZFILE",       2,      0,      NULL,   onevalue},
74	+	{"ZONE",        2,      0,      NULL,   onevalue},
75		};
76
77		/* overture calculation file */
#	Line 183 | Line 186 | char   *argv[];
186		quit(0);
187		userr:
188		fprintf(stderr,
189	<	"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
189	>	"Usage: %s [-w][-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
190		progname);
191		quit(1);
192		}
#	Line 338 | Line 341 | double org[3], *sizp;
341
342		setdefaults()                   /* set default values for unassigned var's */
343		{
344	<	double  org[3], size;
344	>	double  org[3], lim[3], size;
345		char    buf[128];
346
347		if (!vdef(ZONE)) {
#	Line 348 | Line 351 | setdefaults()                  /* set default values for unassigned v
351		vval(ZONE) = savqstr(buf);
352		vdef(ZONE)++;
353		}
354	+	if (!vdef(EYESEP)) {
355	+	if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf",
356	+	&org[0], &lim[0], &org[1], &lim[1],
357	+	&org[2], &lim[2]) != 6)
358	+	badvalue(ZONE);
359	+	sprintf(buf, "%f",
360	+	0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2]));
361	+	vval(EYESEP) = savqstr(buf);
362	+	vdef(EYESEP)++;
363	+	}
364		if (!vdef(INDIRECT)) {
365		vval(INDIRECT) = "0";
366		vdef(INDIRECT)++;
#	Line 364 | Line 377 | setdefaults()                  /* set default values for unassigned v
377		vval(PICTURE) = radname;
378		vdef(PICTURE)++;
379		}
380	<	if (!vdef(VIEW)) {
381	<	vval(VIEW) = "X";
382	<	vdef(VIEW)++;
380	>	if (!vdef(VIEWS)) {
381	>	vval(VIEWS) = "X";
382	>	vdef(VIEWS)++;
383		}
384		if (!vdef(DETAIL)) {
385		vval(DETAIL) = "M";
#	Line 999 | Line 1012 | char   *vn;            /* returned view name */
1012		}
1013		/* view number? */
1014		if (isint(viewselect))
1015	<	return(specview(nvalue(VIEW, atoi(viewselect)-1)));
1015	>	return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
1016		/* check list */
1017	<	while ((mv = nvalue(VIEW, n++)) != NULL)
1017	>	while ((mv = nvalue(VIEWS, n++)) != NULL)
1018		if (matchword(viewselect, mv))
1019		return(specview(mv));
1020		return(specview(viewselect));   /* standard view? */
1021		}
1022	<	mv = nvalue(VIEW, n);           /* use view n */
1022	>	mv = nvalue(VIEWS, n);          /* use view n */
1023		if (vn != NULL & mv != NULL) {
1024		register char   *mv2 = mv;
1025		if (*mv2 != '-')
#	Line 1021 | Line 1034 | char   *vn;            /* returned view name */
1034		printview(vopts)                        /* print out selected view */
1035		register char   *vopts;
1036		{
1037	<	extern char     *atos(), *getenv();
1038	<	char    buf[256];
1039	<	FILE    *fp;
1037	>	extern char     *strstr(), *atos(), *getenv();
1038	>	VIEW    vwr;
1039	>	char    buf[128];
1040		register char   *cp;
1041	<
1041	>	again:
1042		if (vopts == NULL)
1043		return(-1);
1031	–	fputs("VIEW=", stdout);
1032	–	do {
1033	–	if (matchword(vopts, "-vf")) {          /* expand view file */
1034	–	vopts = sskip(vopts);
1035	–	if (!*atos(buf, sizeof(buf), vopts))
1036	–	return(-1);
1037	–	if ((fp = fopen(buf, "r")) == NULL)
1038	–	return(-1);
1039	–	for (buf[sizeof(buf)-2] = '\n';
1040	–	fgets(buf, sizeof(buf), fp) != NULL &&
1041	–	buf[0] != '\n';
1042	–	buf[sizeof(buf)-2] = '\n') {
1043	–	if (buf[sizeof(buf)-2] != '\n') {
1044	–	ungetc(buf[sizeof(buf)-2], fp);
1045	–	buf[sizeof(buf)-2] = '\0';
1046	–	}
1047	–	if (matchword(buf, "VIEW=") ||
1048	–	matchword(buf, "rview")) {
1049	–	for (cp = sskip(buf); *cp && *cp != '\n'; cp++)
1050	–	putchar(*cp);
1051	–	}
1052	–	}
1053	–	fclose(fp);
1054	–	vopts = sskip(vopts);
1055	–	} else {
1056	–	while (isspace(*vopts))
1057	–	vopts++;
1058	–	putchar(' ');
1044		#ifdef MSDOS
1045	<	if (*vopts == '$') {            /* expand env. var. */
1046	<	if (!*atos(buf, sizeof(buf), vopts+1))
1047	<	return(-1);
1048	<	if ((cp = getenv(buf)) == NULL)
1064	<	return(-1);
1065	<	fputs(cp, stdout);
1066	<	vopts = sskip(vopts);
1067	<	} else
1045	>	if (vopts[0] == '$') {
1046	>	vopts = getenv(vopts+1);
1047	>	goto again;
1048	>	}
1049		#endif
1050	<	while (*vopts && !isspace(*vopts))
1051	<	putchar(*vopts++);
1052	<	}
1053	<	} while (*vopts++);
1054	<	putchar('\n');
1050	>	copystruct(&vwr, &stdview);
1051	>	cp = vopts;                             /* get -vf files first */
1052	>	while ((cp = strstr(cp, "-vf ")) != NULL &&
1053	>	*atos(buf, sizeof(buf), cp += 4))
1054	>	viewfile(buf, &vwr, NULL);
1055	>	sscanview(&vwr, vopts);                 /* get the rest */
1056	>	fputs(VIEWSTR, stdout);
1057	>	fprintview(&vwr, stdout);               /* print full spec. */
1058	>	fputc('\n', stdout);
1059		return(0);
1060		}
1061

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)