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.55 by gregl, Fri Jan 23 17:17:32 1998 UTC

#	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>
#	Line 23 | Line 24 | static char SCCSid[] = "$SunId$ LBL";
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) */
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 */
#	Line 364 | Line 365 | setdefaults()                  /* set default values for unassigned v
365		vval(PICTURE) = radname;
366		vdef(PICTURE)++;
367		}
368	<	if (!vdef(VIEW)) {
369	<	vval(VIEW) = "X";
370	<	vdef(VIEW)++;
368	>	if (!vdef(VIEWS)) {
369	>	vval(VIEWS) = "X";
370	>	vdef(VIEWS)++;
371		}
372		if (!vdef(DETAIL)) {
373		vval(DETAIL) = "M";
#	Line 999 | Line 1000 | char   *vn;            /* returned view name */
1000		}
1001		/* view number? */
1002		if (isint(viewselect))
1003	<	return(specview(nvalue(VIEW, atoi(viewselect)-1)));
1003	>	return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
1004		/* check list */
1005	<	while ((mv = nvalue(VIEW, n++)) != NULL)
1005	>	while ((mv = nvalue(VIEWS, n++)) != NULL)
1006		if (matchword(viewselect, mv))
1007		return(specview(mv));
1008		return(specview(viewselect));   /* standard view? */
1009		}
1010	<	mv = nvalue(VIEW, n);           /* use view n */
1010	>	mv = nvalue(VIEWS, n);          /* use view n */
1011		if (vn != NULL & mv != NULL) {
1012		register char   *mv2 = mv;
1013		if (*mv2 != '-')
#	Line 1021 | Line 1022 | char   *vn;            /* returned view name */
1022		printview(vopts)                        /* print out selected view */
1023		register char   *vopts;
1024		{
1025	<	extern char     *atos(), *getenv();
1026	<	char    buf[256];
1027	<	FILE    *fp;
1025	>	extern char     *strstr(), *atos(), *getenv();
1026	>	VIEW    vwr;
1027	>	char    buf[128];
1028		register char   *cp;
1029	<
1029	>	again:
1030		if (vopts == NULL)
1031		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(' ');
1032		#ifdef MSDOS
1033	<	if (*vopts == '$') {            /* expand env. var. */
1034	<	if (!*atos(buf, sizeof(buf), vopts+1))
1035	<	return(-1);
1036	<	if ((cp = getenv(buf)) == NULL)
1064	<	return(-1);
1065	<	fputs(cp, stdout);
1066	<	vopts = sskip(vopts);
1067	<	} else
1033	>	if (vopts[0] == '$') {
1034	>	vopts = getenv(vopts+1);
1035	>	goto again;
1036	>	}
1037		#endif
1038	<	while (*vopts && !isspace(*vopts))
1039	<	putchar(*vopts++);
1040	<	}
1041	<	} while (*vopts++);
1042	<	putchar('\n');
1038	>	copystruct(&vwr, &stdview);
1039	>	cp = vopts;                             /* get -vf files first */
1040	>	while ((cp = strstr(cp, "-vf ")) != NULL &&
1041	>	*atos(buf, sizeof(buf), cp += 4))
1042	>	viewfile(buf, &vwr, NULL);
1043	>	sscanview(&vwr, vopts);                 /* get the rest */
1044	>	fputs(VIEWSTR, stdout);
1045	>	fprintview(&vwr, stdout);               /* print full spec. */
1046	>	fputc('\n', stdout);
1047		return(0);
1048		}
1049

Diff Legend

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