--- ray/src/hd/rhdisp2.c	1997/12/11 17:26:55	3.13
+++ ray/src/hd/rhdisp2.c	1998/01/06 15:08:50	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";
@@ -13,7 +13,7 @@ static char SCCSid[] = "$SunId$ SGI";
 #include "rhdriver.h"
 
 #ifndef MAXDIST
-#define MAXDIST		13	/* maximum distance outside section */
+#define MAXDIST		42	/* maximum distance outside section */
 #endif
 
 extern GCOORD	*getviewcells();
@@ -94,6 +94,8 @@ register struct beamcomp	*cb1, *cb2;
 
 	if (!cb1->wants)		/* put orphans at the end, unsorted */
 		return(cb2->wants);
+	if (!cb2->wants)
+		return(-1);
 	if ((c = cb1->bi - cb2->bi))	/* sort on beam index first */
 		return(c);
 	return(cb1->hd - cb2->hd);	/* use hd to resolve matches */
@@ -162,42 +164,6 @@ int	adopt;
 }
 
 
-cbeamadj(v, hr, vr)		/* adjust our beam list */
-VIEW	*v;
-int	hr, vr;
-{
-	register PACKHEAD	*pa;
-	register int	i;
-	int	n;
-					/* first handle additions */
-	pa = (PACKHEAD *)malloc(xcbeams*sizeof(PACKHEAD));
-	if (xcbeams && pa == NULL)
-		goto memerr;
-	for (i = xcbeams; i--; ) {
-		pa[i].hd = cbeam[ncbeams+i].hd;
-		pa[i].bi = cbeam[ncbeams+i].bi;
-		pa[i].nr = npixels(v, hr, vr, hdlist[pa[i].hd], pa[i].bi) + 1;
-	}
-	n = xcbeams;			/* now sort list for deletions */
-	cbeamsort(0);
-	pa = (PACKHEAD *)realloc((char *)pa, (n+xcbeams)*sizeof(PACKHEAD));
-	if (n+xcbeams && pa == NULL)
-		goto memerr;
-	for (i = xcbeams; i--; ) {
-		pa[n+i].hd = cbeam[ncbeams+i].hd;
-		pa[n+i].bi = cbeam[ncbeams+i].bi;
-		pa[n+i].nr = 0;
-	}
-	n += xcbeams;
-	xcbeams = 0;			/* delete orphans */
-	serv_request(DR_ADJSET, n*sizeof(PACKHEAD), (char *)pa);
-	free((char *)pa);
-	return;
-memerr:
-	error(SYSTEM, "out of memory in cbeamadj");
-}
-
-
 cbeamop(op, bl, n, v, hr, vr)	/* update beams on server list */
 int	op;
 register struct beamcomp	*bl;
@@ -218,6 +184,7 @@ int	hr, vr;
 		pa[i].bi = bl[i].bi;
 		pa[i].nr = v==NULL ? 0 :
 				npixels(v, hr, vr, hdlist[bl[i].hd], bl[i].bi);
+		pa[i].nc = 0;
 	}
 	serv_request(op, n*sizeof(PACKHEAD), (char *)pa);
 	free((char *)pa);
@@ -268,7 +235,6 @@ get_voxels(vl, vp)	/* find voxels corresponding to vie
 VOXL	vl[8];
 FVECT	vp;
 {
-	static int	lastn = 0, lastd = -1;
 	int	n = 0;
 	FVECT	gp;
 	double	d;
@@ -304,13 +270,7 @@ FVECT	vp;
 		error(COMMAND, "move past outer limits");
 		return(0);
 	}
-					/* warn of dangerous moves */
-	if (n < lastn && bestd >= lastd)
-		error(WARNING, "moving outside holodeck section");
-	else if (n > lastn && bestd <= lastd)
-		error(WARNING, "moving inside holodeck section");
-	lastd = bestd;
-	return(lastn = n);
+	return(n);
 }
 
 
@@ -362,8 +322,8 @@ register struct cellact	*cap;
 	register int	i;
 				/* compute cell center */
 	cgp[gcp->w>>1] = gcp->w&1 ? hp->grid[gcp->w>>1] : 0 ;
-	cgp[((gcp->w>>1)+1)%3] = gcp->i[0] + .5;
-	cgp[((gcp->w>>1)+2)%3] = gcp->i[1] + .5;
+	cgp[hdwg0[gcp->w]] = gcp->i[0] + .5;
+	cgp[hdwg1[gcp->w]] = gcp->i[1] + .5;
 	hdworld(org, hp, cgp);
 				/* compute direction to voxel center */
 	for (i = 3; i--; )
@@ -390,8 +350,8 @@ register struct cellact	*cap;
 	for (i = 3; i--; )
 		v1[i] = hp->xv[j][i] * d;
 	d = 0.5/hp->grid[j=(axmax+2)%3];
-	if (DOT(hp->wn[axmax], vc) < 0.)
-		d = -d;	/* reverse vertex ordering */
+	if (DOT(hp->wg[axmax], vc) < 0.)
+		d = -d;	/* reverse vertex order */
 	for (i = 3; i--; )
 		v2[i] = hp->xv[j][i] * d;
 				/* compute voxel pyramid */
@@ -507,9 +467,6 @@ VIEW	*vn;
 			mvview(ca.vi, &dvw, vn);
 		else			/* else add all new cells */
 			doview(&ca, vn);
-#if 1
-	cbeamadj(vn, odev.hres, odev.vres);
-#else
 					/* inform server of new beams */
 	cbeamop(DR_ADDSET, cbeam+ncbeams, xcbeams, vn, odev.hres, odev.vres);
 					/* sort list to put orphans at end */
@@ -517,7 +474,6 @@ VIEW	*vn;
 					/* tell server to delete orphans */
 	cbeamop(DR_DELSET, cbeam+ncbeams, xcbeams, NULL, 0, 0);
 	xcbeams = 0;			/* truncate our list */
-#endif
 	copystruct(&dvw, vn);		/* record new view */
 	return(1);
 }