--- ray/src/util/findglare.c	1991/03/18 14:32:12	1.2
+++ ray/src/util/findglare.c	1991/03/19 09:08:18	1.5
@@ -29,6 +29,7 @@ char	*octree = NULL;			/* octree file name */
 int	verbose = 0;			/* verbose reporting */
 char	*progname;			/* global argv[0] */
 
+int	sampdens = SAMPDENS;		/* sample density */
 ANGLE	glarang[180] = {AEND};		/* glare calculation angles */
 int	nglarangs = 0;
 double	maxtheta;			/* maximum angle (in radians) */
@@ -56,6 +57,9 @@ char	*argv[];
 			continue;
 		}
 		switch (argv[i][1]) {
+		case 'r':
+			sampdens = atoi(argv[++i])/2;
+			break;
 		case 'v':
 			if (argv[i][2] == '\0') {
 				verbose++;
@@ -201,22 +205,22 @@ init()				/* initialize global variables */
 	}
 	nglarangs = i;
 	/* nglardirs = 2*nglarangs + 1; */
-	/* vsize = SAMPDENS; */
+	/* vsize = sampdens - 1; */
 	if (nglarangs > 0)
 		maxtheta = (PI/180.)*glarang[nglarangs-1];
 	else
 		maxtheta = 0.0;
-	hlim = SAMPDENS*maxtheta;
-	hsize = SAMPDENS + hlim;
-	if (hsize > (int)(PI*SAMPDENS))
-		hsize = PI*SAMPDENS;
+	hlim = sampdens*maxtheta;
+	hsize = hlim + sampdens - 1;
+	if (hsize > (int)(PI*sampdens))
+		hsize = PI*sampdens;
 	indirect = (struct illum *)calloc(nglardirs, sizeof(struct illum));
 	if (indirect == NULL)
 		memerr("indirect illuminances");
 	copystruct(&leftview, &ourview);
 	copystruct(&rightview, &ourview);
-	spinvector(leftview.vdir, ourview.vdir, ourview.vup, -maxtheta);
-	spinvector(rightview.vdir, ourview.vdir, ourview.vup, maxtheta);
+	spinvector(leftview.vdir, ourview.vdir, ourview.vup, maxtheta);
+	spinvector(rightview.vdir, ourview.vdir, ourview.vup, -maxtheta);
 	setview(&leftview);
 	setview(&rightview);
 	indirect[nglarangs].lcos =
@@ -277,14 +281,14 @@ int	x, y;
 
 	if (x <= -hlim)			/* left region */
 		return(viewray(org, vd, &leftview,
-				(x+hlim)/(2.*SAMPDENS)+.5,
-				y/(2.*SAMPDENS)+.5));
+				(x+hlim)/(2.*sampdens)+.5,
+				y/(2.*sampdens)+.5));
 	if (x >= hlim)			/* right region */
 		return(viewray(org, vd, &rightview,
-				(x-hlim)/(2.*SAMPDENS)+.5,
-				y/(2.*SAMPDENS)+.5));
+				(x-hlim)/(2.*sampdens)+.5,
+				y/(2.*sampdens)+.5));
 						/* central region */
-	if (viewray(org, vd, &ourview, .5, y/(2.*SAMPDENS)+.5) < 0)
+	if (viewray(org, vd, &ourview, .5, y/(2.*sampdens)+.5) < 0)
 		return(-1);
 	spinvector(vd, vd, ourview.vup, h_theta(x));
 	return(0);
@@ -313,7 +317,7 @@ double  theta;
 memerr(s)			/* malloc failure */
 char	*s;
 {
-	fprintf(stderr, "%s: out of memory for %s\n", s);
+	fprintf(stderr, "%s: out of memory for %s\n", progname, s);
 	exit(1);
 }
 
@@ -337,7 +341,7 @@ printillum()			/* print out indirect illuminances */
 
 	printf("BEGIN indirect illuminance\n");
 	for (i = 0; i < nglardirs; i++)
-		printf("\t%f\t%f\n", (180.0/PI)*indirect[i].theta,
+		printf("\t%.0f\t%f\n", (180.0/PI)*indirect[i].theta,
 				PI * indirect[i].sum / (double)indirect[i].n);
 	printf("END indirect illuminance\n");
 }