--- ray/src/hd/rholo2.c	1997/12/12 18:33:50	3.6
+++ ray/src/hd/rholo2.c	1998/11/23 17:50:26	3.14
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ SGI";
@@ -14,28 +14,71 @@ static char SCCSid[] = "$SunId$ SGI";
 
 
 packrays(rod, p)		/* pack ray origins and directions */
-register float	*rod;
+float	*rod;
 register PACKET	*p;
 {
-	static FVECT	ro, rd;
+	static int	nmh = 0;
+	static int	*mhtab;
+	FVECT	ro, rd;
+	register BEAM	*bp;
 	GCOORD	gc[2];
-	int	ila[2], hsh;
+	int	ila[4], offset;
 	double	d, sl[4];
-	register int	i;
+	register int	i, j, k;
 
 	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;
-	hsh = ilhash(ila,2) + p->nc;
+	offset = 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.;
+		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 */
 		if (p->offset != NULL) {
-			VSUM(ro, ro, rd, d);		/* exterior only */
+			VSUM(ro, ro, rd, d);		/* advance ray */
 			p->offset[i] = d;
 		}
 		VCOPY(rod, ro);
@@ -72,14 +115,17 @@ 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 */
+	hdsync(NULL, 1);
 					/* 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 */
 }
 
@@ -90,7 +136,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 */
@@ -102,14 +147,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];
@@ -118,7 +165,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);
@@ -141,17 +188,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);
 }