--- ray/src/util/findglare.c	1991/04/02 16:47:03	1.14
+++ ray/src/util/findglare.c	1991/04/22 08:21:01	1.20
@@ -12,8 +12,6 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include "glare.h"
 
-#include "random.h"
-
 #define FEQ(a,b)	((a)-(b)<=FTINY&&(a)-(b)<=FTINY)
 #define VEQ(v1,v2)	(FEQ((v1)[0],(v2)[0])&&FEQ((v1)[1],(v2)[1]) \
 				&&FEQ((v1)[2],(v2)[2]))
@@ -38,7 +36,6 @@ ANGLE	glarang[180] = {AEND};		/* glare calculation ang
 int	nglarangs = 0;
 double	maxtheta;			/* maximum angle (in radians) */
 int	hsize;				/* horizontal size */
-int	hlim;				/* central limit of horizontal */
 
 struct illum	*indirect;		/* array of indirect illuminances */
 
@@ -50,6 +47,7 @@ main(argc, argv)
 int	argc;
 char	*argv[];
 {
+	int	combine = 1;
 	int	gotview = 0;
 	int	rval, i;
 	char	*err;
@@ -103,6 +101,9 @@ char	*argv[];
 		case 'p':
 			picture = argv[++i];
 			break;
+		case 'c':
+			combine = !combine;
+			break;
 		case 'd':
 		case 'l':
 			rtargv[rtargc++] = argv[i];
@@ -181,12 +182,16 @@ char	*argv[];
 	if (threshold <= FTINY)
 		comp_thresh();			/* compute glare threshold */
 	analyze();				/* analyze view */
+	if (combine)
+		absorb_specks();		/* eliminate tiny sources */
 	cleanup();				/* tidy up */
 						/* print header */
 	printargs(argc, argv, stdout);
 	fputs(VIEWSTR, stdout);
 	fprintview(&ourview, stdout);
-	printf("\n\n");
+	printf("\n");
+	fputformat("ASCII", stdout);
+	printf("\n");
 	printsources();				/* print glare sources */
 	printillum();				/* print illuminances */
 	exit(0);
@@ -221,8 +226,7 @@ init()				/* initialize global variables */
 		maxtheta = (PI/180.)*glarang[nglarangs-1];
 	else
 		maxtheta = 0.0;
-	hlim = sampdens*maxtheta;
-	hsize = hlim + sampdens - 1;
+	hsize = hlim(0) + sampdens - 1;
 	if (hsize > (int)(PI*sampdens))
 		hsize = PI*sampdens;
 	indirect = (struct illum *)calloc(nglardirs, sizeof(struct illum));
@@ -277,7 +281,7 @@ init()				/* initialize global variables */
 cleanup()				/* close files, wait for children */
 {
 	if (verbose)
-		fprintf(stderr, "%s: cleaning up...\n", progname);
+		fprintf(stderr, "%s: cleaning up...        \n", progname);
 	if (picture != NULL)
 		close_pict();
 	if (octree != NULL)
@@ -292,26 +296,44 @@ compdir(vd, x, y)			/* compute direction for x,y */
 FVECT	vd;
 int	x, y;
 {
-	long	t;
+	int	hl;
 	FVECT	org;			/* dummy variable */
 
-	if (x <= -hlim)			/* left region */
+	hl = hlim(y);
+	if (x <= -hl)			/* left region */
 		return(viewray(org, vd, &leftview,
-				(double)(x+hlim)/(2*sampdens)+.5,
+				(double)(x+hl)/(2*sampdens)+.5,
 				(double)y/(2*sampdens)+.5));
-	if (x >= hlim)			/* right region */
+	if (x >= hl)			/* right region */
 		return(viewray(org, vd, &rightview,
-				(double)(x-hlim)/(2*sampdens)+.5,
+				(double)(x-hl)/(2*sampdens)+.5,
 				(double)y/(2*sampdens)+.5));
 					/* central region */
-				/* avoid over-counting of poles */
-	t = random() % vsize;
-	if (t*t >= (long)vsize*vsize - (long)y*y)
-		return(-1);
 	if (viewray(org, vd, &ourview, .5, (double)y/(2*sampdens)+.5) < 0)
 		return(-1);
-	spinvector(vd, vd, ourview.vup, h_theta(x));
+	spinvector(vd, vd, ourview.vup, h_theta(x,y));
 	return(0);
+}
+
+
+double
+pixsize(x, y)		/* return the solid angle of pixel at (x,y) */
+int	x, y;
+{
+	register int	hl, xo;
+	double	disc;
+
+	hl = hlim(y);
+	if (x < -hl)
+		xo = x+hl;
+	else if (x > hl)
+		xo = x-hl;
+	else
+		xo = 0;
+	disc = 1. - (double)(xo*xo + y*y)/(sampdens*sampdens);
+	if (disc <= FTINY)
+		return(0.);
+	return(1./(sampdens*sampdens*sqrt(disc)));
 }