--- ray/src/util/findglare.c	1991/04/22 14:56:28	1.22
+++ ray/src/util/findglare.c	1994/03/06 12:52:58	2.7
@@ -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 */
@@ -55,6 +55,13 @@ char	*argv[];
 	progname = argv[0];
 					/* process options */
 	for (i = 1; i < argc && argv[i][0] == '-'; i++) {
+						/* expand arguments */
+		while (rval = expandarg(&argc, &argv, i))
+			if (rval < 0) {
+				fprintf(stderr, "%s: cannot expand '%s'",
+						argv[0], argv[i]);
+				exit(1);
+			}
 		rval = getviewopt(&ourview, argc-i, argv+i);
 		if (rval >= 0) {
 			i += rval;
@@ -75,7 +82,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 +112,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 +147,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);
@@ -186,6 +203,7 @@ char	*argv[];
 		absorb_specks();		/* eliminate tiny sources */
 	cleanup();				/* tidy up */
 						/* print header */
+	newheader("RADIANCE", stdout);
 	printargs(argc, argv, stdout);
 	fputs(VIEWSTR, stdout);
 	fprintview(&ourview, stdout);
@@ -203,6 +221,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 +249,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 +323,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));
 }
 
 
@@ -336,8 +372,8 @@ int	x, y;
 		xo = x-hl;
 	else
 		xo = 0;
-	disc = 1. - (double)(xo*xo + y*y)/(sampdens*sampdens);
-	if (disc <= FTINY)
+	disc = 1. - (double)((long)xo*xo + (long)y*y)/((long)sampdens*sampdens);
+	if (disc <= FTINY*FTINY)
 		return(0.);
 	return(1./(sampdens*sampdens*sqrt(disc)));
 }