--- ray/src/util/glareval.c	1991/03/18 12:15:41	1.1
+++ ray/src/util/glareval.c	1991/03/19 17:06:27	1.3
@@ -20,7 +20,7 @@ static char SCCSid[] = "$SunId$ LBL";
 #define vfork		fork
 #endif
 
-#define NSCANS		16		/* number of scanlines to buffer */
+#define NSCANS		64		/* number of scanlines to buffer */
 
 int	rt_pid = -1;		/* process id for rtrace */
 int	fd_tort, fd_fromrt;	/* pipe descriptors */
@@ -36,13 +36,15 @@ struct {
 	COLR	*sl;		/* scanline contents */
 } scan[NSCANS];		/* buffered scanlines */
 
+static long	ncall = 0L;	/* number of calls to getpictscan */
+static long	nread = 0L;	/* number of scanlines read */
 
+
 COLR *
 getpictscan(y)			/* get picture scanline */
 int	y;
 {
 	extern long	ftell();
-	static long	ncall = 0;
 	int	minused;
 	register int	i;
 					/* first check our buffers */
@@ -58,9 +60,6 @@ int	y;
 	}
 					/* not there, read it in */
 	if (scanpos[y] == -1) {			/* need to search */
-		if (verbose)
-			fprintf(stderr, "%s: reading picture...\n",
-					progname);
 		while (curpos > y) {
 			scanpos[curpos] = ftell(pictfp);
 			if (freadcolrs(scan[minused].sl, pxsiz, pictfp) < 0)
@@ -71,10 +70,9 @@ int	y;
 		fprintf(stderr, "%s: picture seek error\n", progname);
 		exit(1);
 	}
-	if (verbose)
-		fprintf(stderr, "%s: reading scanline %d...\n", progname, y);
 	if (freadcolrs(scan[minused].sl, pxsiz, pictfp) < 0)
 		goto readerr;
+	nread++;
 	curpos = y-1;
 	scan[minused].lused = ncall;
 	scan[minused].y = y;
@@ -85,6 +83,21 @@ readerr:
 }
 
 
+pict_stats()			/* print out picture read statistics */
+{
+	static long	lastcall = 0L;	/* ncall at last report */
+	static long	lastread = 0L;	/* nread at last report */
+
+	if (ncall == lastcall)
+		return;
+	fprintf(stderr, "%s: %ld scanlines read, %ld reused\n",
+			progname, nread-lastread,
+			(ncall-lastcall)-(nread-lastread));
+	lastcall = ncall;
+	lastread = nread;
+}
+
+
 double
 pict_val(vd)			/* find picture value for view direction */
 FVECT	vd;
@@ -136,16 +149,15 @@ int	vv;
 float	*vb;
 {
 	float	rt_buf[6*MAXPIX];	/* rtrace send/receive buffer */
-	int	npix_tort;		/* number of pixels in buffer */
+	register int	n;		/* number of pixels in buffer */
 	short	buf_vh[MAXPIX];		/* pixel positions */
 	FVECT	dir;
 	register int	vh;
-	register int	i;
 
 	if (verbose)
 		fprintf(stderr, "%s: computing view span at %d...\n",
 				progname, vv);
-	npix_tort = 0;
+	n = 0;
 	for (vh = -hsize; vh <= hsize; vh++) {
 		if (compdir(dir, vh, vv) < 0) {	/* off viewable region */
 			vb[vh+hsize] = -1.0;
@@ -156,24 +168,25 @@ float	*vb;
 		if (rt_pid == -1)		/* missing information */
 			continue;
 						/* send to rtrace */
-		if (npix_tort >= MAXPIX) {		/* flush */
-			rt_compute(rt_buf, npix_tort);
-			for (i = 0; i < npix_tort; i++)
-				vb[buf_vh[i]+hsize] = luminance(rt_buf+3*i);
-			npix_tort = 0;
+		if (n >= MAXPIX) {			/* flush */
+			rt_compute(rt_buf, n);
+			while (n-- > 0)
+				vb[buf_vh[n]+hsize] = luminance(rt_buf+3*n);
 		}
-		rt_buf[npix_tort] = ourview.vp[0];
-		rt_buf[npix_tort+1] = ourview.vp[1];
-		rt_buf[npix_tort+2] = ourview.vp[2];
-		rt_buf[npix_tort+3] = dir[0];
-		rt_buf[npix_tort+4] = dir[1];
-		rt_buf[npix_tort+5] = dir[2];
-		buf_vh[npix_tort++] = vh;
+		rt_buf[6*n] = ourview.vp[0];
+		rt_buf[6*n+1] = ourview.vp[1];
+		rt_buf[6*n+2] = ourview.vp[2];
+		rt_buf[6*n+3] = dir[0];
+		rt_buf[6*n+4] = dir[1];
+		rt_buf[6*n+5] = dir[2];
+		buf_vh[n++] = vh;
 	}
-	if (npix_tort > 0) {			/* process pending buffer */
-		rt_compute(rt_buf, npix_tort);
-		for (i = 0; i < npix_tort; i++)
-			vb[buf_vh[i]+hsize] = luminance(rt_buf+3*i);
+	if (verbose)
+		pict_stats();
+	if (n > 0) {				/* process pending buffer */
+		rt_compute(rt_buf, n);
+		while (n-- > 0)
+			vb[buf_vh[n]+hsize] = luminance(rt_buf+3*n);
 	}
 }
 
@@ -283,6 +296,8 @@ char	*av[];
 		perror(progname);
 		exit(1);
 	}
+	close(p0[0]);
+	close(p1[1]);
 	fd_tort = p0[1];
 	fd_fromrt = p1[0];
 }