--- ray/src/util/glare.h	1991/03/18 12:15:39	1.1
+++ ray/src/util/glare.h	1993/05/25 14:54:05	2.2
@@ -11,13 +11,21 @@
 #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		/* samples per unit in image */
+#define SAMPDENS	75		/* 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)
+
+#define SABIG		.025		/* solid angle of splittable source */
+#define LCORR		.12		/* linearity of splittable source */
+
 extern VIEW	ourview;		/* our view */
 extern VIEW	pictview;		/* picture view */
 extern VIEW	leftview, rightview;	/* leftmost and rightmost views */
@@ -25,22 +33,26 @@ extern VIEW	leftview, rightview;	/* leftmost and right
 extern int	verbose;		/* verbose reporting */
 extern char	*progname;		/* global argv[0] */
 
+extern double	threshold;		/* threshold value for glare sources */
+
+extern int	sampdens;		/* sample density */
 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 maxtheta	((PI/180.)*glarang[nglarangs-1])
-#define vsize		SAMPDENS
-#define h_theta(h)	((double)(h)/(double)SAMPDENS)
+#define vsize		(sampdens-1)
+#define hscale(v)	sqrt((double)(sampdens*sampdens - (v)*(v)))
+#define hlim(v)		(int)(maxtheta*hscale(v))
+#define h_theta(h,v)	(-(h)/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 {
@@ -52,10 +64,14 @@ struct srcspan {
 
 extern struct source {
 	FVECT	dir;		/* source direction */
-	float	dom;		/* solid angle of source */
-	float	brt;		/* average source brightness */
+	double	dom;		/* solid angle of source */
+	double	brt;		/* average source brightness */
 	struct srcspan	*first;	/* first span for this source */
 	struct source	*next;	/* next source in list */
 } *donelist;			/* finished sources */
 
 extern double	getviewpix();
+extern double	pixsize();
+
+extern long	npixinvw;	/* number of samples in view */
+extern long	npixmiss;	/* number of samples missing */