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.17 by greg, Mon Aug 9 17:50:09 1993 UTC vs.
Revision 2.22 by greg, Wed Aug 25 13:48:37 1993 UTC

#	Line 110 | Line 110 | long   matdate;                /* date of latest material file */
110		int     explicate = 0;          /* explicate variables */
111		int     silent = 0;             /* do work silently */
112		int     noaction = 0;           /* don't do anything */
113	+	int     sayview = 0;            /* print view out */
114		char    *rvdevice = NULL;       /* rview output device */
115		char    *viewselect = NULL;     /* specific view only */
116
117		int     overture = 0;           /* overture calculation needed */
118
119		char    *progname;              /* global argv[0] */
120	+	char    *rifname;               /* global rad input file name */
121
122		char    radname[MAXPATH];       /* root Radiance file name */
123
#	Line 143 | Line 145 | char   *argv[];
145		case 'o':
146		rvdevice = argv[++i];
147		break;
148	+	case 'V':
149	+	sayview++;
150	+	break;
151		case 'v':
152		viewselect = argv[++i];
153		break;
#	Line 151 | Line 156 | char   *argv[];
156		}
157		if (i >= argc)
158		goto userr;
159	+	rifname = argv[i];
160		/* assign Radiance root file name */
161	<	rootname(radname, argv[i]);
161	>	rootname(radname, rifname);
162		/* load variable values */
163	<	load(argv[i]);
163	>	load(rifname);
164		/* get any additional assignments */
165		for (i++; i < argc; i++)
166		setvariable(argv[i]);
#	Line 310 | Line 316 | register int   n;
316		{
317		register char   *cp;
318
319	<	if (vp == NULL || n < 0 || n >= vp->nass)
319	>	if (vp == NULL | n < 0 | n >= vp->nass)
320		return(NULL);
321		cp = vp->value;
322		while (n--)
#	Line 578 | Line 584 | double
584		ambval()                                /* compute ambient value */
585		{
586		if (vdef(EXPOSURE)) {
587	+	if (!isflt(vval(EXPOSURE)))
588	+	badvalue(EXPOSURE);
589		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
590		return(.5/pow(2.,atof(vval(EXPOSURE))));
591	<	if (isdigit(vval(EXPOSURE)[0]) || vval(EXPOSURE)[0] == '.')
584	<	return(.5/atof(vval(EXPOSURE)));
585	<	badvalue(EXPOSURE);
591	>	return(.5/atof(vval(EXPOSURE)));
592		}
593		if (vlet(ZONE) == 'E')
594		return(10.);
#	Line 970 | Line 976 | getview(n, vn)                         /* get view n, or NULL if none */
976		int     n;
977		char    *vn;            /* returned view name */
978		{
979	<	register char   *mv = NULL;
979	>	register char   *mv;
980
981		if (viewselect != NULL) {               /* command-line selected */
982		if (n)                          /* only do one */
#	Line 985 | Line 991 | char   *vn;            /* returned view name */
991		;
992		*vn = '\0';
993		}
994	+	/* view number? */
995	+	if (isint(viewselect))
996	+	return(specview(nvalue(vv+VIEW, atoi(viewselect)-1)));
997		/* check list */
998		while ((mv = nvalue(vv+VIEW, n++)) != NULL)
999		if (matchword(viewselect, mv))
#	Line 993 | Line 1002 | char   *vn;            /* returned view name */
1002		}
1003		mv = nvalue(vv+VIEW, n);                /* use view n */
1004		if (vn != NULL & mv != NULL) {
1005	<	if (*mv != '-')
1006	<	while (*mv && !isspace(*mv))
1007	<	*vn++ = *mv++;
1005	>	register char   *mv2 = mv;
1006	>	if (*mv2 != '-')
1007	>	while (*mv2 && !isspace(*mv2))
1008	>	*vn++ = *mv2++;
1009		*vn = '\0';
1010		}
1011		return(specview(mv));
1012		}
1013
1014
1015	+	printview(vopts)                        /* print out selected view */
1016	+	register char   *vopts;
1017	+	{
1018	+	extern char     *atos();
1019	+	char    buf[256];
1020	+	FILE    *fp;
1021	+	register char   *cp;
1022	+
1023	+	if (vopts == NULL)
1024	+	return(-1);
1025	+	fputs("VIEW=", stdout);
1026	+	do {
1027	+	if (matchword(vopts, "-vf")) {          /* expand view file */
1028	+	vopts = sskip(vopts);
1029	+	if (!*atos(buf, sizeof(buf), vopts))
1030	+	return(-1);
1031	+	if ((fp = fopen(buf, "r")) == NULL)
1032	+	return(-1);
1033	+	for (buf[sizeof(buf)-2] = '\n';
1034	+	fgets(buf, sizeof(buf), fp) != NULL &&
1035	+	buf[0] != '\n';
1036	+	buf[sizeof(buf)-2] = '\n') {
1037	+	if (buf[sizeof(buf)-2] != '\n') {
1038	+	ungetc(buf[sizeof(buf)-2], fp);
1039	+	buf[sizeof(buf)-2] = '\0';
1040	+	}
1041	+	if (matchword(buf, "VIEW=") ||
1042	+	matchword(buf, "rview")) {
1043	+	for (cp = sskip(buf); *cp && *cp != '\n'; cp++)
1044	+	putchar(*cp);
1045	+	}
1046	+	}
1047	+	fclose(fp);
1048	+	vopts = sskip(vopts);
1049	+	} else {
1050	+	while (isspace(*vopts))
1051	+	vopts++;
1052	+	putchar(' ');
1053	+	while (*vopts && !isspace(*vopts))
1054	+	putchar(*vopts++);
1055	+	}
1056	+	} while (*vopts++);
1057	+	putchar('\n');
1058	+	return(0);
1059	+	}
1060	+
1061	+
1062		rview(opts)                             /* run rview with first view */
1063		char    *opts;
1064		{
1065	+	char    *vw;
1066		char    combuf[512];
1067		/* build command */
1068	<	sprintf(combuf, "rview %s%s ", getview(0, NULL), opts);
1068	>	if ((vw = getview(0, NULL)) == NULL)
1069	>	return;
1070	>	if (sayview)
1071	>	printview(vw);
1072	>	sprintf(combuf, "rview %s%s -R %s ", vw, opts, rifname);
1073		if (rvdevice != NULL)
1074		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1075		strcat(combuf, vval(OCTREE));
#	Line 1062 | Line 1124 | char   *opts;
1124		/* do each view */
1125		vn = 0;
1126		while ((vw = getview(vn++, vs)) != NULL) {
1127	+	if (sayview)
1128	+	printview(vw);
1129		if (!vs[0])
1130		sprintf(vs, "%d", vn);
1131		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);

Diff Legend

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