--- ray/src/util/findglare.c	1991/04/22 08:21:01	1.20
+++ ray/src/util/findglare.c	1993/02/03 17:55:34	2.5
@@ -12,11 +12,11 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include "glare.h"
 
-#define FEQ(a,b)	((a)-(b)<=FTINY&&(a)-(b)<=FTINY)
+#define FEQ(a,b)	((a)-(b)<=FTINY&&(b)-(a)<=FTINY)
 #define VEQ(v1,v2)	(FEQ((v1)[0],(v2)[0])&&FEQ((v1)[1],(v2)[1]) \
 				&&FEQ((v1)[2],(v2)[2]))
 
-char	*rtargv[32] = {"rtrace", "-h", "-ov", "-fff"};
+char	*rtargv[32] = {"rtrace", "-h-", "-ov", "-fff"};
 int	rtargc = 4;
 
 VIEW	ourview = STDVIEW;		/* our view */
@@ -75,7 +75,7 @@ char	*argv[];
 			}
 			if (argv[i][2] != 'f')
 				goto userr;
-			rval = viewfile(argv[++i], &ourview, 0, 0);
+			rval = viewfile(argv[++i], &ourview, NULL);
 			if (rval < 0) {
 				fprintf(stderr,
 				"%s: cannot open view file \"%s\"\n",
@@ -105,10 +105,20 @@ char	*argv[];
 			combine = !combine;
 			break;
 		case 'd':
+			if (argv[i][2] == 'v') {
+				rtargv[rtargc++] = argv[i];
+				break;
+			}
+			/* FALL THROUGH */
 		case 'l':
+		case 's':
+		case 'P':
 			rtargv[rtargc++] = argv[i];
 			rtargv[rtargc++] = argv[++i];
 			break;
+		case 'w':
+			rtargv[rtargc++] = argv[i];
+			break;
 		case 'a':
 			rtargv[rtargc++] = argv[i];
 			if (argv[i][2] == 'v') {
@@ -130,7 +140,7 @@ char	*argv[];
 	}
 						/* get view */
 	if (picture != NULL) {
-		rval = viewfile(picture, &pictview, 0, 0);
+		rval = viewfile(picture, &pictview, NULL);
 		if (rval < 0) {
 			fprintf(stderr, "%s: cannot open picture file \"%s\"\n",
 					progname, picture);
@@ -190,7 +200,7 @@ char	*argv[];
 	fputs(VIEWSTR, stdout);
 	fprintview(&ourview, stdout);
 	printf("\n");
-	fputformat("ASCII", stdout);
+	fputformat("ascii", stdout);
 	printf("\n");
 	printsources();				/* print glare sources */
 	printillum();				/* print illuminances */
@@ -203,6 +213,23 @@ userr:
 }
 
 
+int
+angcmp(ap1, ap2)		/* compare two angles */
+ANGLE	*ap1, *ap2;
+{
+	register int	a1, a2;
+
+	a1 = *ap1;
+	a2 = *ap2;
+	if (a1 == a2) {
+		fprintf(stderr, "%s: duplicate glare angle (%d)\n",
+				progname, a1);
+		exit(1);
+	}
+	return(a1-a2);
+}
+
+
 init()				/* initialize global variables */
 {
 	double	d;
@@ -214,8 +241,9 @@ init()				/* initialize global variables */
 						/* set direction vectors */
 	for (i = 0; glarang[i] != AEND; i++)
 		;
-	if (i > 0 && (glarang[0] <= 0 || glarang[i-1] >= 180)) {
-		fprintf(stderr, "%s: glare angles must be between 1 and 179\n",
+	qsort(glarang, i, sizeof(ANGLE), angcmp);
+	if (i > 0 && (glarang[0] <= 0 || glarang[i-1] > 180)) {
+		fprintf(stderr, "%s: glare angles must be between 1 and 180\n",
 				progname);
 		exit(1);
 	}
@@ -287,8 +315,8 @@ cleanup()				/* close files, wait for children */
 	if (octree != NULL)
 		done_rtrace();
 	if (npixinvw < 100*npixmiss)
-		fprintf(stderr, "%s: warning -- missing %ld%% of samples\n",
-				progname, 100L*npixmiss/npixinvw);
+		fprintf(stderr, "%s: warning -- missing %d%% of samples\n",
+				progname, (int)(100L*npixmiss/npixinvw));
 }
 
 
@@ -300,14 +328,20 @@ int	x, y;
 	FVECT	org;			/* dummy variable */
 
 	hl = hlim(y);
-	if (x <= -hl)			/* left region */
+	if (x <= -hl) {			/* left region */
+		if (x <= -hl-sampdens)
+			return(-1);
 		return(viewray(org, vd, &leftview,
 				(double)(x+hl)/(2*sampdens)+.5,
 				(double)y/(2*sampdens)+.5));
-	if (x >= hl)			/* right region */
+	}
+	if (x >= hl) {			/* right region */
+		if (x >= hl+sampdens)
+			return(-1);
 		return(viewray(org, vd, &rightview,
 				(double)(x-hl)/(2*sampdens)+.5,
 				(double)y/(2*sampdens)+.5));
+	}
 					/* central region */
 	if (viewray(org, vd, &ourview, .5, (double)y/(2*sampdens)+.5) < 0)
 		return(-1);