--- ray/src/util/glare.h	1991/03/18 12:15:39	1.1
+++ ray/src/util/glare.h	1991/03/19 11:11:18	1.6
@@ -13,7 +13,7 @@
 
 #define GLAREBR		10.0		/* glare source is this * avg. lum. */
 
-#define SAMPDENS	50		/* samples per unit in image */
+#define SAMPDENS	50		/* default samples per unit in image */
 #define TSAMPSTEP	10		/* sample step to compute threshold */
 
 #define SEPS		2		/* sources this close ==> contig. */
@@ -25,15 +25,16 @@ extern VIEW	leftview, rightview;	/* leftmost and right
 extern int	verbose;		/* verbose reporting */
 extern char	*progname;		/* global argv[0] */
 
+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 h_theta(h)	(-(double)(h)/(double)sampdens)
 
 extern struct illum {
 	float	theta;		/* glare direction */
@@ -52,8 +53,8 @@ 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 */