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.64 by schorsch, Thu Jun 26 00:58:11 2003 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1995 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	+
10	+	#include <ctype.h>
11	+
12	+	#include "platform.h"
13		#include "view.h"
14		#include "paths.h"
15		#include "vars.h"
15	–	#include <ctype.h>
16	–	#include <sys/types.h>
16
17	<	/* variables */
18	<	#define OBJECT          0               /* object files */
19	<	#define SCENE           1               /* scene files */
20	<	#define MATERIAL        2               /* material files */
21	<	#define ILLUM           3               /* mkillum input files */
22	<	#define MKILLUM         4               /* mkillum options */
23	<	#define RENDER          5               /* rendering options */
24	<	#define OCONV           6               /* oconv options */
25	<	#define PFILT           7               /* pfilt options */
26	<	#define VIEWS           8               /* view(s) for picture(s) */
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 root name */
31	<	#define AMBFILE         13              /* ambient file name */
32	<	#define OPTFILE         14              /* rendering options file */
33	<	#define EXPOSURE        15              /* picture exposure setting */
34	<	#define RESOLUTION      16              /* maximum picture resolution */
35	<	#define UP              17              /* view up (X, Y or Z) */
36	<	#define INDIRECT        18              /* indirection in lighting */
37	<	#define DETAIL          19              /* level of scene detail */
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 */
17	>	/* variables (alphabetical by name) */
18	>	#define AMBFILE         0               /* ambient file name */
19	>	#define DETAIL          1               /* level of scene detail */
20	>	#define EXPOSURE        2               /* picture exposure setting */
21	>	#define EYESEP          3               /* interocular distance */
22	>	#define ILLUM           4               /* mkillum input files */
23	>	#define INDIRECT        5               /* indirection in lighting */
24	>	#define MATERIAL        6               /* material files */
25	>	#define MKILLUM         7               /* mkillum options */
26	>	#define OBJECT          8               /* object files */
27	>	#define OCONV           9               /* oconv options */
28	>	#define OCTREE          10              /* octree file name */
29	>	#define OPTFILE         11              /* rendering options file */
30	>	#define PENUMBRAS       12              /* shadow penumbras are desired */
31	>	#define PFILT           13              /* pfilt options */
32	>	#define PICTURE         14              /* picture file root name */
33	>	#define QUALITY         15              /* desired rendering quality */
34	>	#define RAWFILE         16              /* raw picture file root name */
35	>	#define RENDER          17              /* rendering options */
36	>	#define REPORT          18              /* report frequency and errfile */
37	>	#define RESOLUTION      19              /* maximum picture resolution */
38	>	#define SCENE           20              /* scene files */
39	>	#define UP              21              /* view up (X, Y or Z) */
40	>	#define VARIABILITY     22              /* level of light variability */
41	>	#define VIEWS           23              /* view(s) for picture(s) */
42		#define ZFILE           24              /* distance file root name */
43	+	#define ZONE            25              /* simulation zone */
44		/* total number of variables */
45	<	int NVARS = 25;
45	>	int NVARS = 26;
46
47		VARIABLE        vv[] = {                /* variable-value pairs */
48	<	{"objects",     3,      0,      NULL,   catvalues},
49	<	{"scene",       3,      0,      NULL,   catvalues},
50	<	{"materials",   3,      0,      NULL,   catvalues},
48	>	{"AMBFILE",     3,      0,      NULL,   onevalue},
49	>	{"DETAIL",      3,      0,      NULL,   qualvalue},
50	>	{"EXPOSURE",    3,      0,      NULL,   fltvalue},
51	>	{"EYESEP",      3,      0,      NULL,   fltvalue},
52		{"illum",       3,      0,      NULL,   catvalues},
53	+	{"INDIRECT",    3,      0,      NULL,   intvalue},
54	+	{"materials",   3,      0,      NULL,   catvalues},
55		{"mkillum",     3,      0,      NULL,   catvalues},
56	<	{"render",      3,      0,      NULL,   catvalues},
56	>	{"objects",     3,      0,      NULL,   catvalues},
57		{"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},
58		{"OCTREE",      3,      0,      NULL,   onevalue},
60	–	{"PICTURE",     3,      0,      NULL,   onevalue},
61	–	{"AMBFILE",     3,      0,      NULL,   onevalue},
59		{"OPTFILE",     3,      0,      NULL,   onevalue},
60	<	{"EXPOSURE",    3,      0,      NULL,   fltvalue},
60	>	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
61	>	{"pfilt",       2,      0,      NULL,   catvalues},
62	>	{"PICTURE",     3,      0,      NULL,   onevalue},
63	>	{"QUALITY",     3,      0,      NULL,   qualvalue},
64	>	{"RAWFILE",     3,      0,      NULL,   onevalue},
65	>	{"render",      3,      0,      NULL,   catvalues},
66	>	{"REPORT",      3,      0,      NULL,   onevalue},
67		{"RESOLUTION",  3,      0,      NULL,   onevalue},
68	+	{"scene",       3,      0,      NULL,   catvalues},
69		{"UP",          2,      0,      NULL,   onevalue},
66	–	{"INDIRECT",    3,      0,      NULL,   intvalue},
67	–	{"DETAIL",      3,      0,      NULL,   qualvalue},
68	–	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
70		{"VARIABILITY", 3,      0,      NULL,   qualvalue},
71	<	{"REPORT",      3,      0,      NULL,   onevalue},
71	<	{"RAWFILE",     3,      0,      NULL,   onevalue},
71	>	{"view",        2,      0,      NULL,   NULL},
72		{"ZFILE",       2,      0,      NULL,   onevalue},
73	+	{"ZONE",        2,      0,      NULL,   onevalue},
74		};
75
76		/* overture calculation file */
#	Line 79 | Line 80 | char   overfile[] = "overture.unf";
80		char    overfile[] = "/dev/null";
81		#endif
82
83	<	extern time_t   fdate(), time();
83	>	extern time_t   time();
84
85		time_t  scenedate;              /* date of latest scene or object file */
86		time_t  octreedate;             /* date of octree */
#	Line 184 | Line 185 | char   *argv[];
185		quit(0);
186		userr:
187		fprintf(stderr,
188	<	"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
188	>	"Usage: %s [-w][-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
189		progname);
190		quit(1);
191		}
#	Line 211 | Line 212 | register char  *fnames;
212		{
213		char    thisfile[MAXPATH];
214		time_t  thisdate, lastdate = 0;
214	–	register char   *cp;
215
216		if (fnames == NULL)
217		return(0);
218	<	while (*fnames) {
219	<	while (isspace(*fnames)) fnames++;
220	<	cp = thisfile;
221	<	while (*fnames && !isspace(*fnames))
222	<	*cp++ = *fnames++;
223	<	*cp = '\0';
218	>	while ((fnames = nextword(thisfile, MAXPATH, fnames)) != NULL) {
219	>	if (thisfile[0] == '!' ||
220	>	(thisfile[0] == '\\' && thisfile[1] == '!'))
221	>	continue;
222		if (!(thisdate = fdate(thisfile)))
223		syserr(thisfile);
224		if (thisdate > lastdate)
#	Line 265 | Line 263 | checkfiles()                   /* check for existence and modified tim
263		syserr(progname);
264		sprintf(vval(OCTREE), "%s.oct", radname);
265		vdef(OCTREE)++;
266	+	} else if (vval(OCTREE)[0] == '!') {
267	+	fprintf(stderr, "%s: illegal '%s' specification\n",
268	+	progname, vnam(OCTREE));
269	+	quit(1);
270		}
271		octreedate = fdate(vval(OCTREE));
272		if (vdef(ILLUM)) {              /* illum requires secondary octrees */
#	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 349 | 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 812 | Line 824 | char   *ro;
824		syserr(vval(OPTFILE));
825		sprintf(ro, " @%s", vval(OPTFILE));
826		}
827	<	#ifdef MSDOS
827	>	#ifdef _WIN32
828		else if (n > 50) {
829		setenv("ROPT", ro+1);
830		strcpy(ro, " $ROPT");
#	Line 831 | Line 843 | register char  *po;
843		}
844		switch (vscale(QUALITY)) {
845		case MEDIUM:
846	<	po = addarg(po, "-r 1");
846	>	po = addarg(po, "-r .6");
847		break;
848		case HIGH:
849		po = addarg(po, "-m .25");
#	Line 968 | Line 980 | register char  *vs;
980		if (cp == viewopts)             /* append any additional options */
981		vs++;           /* skip prefixed space if unneeded */
982		strcpy(cp, vs);
983	<	#ifdef MSDOS
983	>	#ifdef _WIN32
984		if (strlen(viewopts) > 40) {
985		setenv("VIEW", viewopts);
986		return("$VIEW");
#	Line 1022 | Line 1034 | char   *vn;            /* returned view name */
1034		printview(vopts)                        /* print out selected view */
1035		register char   *vopts;
1036		{
1025	–	extern char     *strstr(), *atos(), *getenv();
1037		VIEW    vwr;
1038		char    buf[128];
1039		register char   *cp;
1040		again:
1041		if (vopts == NULL)
1042		return(-1);
1043	<	#ifdef MSDOS
1043	>	#ifdef _WIN32
1044		if (vopts[0] == '$') {
1045		vopts = getenv(vopts+1);
1046		goto again;
1047		}
1048		#endif
1049		copystruct(&vwr, &stdview);
1050	<	cp = vopts;                             /* get -vf files first */
1050	>	sscanview(&vwr, cp=vopts);              /* set initial options */
1051		while ((cp = strstr(cp, "-vf ")) != NULL &&
1052	<	*atos(buf, sizeof(buf), cp += 4))
1053	<	viewfile(buf, &vwr, NULL);
1054	<	sscanview(&vwr, vopts);                 /* get the rest */
1052	>	*atos(buf, sizeof(buf), cp += 4)) {
1053	>	viewfile(buf, &vwr, NULL);      /* load -vf file */
1054	>	sscanview(&vwr, cp);            /* reset tail */
1055	>	}
1056		fputs(VIEWSTR, stdout);
1057		fprintview(&vwr, stdout);               /* print full spec. */
1058		fputc('\n', stdout);
#	Line 1236 | Line 1248 | rmfile(fn)                     /* remove a file */
1248		char    *fn;
1249		{
1250		if (!silent)
1251	<	#ifdef MSDOS
1251	>	#ifdef _WIN32
1252		printf("\tdel %s\n", fn);
1253		#else
1254		printf("\trm -f %s\n", fn);
#	Line 1251 | Line 1263 | mvfile(fold, fnew)             /* move a file */
1263		char    *fold, *fnew;
1264		{
1265		if (!silent)
1266	<	#ifdef MSDOS
1266	>	#ifdef _WIN32
1267		printf("\trename %s %s\n", fold, fnew);
1268		#else
1269		printf("\tmv %s %s\n", fold, fnew);
#	Line 1262 | Line 1274 | char   *fold, *fnew;
1274		}
1275
1276
1277	<	#ifdef MSDOS
1277	>	#ifdef _WIN32
1278		setenv(vname, value)            /* set an environment variable */
1279		char    *vname, *value;
1280		{
#	Line 1299 | Line 1311 | char   *s;
1311		}
1312
1313
1314	+	void
1315		quit(ec)                        /* exit program */
1316		int     ec;
1317		{

Diff Legend

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