--- ray/src/util/findglare.c	1991/03/25 14:40:10	1.12
+++ ray/src/util/findglare.c	1991/04/05 14:26:47	1.15
@@ -40,7 +40,10 @@ int	hlim;				/* central limit of horizontal */
 
 struct illum	*indirect;		/* array of indirect illuminances */
 
+long	npixinvw;			/* number of pixels in view */
+long	npixmiss;			/* number of pixels missed */
 
+
 main(argc, argv)
 int	argc;
 char	*argv[];
@@ -223,6 +226,7 @@ init()				/* initialize global variables */
 	indirect = (struct illum *)calloc(nglardirs, sizeof(struct illum));
 	if (indirect == NULL)
 		memerr("indirect illuminances");
+	npixinvw = npixmiss = 0L;
 	copystruct(&leftview, &ourview);
 	copystruct(&rightview, &ourview);
 	spinvector(leftview.vdir, ourview.vdir, ourview.vup, maxtheta);
@@ -276,6 +280,9 @@ cleanup()				/* close files, wait for children */
 		close_pict();
 	if (octree != NULL)
 		done_rtrace();
+	if (npixinvw < 100*npixmiss)
+		fprintf(stderr, "%s: warning -- missing %ld%% of samples\n",
+				progname, 100L*npixmiss/npixinvw);
 }
 
 
@@ -283,18 +290,31 @@ compdir(vd, x, y)			/* compute direction for x,y */
 FVECT	vd;
 int	x, y;
 {
+	static int	cury = 10000;
+	static double	err, cmpval;
+	long	t;
 	FVECT	org;			/* dummy variable */
 
 	if (x <= -hlim)			/* left region */
 		return(viewray(org, vd, &leftview,
-				(x+hlim)/(2.*sampdens)+.5,
-				y/(2.*sampdens)+.5));
+				(double)(x+hlim)/(2*sampdens)+.5,
+				(double)y/(2*sampdens)+.5));
 	if (x >= hlim)			/* right region */
 		return(viewray(org, vd, &rightview,
-				(x-hlim)/(2.*sampdens)+.5,
-				y/(2.*sampdens)+.5));
-						/* central region */
-	if (viewray(org, vd, &ourview, .5, y/(2.*sampdens)+.5) < 0)
+				(double)(x-hlim)/(2*sampdens)+.5,
+				(double)y/(2*sampdens)+.5));
+					/* central region */
+				/* avoid over-counting of poles */
+	if (cury != y) {
+		err = 0.0;
+		cmpval = sqrt(1.0 - (double)((long)y*y)/((long)vsize*vsize));
+		cury = y;
+	}
+	err += cmpval;
+	if (err <= 0.5)
+		return(-1);
+	err -= 1.0;
+	if (viewray(org, vd, &ourview, .5, (double)y/(2*sampdens)+.5) < 0)
 		return(-1);
 	spinvector(vd, vd, ourview.vup, h_theta(x));
 	return(0);