--- ray/src/hd/rhdisp2.c	1997/12/02 15:02:37	3.8
+++ ray/src/hd/rhdisp2.c	1997/12/15 20:40:46	3.15
@@ -12,6 +12,10 @@ static char SCCSid[] = "$SunId$ SGI";
 #include "rhdisp.h"
 #include "rhdriver.h"
 
+#ifndef MAXDIST
+#define MAXDIST		42	/* maximum distance outside section */
+#endif
+
 extern GCOORD	*getviewcells();
 
 static VIEW	dvw;		/* current view corresponding to beam list */
@@ -90,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 */
@@ -172,7 +178,7 @@ int	hr, vr;
 	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);
+		pa[i].nr = npixels(v, hr, vr, hdlist[pa[i].hd], pa[i].bi) + 1;
 	}
 	n = xcbeams;			/* now sort list for deletions */
 	cbeamsort(0);
@@ -295,6 +301,11 @@ FVECT	vp;
 			n++;
 		}
 	}
+					/* check for really stupid move */
+	if (bestd > MAXDIST) {
+		error(COMMAND, "move past outer limits");
+		return(0);
+	}
 					/* warn of dangerous moves */
 	if (n < lastn && bestd >= lastd)
 		error(WARNING, "moving outside holodeck section");
@@ -343,34 +354,59 @@ docell(gcp, cap)	/* find beams corresponding to cell a
 GCOORD	*gcp;
 register struct cellact	*cap;
 {
+	register HOLO	*hp = hdlist[voxel[cap->vi].hd];
 	FVECT	org, dir[4];
-	FVECT	gp, cv[4], vc;
+	FVECT	vgp, cgp, vc;
+	FVECT	v1, v2;
 	struct beamact	bo;
+	int	axmax, j;
+	double	d, avmax;
 	register int	i;
-				/* compute cell vertices */
-	hdcell(cv, hdlist[voxel[cap->vi].hd], gcp);
-				/* compute cell and voxel centers */
-	for (i = 0; i < 3; i++) {
-		org[i] = 0.5*(cv[0][i] + cv[2][i]);
-		gp[i] = voxel[cap->vi].i[i] + 0.5;
-	}
-	hdworld(vc, hdlist[voxel[cap->vi].hd], gp);
-				/* compute voxel pyramid using vector trick */
-	for (i = 0; i < 3; i++) {
-		dir[0][i] = vc[i] - cv[0][i];		/* to 3 */
-		dir[2][i] = vc[i] - cv[3][i];		/* to 0 */
-		if (gcp->w & 1) {	/* watch vertex order! */
-			dir[1][i] = vc[i] - cv[2][i];	/* to 1 */
-			dir[3][i] = vc[i] - cv[1][i];	/* to 2 */
-		} else {
-			dir[1][i] = vc[i] - cv[1][i];	/* to 2 */
-			dir[3][i] = vc[i] - cv[2][i];	/* to 1 */
+				/* 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;
+	hdworld(org, hp, cgp);
+				/* compute direction to voxel center */
+	for (i = 3; i--; )
+		vgp[i] = voxel[cap->vi].i[i] + .5;
+	hdworld(vc, hp, vgp);
+	for (i = 3; i--; )
+		vc[i] -= org[i];
+				/* compute maximum area axis */
+	axmax = -1; avmax = 0;
+	for (i = 3; i--; ) {
+		d = vgp[i] - cgp[i];
+		if (d < 0.) d = -d;
+		if (d > avmax) {
+			avmax = d;
+			axmax = i;
 		}
 	}
+#ifdef DEBUG
+	if (axmax < 0.)
+		error(CONSISTENCY, "botched axis computation in docell");
+#endif
+				/* compute offset vectors */
+	d = 0.5/hp->grid[j=(axmax+1)%3];
+	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 */
+	for (i = 3; i--; )
+		v2[i] = hp->xv[j][i] * d;
+				/* compute voxel pyramid */
+	for (i = 3; i--; ) {
+		dir[0][i] = vc[i] - v1[i] - v2[i];
+		dir[1][i] = vc[i] + v1[i] - v2[i];
+		dir[2][i] = vc[i] + v1[i] + v2[i];
+		dir[3][i] = vc[i] - v1[i] + v2[i];
+	}
 				/* visit beams for opposite cells */
 	copystruct(&bo.ca, cap);
 	copystruct(&bo.gc, gcp);
-	return(visit_cells(org, dir, hdlist[voxel[cap->vi].hd], dobeam, &bo));
+	return(visit_cells(org, dir, hp, dobeam, &bo));
 }
 
 
@@ -406,7 +442,6 @@ VIEW	*vold, *vnew;
 	ngcp = ngcl = getviewcells(&ncnt, hdlist[voxel[voxi].hd], vnew);
 				/* set up actions */
 	oca.vi = nca.vi = voxi;
-	oca.rev = nca.rev = 0;
 	oca.add = 0; nca.add = 1;
 	if ((oca.rev = ocnt < 0))
 		ocnt = -ocnt;
@@ -436,28 +471,34 @@ VIEW	*vold, *vnew;
 }
 
 
+int
 beam_sync()		/* synchronize beams on server */
 {
 	cbeamop(DR_NEWSET, cbeam, ncbeams, &odev.v, odev.hres, odev.vres);
+	return(ncbeams);
 }
 
 
-beam_view(vn)			/* change beam view */
+beam_view(vn)			/* change beam view (if advisable) */
 VIEW	*vn;
 {
 	struct cellact	ca;
 	VOXL	vlnew[8];
 	int	n, comn;
 
-	if (!vn->type) {		/* clear our beam list */
+	if (vn == NULL || !vn->type) {	/* clear our beam list */
 		set_voxels(vlnew, 0);
 		cbeamop(DR_DELSET, cbeam, ncbeams, NULL, 0, 0);
 		ncbeams = 0;
-		copystruct(&dvw, vn);
-		return;
+		dvw.type = 0;
+		return(1);
 	}
 					/* find our new voxels */
 	n = get_voxels(vlnew, vn->vp);
+	if (dvw.type && !n) {
+		copystruct(vn, &dvw);		/* cancel move */
+		return(0);
+	}
 					/* set the new voxels */
 	comn = set_voxels(vlnew, n);
 	if (!dvw.type)
@@ -480,4 +521,5 @@ VIEW	*vn;
 	xcbeams = 0;			/* truncate our list */
 #endif
 	copystruct(&dvw, vn);		/* record new view */
+	return(1);
 }