--- ray/src/hd/rholo2.c	1997/12/01 16:34:36	3.4
+++ ray/src/hd/rholo2.c	1998/11/25 17:20:25	3.18
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ SGI";
@@ -9,39 +9,73 @@ static char SCCSid[] = "$SunId$ SGI";
  */
 
 #include "rholo.h"
+#include "paths.h"
 #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;
+	float	packdc2[RPACKSIZ];
+	int	iterleft = 3*p->nr + 9;
+	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, dc2worst = FHUGE;
+	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; 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) {
-			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
 }
 
 
@@ -61,4 +95,115 @@ register float	*rvl;
 		rvl += 4;
 	}
 	p->nc += p->nr;
+}
+
+
+int
+done_rtrace()			/* clean up and close rtrace calculation */
+{
+	int	status;
+					/* already closed? */
+	if (!nprocs)
+		return;
+					/* flush beam queue */
+	done_packets(flush_queue());
+					/* sync holodeck */
+	hdsync(NULL, 1);
+					/* close rtrace */
+	if ((status = end_rtrace()))
+		error(WARNING, "bad exit status from rtrace");
+	if (vdef(REPORT)) {		/* report time */
+		eputs("rtrace process closed\n");
+		report(0);
+	}
+	return(status);			/* return status */
+}
+
+
+new_rtrace()			/* restart rtrace calculation */
+{
+	char	combuf[128];
+
+	if (nprocs > 0)			/* already running? */
+		return;
+	starttime = time(NULL);		/* reset start time and counts */
+	npacksdone = nraysdone = 0L;
+	if (vdef(TIME))			/* reset end time */
+		endtime = starttime + vflt(TIME)*3600. + .5;
+	if (vdef(RIF)) {		/* rerun rad to update octree */
+		sprintf(combuf, "rad -v 0 -s -w %s", vval(RIF));
+		if (system(combuf))
+			error(WARNING, "error running rad");
+	}
+	if (start_rtrace() < 1)		/* start rtrace */
+		error(WARNING, "cannot restart rtrace");
+	else if (vdef(REPORT)) {
+		eputs("rtrace process restarted\n");
+		report(0);
+	}
+}
+
+
+getradfile()			/* run rad and get needed variables */
+{
+	static short	mvar[] = {OCTREE,EYESEP,-1};
+	static char	tf1[] = TEMPLATE;
+	char	tf2[64];
+	char	combuf[256];
+	char	*pippt;
+	register int	i;
+	register char	*cp;
+					/* check if rad file specified */
+	if (!vdef(RIF))
+		return(0);
+					/* create rad command */
+	mktemp(tf1);
+	sprintf(tf2, "%s.rif", tf1);
+	sprintf(combuf,
+		"rad -v 0 -s -e -w %s OPTFILE=%s | egrep '^[ \t]*(NOMATCH",
+			vval(RIF), tf1);
+	cp = combuf;
+	while (*cp){
+		if (*cp == '|') pippt = cp;
+		cp++;
+	}				/* match unset variables */
+	for (i = 0; mvar[i] >= 0; i++)
+		if (!vdef(mvar[i])) {
+			*cp++ = '|';
+			strcpy(cp, vnam(mvar[i]));
+			while (*cp) cp++;
+			pippt = NULL;
+		}
+	if (pippt != NULL)
+		strcpy(pippt, "> /dev/null");	/* nothing to match */
+	else
+		sprintf(cp, ")[ \t]*=' > %s", tf2);
+#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);
+}
+
+
+report(t)			/* report progress so far */
+time_t	t;
+{
+	static time_t	seconds2go = 1000000;
+
+	if (t == 0L)
+		t = time(NULL);
+	sprintf(errmsg, "%ld packets (%ld rays) done after %.2f hours\n",
+			npacksdone, nraysdone, (t-starttime)/3600.);
+	eputs(errmsg);
+	if (seconds2go == 1000000)
+		seconds2go = vdef(REPORT) ? (long)(vflt(REPORT)*60. + .5) : 0L;
+	if (seconds2go)
+		reporttime = t + seconds2go;
 }