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.55 by gregl, Fri Jan 23 17:17:32 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 15 | Line 15 | static char SCCSid[] = "$SunId$ LBL";
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 VIEWS           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},
55	–	{"pfilt",       2,      0,      NULL,   catvalues},
56	–	{"view",        2,      0,      NULL,   NULL},
57	–	{"ZONE",        2,      0,      NULL,   onevalue},
58	–	{"QUALITY",     3,      0,      NULL,   qualvalue},
59		{"OCTREE",      3,      0,      NULL,   onevalue},
60	–	{"PICTURE",     3,      0,      NULL,   onevalue},
61	–	{"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},
66	–	{"INDIRECT",    3,      0,      NULL,   intvalue},
67	–	{"DETAIL",      3,      0,      NULL,   qualvalue},
68	–	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
71		{"VARIABILITY", 3,      0,      NULL,   qualvalue},
72	<	{"REPORT",      3,      0,      NULL,   onevalue},
71	<	{"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 184 | 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 339 | 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 350 | setdefaults()                  /* set default values for unassigned v
350		org[1], org[1]+size, org[2], org[2]+size);
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";

Diff Legend

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