--- ray/src/util/glare.h	1991/03/19 17:31:35	1.7
+++ ray/src/util/glare.h	1991/04/19 17:41:02	1.15
@@ -11,13 +11,18 @@
 #include "color.h"
 #include "setscan.h"
 
-#define GLAREBR		10.0		/* glare source is this * avg. lum. */
+#define GLAREBR		7.0		/* glare source is this * avg. lum. */
 
 #define SAMPDENS	50		/* default samples per unit in image */
 #define TSAMPSTEP	10		/* sample step to compute threshold */
 
-#define SEPS		2		/* sources this close ==> contig. */
+#define SEPS		1		/* sources this close ==> contig. */
 
+#define SAMIN		.005		/* minimum solid angle for source */
+#define MAXBUDDY	(4.*sqrt(SAMIN/PI))	/* max separation for pairing */
+
+#define TOOSMALL(s)	((s)->brt*(s)->dom < threshold*SAMIN)
+
 extern VIEW	ourview;		/* our view */
 extern VIEW	pictview;		/* picture view */
 extern VIEW	leftview, rightview;	/* leftmost and rightmost views */
@@ -32,18 +37,19 @@ extern ANGLE	glarang[];		/* glare calculation angles *
 extern int	nglarangs;
 extern double	maxtheta;		/* maximum glare angle (in radians) */
 extern int	hsize;			/* horizontal size */
-extern int	hlim;			/* horizontal limit of central view */
 
 #define nglardirs	(2*nglarangs+1)
 #define vsize		(sampdens-1)
-#define h_theta(h)	(-(double)(h)/(double)sampdens)
+#define hscale(v)	sqrt(1.-(double)((v)*(v)/(sampdens*sampdens)))
+#define hlim(v)		(int)(maxtheta*sampdens*hscale(v))
+#define h_theta(h,v)	(-(h)/(sampdens*hscale(v)))
 
 extern struct illum {
 	float	theta;		/* glare direction */
 	float	lcos, lsin;	/* cosine and sine to left view */
 	float	rcos, rsin;	/* cosine and sine to right view */
 	double	sum;		/* sum of indirect luminances */
-	int	n;		/* number of values in sum */
+	double	n;		/* number of values in sum */
 } *indirect;		/* array of indirect illuminances */
 
 struct srcspan {
@@ -62,3 +68,7 @@ extern struct source {
 } *donelist;			/* finished sources */
 
 extern double	getviewpix();
+extern double	pixsize();
+
+extern long	npixinvw;	/* number of samples in view */
+extern long	npixmiss;	/* number of samples missing */