--- ray/src/hd/rholo2.c	1997/12/12 19:52:32	3.7
+++ ray/src/hd/rholo2.c	1998/11/24 17:38:09	3.17
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ SGI";
@@ -13,36 +13,74 @@ static char SCCSid[] = "$SunId$ SGI";
 #include "random.h"
 
 
+VIEWPOINT	myeye;		/* target view position */
+
+
 packrays(rod, p)		/* pack ray origins and directions */
 register float	*rod;
 register PACKET	*p;
 {
-	static FVECT	ro, rd;
+	short	packord[RPACKSIZ];
+	float	packdc2[RPACKSIZ];
+	int	iterleft = 3*p->nr;
+	BYTE	rpos[2][2];
+	FVECT	ro, rd, rp1;
 	GCOORD	gc[2];
-	int	ila[2], hsh;
-	double	d, sl[4];
-	register int	i;
+	double	d, dc2, md2, td2;
+	int	i;
+	register int	ii;
 
 	if (!hdbcoord(gc, hdlist[p->hd], p->bi))
 		error(CONSISTENCY, "bad beam index in packrays");
-	ila[0] = p->hd; ila[1] = p->bi;
-	hsh = ilhash(ila,2) + p->nc;
-	for (i = 0; i < p->nr; i++) {
-		multisamp(sl, 4, urand(hsh+i));
-		p->ra[i].r[0][0] = sl[0] * 256.;
-		p->ra[i].r[0][1] = sl[1] * 256.;
-		p->ra[i].r[1][0] = sl[2] * 256.;
-		p->ra[i].r[1][1] = sl[3] * 256.;
-		d = hdray(ro, rd, hdlist[p->hd], gc, p->ra[i].r);
+	td2 = (myeye.rng+FTINY)*(myeye.rng+FTINY);
+	for (i = 0, md2 = 0.; i < p->nr || md2 > td2; ) {
+		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);
+			dc2 /= (double)(p->nr*p->nr);
+			if (i == p->nr) {		/* packet full */
+				nexti = packord[i-1];
+				if (!iterleft--)
+					break;		/* tried enough! */
+				if (dc2 >= packdc2[nexti])
+					continue;	/* worse than worst */
+				md2 -= packdc2[nexti];
+			} else
+				nexti = i++;
+			md2 += packdc2[nexti] = dc2;	/* new distance */
+			for (ii = i; --ii; ) {		/* insertion sort */
+				if (dc2 > packdc2[packord[ii-1]])
+					break;
+				packord[ii] = packord[ii-1];
+			}
+			packord[ii] = nexti;
+			ii = nexti;			/* put it here */
+		} else
+			ii = i++;
 		if (p->offset != NULL) {
-			VSUM(ro, ro, rd, d);		/* exterior only */
-			p->offset[i] = d;
+			if (!vdef(OBSTRUCTIONS))
+				d *= frandom();		/* random offset */
+			VSUM(ro, ro, rd, d);		/* advance ray */
+			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
 }
 
 
@@ -72,7 +110,6 @@ done_rtrace()			/* clean up and close rtrace calculati
 					/* already closed? */
 	if (!nprocs)
 		return;
-	wputs("closing rtrace process...\n");
 					/* flush beam queue */
 	done_packets(flush_queue());
 					/* sync holodeck */
@@ -80,8 +117,10 @@ done_rtrace()			/* clean up and close rtrace calculati
 					/* close rtrace */
 	if ((status = end_rtrace()))
 		error(WARNING, "bad exit status from rtrace");
-	if (vdef(REPORT))		/* report time */
+	if (vdef(REPORT)) {		/* report time */
+		eputs("rtrace process closed\n");
 		report(0);
+	}
 	return(status);			/* return status */
 }
 
@@ -92,7 +131,6 @@ new_rtrace()			/* restart rtrace calculation */
 
 	if (nprocs > 0)			/* already running? */
 		return;
-	wputs("restarting rtrace process...\n");
 	starttime = time(NULL);		/* reset start time and counts */
 	npacksdone = nraysdone = 0L;
 	if (vdef(TIME))			/* reset end time */
@@ -104,14 +142,16 @@ new_rtrace()			/* restart rtrace calculation */
 	}
 	if (start_rtrace() < 1)		/* start rtrace */
 		error(WARNING, "cannot restart rtrace");
-	else if (vdef(REPORT))
+	else if (vdef(REPORT)) {
+		eputs("rtrace process restarted\n");
 		report(0);
+	}
 }
 
 
 getradfile()			/* run rad and get needed variables */
 {
-	static short	mvar[] = {OCTREE,-1};
+	static short	mvar[] = {OCTREE,EYESEP,-1};
 	static char	tf1[] = TEMPLATE;
 	char	tf2[64];
 	char	combuf[256];
@@ -120,7 +160,7 @@ getradfile()			/* run rad and get needed variables */
 	register char	*cp;
 					/* check if rad file specified */
 	if (!vdef(RIF))
-		return;
+		return(0);
 					/* create rad command */
 	mktemp(tf1);
 	sprintf(tf2, "%s.rif", tf1);
@@ -143,17 +183,17 @@ getradfile()			/* run rad and get needed variables */
 		strcpy(pippt, "> /dev/null");	/* nothing to match */
 	else
 		sprintf(cp, ")[ \t]*=' > %s", tf2);
-	if (system(combuf)) {
-		unlink(tf2);			/* clean up */
-		unlink(tf1);
-		error(SYSTEM, "cannot execute rad command");
-	}
+#ifdef DEBUG
+	wputs(combuf); wputs("\n");
+#endif
+	system(combuf);				/* ignore exit code */
 	if (pippt == NULL) {
 		loadvars(tf2);			/* load variables */
 		unlink(tf2);
 	}
 	rtargc += wordfile(rtargv+rtargc, tf1);	/* get rtrace options */
 	unlink(tf1);			/* clean up */
+	return(1);
 }