--- ray/src/util/glarendx.c	1991/04/17 08:21:41	1.2
+++ ray/src/util/glarendx.c	1991/04/18 15:18:20	1.4
@@ -53,7 +53,9 @@ int	print_header = 1;
 
 VIEW	midview = STDVIEW;
 
+int	wrongformat = 0;
 
+
 main(argc, argv)
 int	argc;
 char	*argv[];
@@ -89,14 +91,19 @@ char	*argv[];
 			exit(1);
 		}
 					/* read header */
-	getheader(stdin, headline);
+	getheader(stdin, headline, NULL);
+	if (wrongformat) {
+		fprintf(stderr, "%s: bad input format\n", progname);
+		exit(1);
+	}
 	if (print_header) {		/* add to header */
 		printargs(i, argv, stdout);
 		putchar('\n');
 	}
 					/* set view */
 	if (setview(&midview) != NULL) {
-		fprintf(stderr, "%s: bad view information in input\n");
+		fprintf(stderr, "%s: bad view information in input\n",
+				progname);
 		exit(1);
 	}
 					/* get findglare data */
@@ -119,10 +126,16 @@ userr:
 headline(s)			/* get line from header */
 char	*s;
 {
+	char	fmt[32];
+
 	if (print_header)		/* copy to output */
 		fputs(s, stdout);
 	if (!strncmp(s, VIEWSTR, VIEWSTRL))
 		sscanview(&midview, s+VIEWSTRL);
+	else if (isformat(s)) {
+		formatval(fmt, s);
+		wrongformat = strcmp(fmt, "ASCII");
+	}
 }
 
 
@@ -255,21 +268,24 @@ struct glare_dir	*gd;
 	register struct glare_src	*gs;
 	double	p;
 	double	sum;
+	double	wtot, brsum;
 	int	n;
 
-	sum = 0.0; n = 0;
+	sum = wtot = brsum = 0.0; n = 0;
 	for (gs = all_srcs; gs != NULL; gs = gs->next) {
 		p = posindex(gs->dir, midview.vdir, midview.vup);
 		if (p <= FTINY)
 			continue;
 		sum += gs->lum * q(gs->dom) / p;
+		brsum += gs->lum * gs->dom;
+		wtot += gs->dom;
 		n++;
 	}
 	if (n == 0)
 		return(0.0);
 	else
 		return( pow(
-			.5*sum/pow(direct(gd)+gd->indirect,.44),
+			.5*sum/pow((brsum+(5.-wtot)*gd->indirect/PI)/5.,.44),
 			pow((double)n, -.0914) ) );
 #undef q
 }
@@ -288,5 +304,5 @@ double
 guth_vcp(gd)		/* compute Guth visual comfort probability */
 struct glare_dir	*gd;
 {
-	return(100.*norm_integral(-6.374+1.3227*log(guth_dgr(gd))));
+	return(100.*norm_integral(6.374-1.3227*log(guth_dgr(gd))));
 }