--- ray/src/util/findglare.c	1991/03/18 15:06:49	1.3
+++ ray/src/util/findglare.c	1991/04/18 15:18:22	1.18
@@ -19,7 +19,7 @@ static char SCCSid[] = "$SunId$ LBL";
 char	*rtargv[32] = {"rtrace", "-h", "-ov", "-fff"};
 int	rtargc = 4;
 
-VIEW	ourview;			/* our view */
+VIEW	ourview = STDVIEW;		/* our view */
 VIEW	pictview = STDVIEW;		/* picture view */
 VIEW	leftview, rightview;		/* leftmost and rightmost views */
 
@@ -29,6 +29,9 @@ char	*octree = NULL;			/* octree file name */
 int	verbose = 0;			/* verbose reporting */
 char	*progname;			/* global argv[0] */
 
+double	threshold = 0.;			/* glare threshold */
+
+int	sampdens = SAMPDENS;		/* sample density */
 ANGLE	glarang[180] = {AEND};		/* glare calculation angles */
 int	nglarangs = 0;
 double	maxtheta;			/* maximum angle (in radians) */
@@ -37,11 +40,15 @@ int	hlim;				/* central limit of horizontal */
 
 struct illum	*indirect;		/* array of indirect illuminances */
 
+long	npixinvw;			/* number of pixels in view */
+long	npixmiss;			/* number of pixels missed */
 
+
 main(argc, argv)
 int	argc;
 char	*argv[];
 {
+	int	combine = 1;
 	int	gotview = 0;
 	int	rval, i;
 	char	*err;
@@ -56,6 +63,12 @@ char	*argv[];
 			continue;
 		}
 		switch (argv[i][1]) {
+		case 't':
+			threshold = atof(argv[++i]);
+			break;
+		case 'r':
+			sampdens = atoi(argv[++i])/2;
+			break;
 		case 'v':
 			if (argv[i][2] == '\0') {
 				verbose++;
@@ -89,6 +102,9 @@ char	*argv[];
 		case 'p':
 			picture = argv[++i];
 			break;
+		case 'c':
+			combine = !combine;
+			break;
 		case 'd':
 		case 'l':
 			rtargv[rtargc++] = argv[i];
@@ -164,14 +180,19 @@ char	*argv[];
 		exit(1);
 	}
 	init();					/* initialize program */
-	comp_thresh();				/* compute glare threshold */
+	if (threshold <= FTINY)
+		comp_thresh();			/* compute glare threshold */
 	analyze();				/* analyze view */
+	if (combine)
+		absorb_specks();		/* eliminate tiny sources */
 	cleanup();				/* tidy up */
 						/* print header */
 	printargs(argc, argv, stdout);
 	fputs(VIEWSTR, stdout);
 	fprintview(&ourview, stdout);
-	printf("\n\n");
+	printf("\n");
+	fputformat("ASCII", stdout);
+	printf("\n");
 	printsources();				/* print glare sources */
 	printillum();				/* print illuminances */
 	exit(0);
@@ -194,25 +215,26 @@ init()				/* initialize global variables */
 						/* set direction vectors */
 	for (i = 0; glarang[i] != AEND; i++)
 		;
-	if (i > 0 && glarang[0] <= 0 || glarang[i-1] >= 180) {
+	if (i > 0 && (glarang[0] <= 0 || glarang[i-1] >= 180)) {
 		fprintf(stderr, "%s: glare angles must be between 1 and 179\n",
 				progname);
 		exit(1);
 	}
 	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");
+	npixinvw = npixmiss = 0L;
 	copystruct(&leftview, &ourview);
 	copystruct(&rightview, &ourview);
 	spinvector(leftview.vdir, ourview.vdir, ourview.vup, maxtheta);
@@ -221,22 +243,22 @@ init()				/* initialize global variables */
 	setview(&rightview);
 	indirect[nglarangs].lcos =
 	indirect[nglarangs].rcos = cos(maxtheta);
-	indirect[nglarangs].lsin =
-	-(indirect[nglarangs].rsin = sin(maxtheta));
+	indirect[nglarangs].rsin =
+	-(indirect[nglarangs].lsin = sin(maxtheta));
 	indirect[nglarangs].theta = 0.0;
 	for (i = 0; i < nglarangs; i++) {
 		d = (glarang[nglarangs-1] - glarang[i])*(PI/180.);
 		indirect[nglarangs-i-1].lcos =
 		indirect[nglarangs+i+1].rcos = cos(d);
-		indirect[nglarangs-i-1].lsin =
-		-(indirect[nglarangs+i+1].rsin = sin(d));
+		indirect[nglarangs+i+1].rsin =
+		-(indirect[nglarangs-i-1].lsin = sin(d));
 		d = (glarang[nglarangs-1] + glarang[i])*(PI/180.);
 		indirect[nglarangs-i-1].rcos =
 		indirect[nglarangs+i+1].lcos = cos(d);
-		indirect[nglarangs+i+1].lsin =
-		-(indirect[nglarangs-i-1].rsin = sin(d));
-		indirect[nglarangs-i-1].theta = -(PI/180.)*glarang[i];
-		indirect[nglarangs+i+1].theta = (PI/180.)*glarang[i];
+		indirect[nglarangs-i-1].rsin =
+		-(indirect[nglarangs+i+1].lsin = sin(d));
+		indirect[nglarangs-i-1].theta = (PI/180.)*glarang[i];
+		indirect[nglarangs+i+1].theta = -(PI/180.)*glarang[i];
 	}
 						/* open picture */
 	if (picture != NULL) {
@@ -261,59 +283,59 @@ init()				/* initialize global variables */
 cleanup()				/* close files, wait for children */
 {
 	if (verbose)
-		fprintf(stderr, "%s: cleaning up...\n", progname);
+		fprintf(stderr, "%s: cleaning up...        \n", progname);
 	if (picture != NULL)
 		close_pict();
 	if (octree != NULL)
 		done_rtrace();
+	if (npixinvw < 100*npixmiss)
+		fprintf(stderr, "%s: warning -- missing %ld%% of samples\n",
+				progname, 100L*npixmiss/npixinvw);
 }
 
 
-compdir(vd, x, y)			/* compute direction for x,y */
+compdir(vd, x, y, se)			/* compute direction for x,y */
 FVECT	vd;
 int	x, y;
+SPANERR	*se;
 {
 	FVECT	org;			/* dummy variable */
 
 	if (x <= -hlim)			/* left region */
 		return(viewray(org, vd, &leftview,
-				(x+hlim)/(2.*SAMPDENS)+.5,
-				y/(2.*SAMPDENS)+.5));
+				(double)(x+hlim)/(2*sampdens)+.5,
+				(double)y/(2*sampdens)+.5));
 	if (x >= hlim)			/* right region */
 		return(viewray(org, vd, &rightview,
-				(x-hlim)/(2.*SAMPDENS)+.5,
-				y/(2.*SAMPDENS)+.5));
-						/* central region */
-	if (viewray(org, vd, &ourview, .5, y/(2.*SAMPDENS)+.5) < 0)
+				(double)(x-hlim)/(2*sampdens)+.5,
+				(double)y/(2*sampdens)+.5));
+					/* central region */
+	if (se != NULL) {	/* avoid over-counting of poles */
+		se->err += se->prob;
+		if (se->err <= 0.5)
+			return(-1);
+		se->err -= 1.0;
+	}
+	if (viewray(org, vd, &ourview, .5, (double)y/(2*sampdens)+.5) < 0)
 		return(-1);
 	spinvector(vd, vd, ourview.vup, h_theta(x));
 	return(0);
 }
 
 
-spinvector(vres, vorig, vnorm, theta)	/* rotate vector around normal */
-FVECT  vres, vorig, vnorm;
-double  theta;
+setspanerr(se, y)		/* initialize span error at y */
+register SPANERR	*se;
+int	y;
 {
-	extern double  sin(), cos();
-	double  sint, cost, dotp;
-	FVECT  vperp;
-	register int  i;
-	
-	sint = sin(theta);
-	cost = cos(theta);
-	dotp = DOT(vorig, vnorm);
-	fcross(vperp, vnorm, vorig);
-	for (i = 0; i < 3; i++)
-		vres[i] = vnorm[i]*dotp*(1.-cost) +
-				vorig[i]*cost + vperp[i]*sint;
+	se->err = 0.0;
+	se->prob = sqrt(1.0 - (double)((long)y*y)/((long)vsize*vsize));
 }
 
 
 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 +359,8 @@ printillum()			/* print out indirect illuminances */
 
 	printf("BEGIN indirect illuminance\n");
 	for (i = 0; i < nglardirs; i++)
-		printf("\t%.0f\t%f\n", (180.0/PI)*indirect[i].theta,
-				PI * indirect[i].sum / (double)indirect[i].n);
+		if (indirect[i].n > FTINY)
+			printf("\t%.0f\t%f\n", (180.0/PI)*indirect[i].theta,
+					PI * indirect[i].sum / indirect[i].n);
 	printf("END indirect illuminance\n");
 }