--- ray/src/hd/rholo2.c	1998/11/23 17:50:26	3.14
+++ ray/src/hd/rholo2.c	1998/11/25 17:20:25	3.18
@@ -13,79 +13,69 @@ static char SCCSid[] = "$SunId$ SGI";
 #include "random.h"
 
 
+VIEWPOINT	myeye;		/* target view position */
+
+
 packrays(rod, p)		/* pack ray origins and directions */
-float	*rod;
+register float	*rod;
 register PACKET	*p;
 {
-	static int	nmh = 0;
-	static int	*mhtab;
-	FVECT	ro, rd;
-	register BEAM	*bp;
+	float	packdc2[RPACKSIZ];
+	int	iterleft = 3*p->nr + 9;
+	BYTE	rpos[2][2];
+	FVECT	ro, rd, rp1;
 	GCOORD	gc[2];
-	int	ila[4], offset;
-	double	d, sl[4];
-	register int	i, j, k;
+	double	d, dc2, md2, td2, dc2worst = FHUGE;
+	int	i;
+	register int	ii;
 
 	if (!hdbcoord(gc, hdlist[p->hd], p->bi))
 		error(CONSISTENCY, "bad beam index in packrays");
-							/* uniqueness hash */
-	if ((bp = hdgetbeam(hdlist[p->hd], p->bi)) != NULL) {
-		if (2*bp->nrm > nmh) {
-			if (nmh) free((char *)mhtab);
-			nmh = 2*bp->nrm + 1;
-			mhtab = (int *)malloc(nmh*sizeof(int));
-			if (mhtab == NULL)
-				error(SYSTEM, "out of memory in packrays");
-		}
-		for (k = nmh; k--; )
-			mhtab[k] = -1;
-		for (i = bp->nrm; i--; ) {
-			ila[0] = hdbray(bp)[i].r[0][0];
-			ila[1] = hdbray(bp)[i].r[0][1];
-			ila[2] = hdbray(bp)[i].r[1][0];
-			ila[3] = hdbray(bp)[i].r[1][1];
-			for (k = ilhash(ila,4); mhtab[k%nmh] >= 0; k++)
-				;
-			mhtab[k%nmh] = i;
-		}
-	}
-							/* init each ray */
-	ila[0] = p->hd; ila[1] = p->bi;
-	offset = ilhash(ila,2) + p->nc;
-	for (i = 0; i < p->nr; i++) {
-		do {					/* next unique ray */
-			multisamp(sl, 4, urand(offset+i));
-			p->ra[i].r[0][0] = ila[0] = sl[0] * 256.;
-			p->ra[i].r[0][1] = ila[1] = sl[1] * 256.;
-			p->ra[i].r[1][0] = ila[2] = sl[2] * 256.;
-			p->ra[i].r[1][1] = ila[3] = sl[3] * 256.;
-			if (bp == NULL)
-				break;
-			for (k = ilhash(ila,4); (j = mhtab[k%nmh]) >= 0; k++)
-				if (hdbray(bp)[j].r[0][0] ==
-							p->ra[i].r[0][0] &&
-						hdbray(bp)[j].r[0][1] ==
-							p->ra[i].r[0][1] &&
-						hdbray(bp)[j].r[1][0] ==
-							p->ra[i].r[1][0] &&
-						hdbray(bp)[j].r[1][1] ==
-							p->ra[i].r[1][1]) {
-					offset += bp->nrm - j;
-					break;
-				}
-		} while (j >= 0);
-		d = hdray(ro, rd, hdlist[p->hd], gc, p->ra[i].r);
-		if (!vdef(OBSTRUCTIONS))
-			d *= frandom();			/* random offset */
+	td2 = myeye.rng + FTINY; td2 *= td2;
+	for (i = 0, md2 = 0.; i < p->nr || (md2 > td2 && iterleft--); ) {
+		rpos[0][0] = frandom() * 256.;
+		rpos[0][1] = frandom() * 256.;
+		rpos[1][0] = frandom() * 256.;
+		rpos[1][1] = frandom() * 256.;
+		d = hdray(ro, rd, hdlist[p->hd], gc, rpos);
+		if (myeye.rng > FTINY) {		/* check eyepoint */
+			register int	nexti;
+
+			VSUM(rp1, ro, rd, d);
+			dc2 = dist2line(myeye.vpt, ro, rp1) / p->nr;
+			if (i == p->nr) {		/* packet full */
+				if (dc2 >= dc2worst)	/* quick check */
+					continue;
+				nexti = 0;		/* find worst */
+				for (ii = i; --ii; )
+					if (packdc2[ii] > packdc2[nexti])
+						nexti = ii;
+				if (dc2 >= (dc2worst = packdc2[nexti]))
+					continue;	/* worse than worst */
+				md2 -= dc2worst;
+			} else
+				nexti = i++;
+			md2 += packdc2[nexti] = dc2;	/* new distance */
+			ii = nexti;			/* put it here */
+		} else
+			ii = i++;
 		if (p->offset != NULL) {
+			if (!vdef(OBSTRUCTIONS))
+				d *= frandom();		/* random offset */
 			VSUM(ro, ro, rd, d);		/* advance ray */
-			p->offset[i] = d;
+			p->offset[ii] = d;
 		}
-		VCOPY(rod, ro);
-		rod += 3;
-		VCOPY(rod, rd);
-		rod += 3;
+		p->ra[ii].r[0][0] = rpos[0][0];
+		p->ra[ii].r[0][1] = rpos[0][1];
+		p->ra[ii].r[1][0] = rpos[1][0];
+		p->ra[ii].r[1][1] = rpos[1][1];
+		VCOPY(rod+6*ii, ro);
+		VCOPY(rod+6*ii+3, rd);
 	}
+#ifdef DEBUG
+	fprintf(stderr, "%f mean distance for target %f (%d iterations left)\n",
+			sqrt(md2), myeye.rng, iterleft);
+#endif
 }