--- ray/src/hd/rhdisp2.c	1998/01/01 13:00:16	3.17
+++ ray/src/hd/rhdisp2.c	1998/09/15 15:59:31	3.24
@@ -16,26 +16,21 @@ static char SCCSid[] = "$SunId$ SGI";
 #define MAXDIST		42	/* maximum distance outside section */
 #endif
 
-extern GCOORD	*getviewcells();
+#define MAXVOXEL	32	/* maximum number of active voxels */
 
-static VIEW	dvw;		/* current view corresponding to beam list */
-
 typedef struct {
 	int	hd;		/* holodeck section number (-1 if inactive) */
 	int	i[3];		/* voxel index (may be outside section) */
 } VOXL;			/* a voxel */
 
-static VOXL voxel[8] = {	/* current voxel list */
-	{-1}, {-1}, {-1}, {-1},
-	{-1}, {-1}, {-1}, {-1}
-};
+static VOXL voxel[MAXVOXEL] = {{-1}};	/* current voxel list */
 
 #define CBEAMBLK	1024	/* cbeam allocation block size */
 
 static struct beamcomp {
-	short	wants;		/* flags telling which voxels want us */
-	short	hd;		/* holodeck section number */
+	int	hd;		/* holodeck section number */
 	int	bi;		/* beam index */
+	int4	nr;		/* number of samples desired */
 } *cbeam = NULL;	/* current beam list */
 
 static int	ncbeams = 0;	/* number of sorted beams in cbeam */
@@ -44,8 +39,9 @@ static int	maxcbeam = 0;	/* size of cbeam array */
 
 struct cellact {
 	short	vi;		/* voxel index */
-	short	add;		/* zero means delete */
 	short	rev;		/* reverse ray direction? */
+	VIEW	*vp;		/* view for image */
+	short	hr, vr;		/* image resolution */
 };		/* action for cell */
 
 struct beamact {
@@ -92,9 +88,9 @@ register struct beamcomp	*cb1, *cb2;
 {
 	register int	c;
 
-	if (!cb1->wants)		/* put orphans at the end, unsorted */
-		return(cb2->wants);
-	if (!cb2->wants)
+	if (!cb1->nr)			/* put orphans at the end, unsorted */
+		return(cb2->nr);
+	if (!cb2->nr)
 		return(-1);
 	if ((c = cb1->bi - cb2->bi))	/* sort on beam index first */
 		return(c);
@@ -111,7 +107,7 @@ int	hd, bi;
 
 	if (ncbeams <= 0)
 		return(-1);
-	cb.wants = 0; cb.hd = hd; cb.bi = bi;
+	cb.hd = hd; cb.bi = bi; cb.nr = 0;
 	p = (struct beamcomp *)bsearch((char *)&cb, (char *)cbeam, ncbeams,
 			sizeof(struct beamcomp), cbeamcmp);
 	if (p == NULL)
@@ -139,7 +135,7 @@ int	bi;
 	if (bi < 1 | bi > nbeams(hdlist[hd]))
 		error(INTERNAL, "illegal beam index in getcbeam");
 	n = newcbeam();		/* allocate and assign */
-	cbeam[n].wants = 0; cbeam[n].hd = hd; cbeam[n].bi = bi;
+	cbeam[n].nr = 0; cbeam[n].hd = hd; cbeam[n].bi = bi;
 	return(n);
 }
 
@@ -157,19 +153,17 @@ int	adopt;
 	if (adopt)
 		return;
 	for (i = ncbeams; i--; )	/* identify orphans */
-		if (cbeam[i].wants)
+		if (cbeam[i].nr)
 			break;
 	xcbeams = ncbeams - ++i;	/* put orphans after ncbeams */
 	ncbeams = i;
 }
 
 
-cbeamop(op, bl, n, v, hr, vr)	/* update beams on server list */
+cbeamop(op, bl, n)		/* update beams on server list */
 int	op;
 register struct beamcomp	*bl;
 int	n;
-VIEW	*v;
-int	hr, vr;
 {
 	register PACKHEAD	*pa;
 	register int	i;
@@ -178,12 +172,11 @@ int	hr, vr;
 		return;
 	pa = (PACKHEAD *)malloc(n*sizeof(PACKHEAD));
 	if (pa == NULL)
-		error(SYSTEM, "out of memory in cbeamadd");
+		error(SYSTEM, "out of memory in cbeamop");
 	for (i = 0; i < n; i++) {
 		pa[i].hd = bl[i].hd;
 		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].nr = bl[i].nr;
 		pa[i].nc = 0;
 	}
 	serv_request(op, n*sizeof(PACKHEAD), (char *)pa);
@@ -191,60 +184,23 @@ int	hr, vr;
 }
 
 
-int
-set_voxels(vl, n)	/* set new voxel array */
-VOXL	vl[8];
-int	n;
-{
-	short	wmap[256];
-	int	vmap[8];
-	int	comn = 0;
-	int	no;
-	register int	i, j;
-					/* find common voxels */
-	for (j = 0; j < 8 && voxel[j].hd >= 0; j++) {
-		vmap[j] = -1;
-		for (i = n; i--; )
-			if (!bcmp((char *)(vl+i), (char *)(voxel+j),
-					sizeof(VOXL))) {
-				vmap[j] = i;
-				comn |= 1<<i;
-				break;
-			}
-	}
-	no = comn ? j : 0;		/* compute flag mapping */
-	for (i = 256; i--; ) {
-		wmap[i] = 0;
-		for (j = no; j--; )
-			if (vmap[j] >= 0 && i & 1<<j)
-				wmap[i] |= 1<<vmap[j];
-	}
-					/* fix cbeam flags */
-	for (i = ncbeams; i--; )
-		cbeam[i].wants = wmap[cbeam[i].wants];
-					/* update our voxel list */
-	bcopy((char *)vl, (char *)voxel, n*sizeof(VOXL));
-	for (j = n; j < 8; j++)
-		voxel[j].hd = -1;
-	return(comn);			/* return bit array of common voxels */
-}
-
-
-int
-get_voxels(vl, vp)	/* find voxels corresponding to view point */
-VOXL	vl[8];
+unsigned int4
+add_voxels(vp)		/* add voxels corresponding to view point */
 FVECT	vp;
 {
-	int	n = 0;
+	int	first, n, rfl = 0;
 	FVECT	gp;
 	double	d;
 	int	dist, bestd = 0x7fff;
 	VOXL	vox;
 	register int	i, j, k;
+					/* count voxels in list already */
+	for (first = 0; first < MAXVOXEL && voxel[first].hd >= 0; first++)
+		;
 					/* find closest voxels */
-	for (i = 0; n < 8 && hdlist[i]; i++) {
+	for (n = first, i = 0; n < MAXVOXEL && hdlist[i]; i++) {
 		hdgrid(gp, hdlist[i], vp);
-		for (j = 0; n < 8 && j < 8; j++) {
+		for (j = 0; n < MAXVOXEL && j < 8; j++) {
 			dist = 0;
 			for (k = 0; k < 3; k++) {
 				d = gp[k] - .5 + (j>>k & 1);
@@ -257,12 +213,24 @@ FVECT	vp;
 			if (dist > bestd)	/* others were closer */
 				continue;
 			if (dist < bestd) {	/* start closer list */
-				n = 0;
+				n = first;
 				bestd = dist;
+				rfl = 0;
 			}
+						/* check if already in list */
+			for (k = first; k--; )
+				if (voxel[k].hd == i &&
+						voxel[k].i[0] == vox.i[0] &&
+						voxel[k].i[1] == vox.i[1] &&
+						voxel[k].i[2] == vox.i[2])
+					break;
+			if (k >= 0) {
+				rfl |= 1<<k;
+				continue;
+			}
 			vox.hd = i;		/* add this voxel */
-			copystruct(&vl[n], &vox);
-			n++;
+			copystruct(&voxel[n], &vox);
+			rfl |= 1<<n++;
 		}
 	}
 					/* check for really stupid move */
@@ -270,17 +238,19 @@ FVECT	vp;
 		error(COMMAND, "move past outer limits");
 		return(0);
 	}
-	return(n);
+	if (n < MAXVOXEL)
+		voxel[n].hd = -1;
+	return(rfl);
 }
 
 
 int
-dobeam(gcp, bp)		/* express interest or disintrest in a beam */
+dobeam(gcp, bp)		/* express interest in a beam */
 GCOORD	*gcp;
 register struct beamact	*bp;
 {
 	GCOORD	gc[2];
-	int	bi, i;
+	int	bi, i, n;
 					/* compute beam index */
 	if (bp->ca.rev) {
 		copystruct(gc, &bp->gc);
@@ -291,18 +261,13 @@ register struct beamact	*bp;
 	}
 	if ((bi = hdbindex(hdlist[voxel[bp->ca.vi].hd], gc)) <= 0)
 		error(CONSISTENCY, "bad grid coordinate in dobeam");
-	if (bp->ca.add) {		/* add it in */
-		i = getcbeam(voxel[bp->ca.vi].hd, bi);
-		cbeam[i].wants |= 1<<bp->ca.vi;	/* say we want it */
-		return(i == ncbeams+xcbeams-1);	/* return 1 if totally new */
-	}
-					/* else delete it */
-	i = findcbeam(voxel[bp->ca.vi].hd, bi);
-	if (i >= 0 && cbeam[i].wants & 1<<bp->ca.vi) {
-		cbeam[i].wants &= ~(1<<bp->ca.vi);	/* we don't want it */
-		return(1);			/* indicate change */
-	}
-	return(0);
+					/* add it in */
+	i = getcbeam(voxel[bp->ca.vi].hd, bi);
+	n = npixels(bp->ca.vp, bp->ca.hr, bp->ca.vr,
+			hdlist[cbeam[i].hd], cbeam[i].bi);
+	if (n > cbeam[i].nr)
+		cbeam[i].nr = n;
+	return(i == ncbeams+xcbeams-1);	/* return 1 if totally new */
 }
 
 
@@ -322,8 +287,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--; )
@@ -342,7 +307,7 @@ register struct cellact	*cap;
 		}
 	}
 #ifdef DEBUG
-	if (axmax < 0.)
+	if (axmax < 0)
 		error(CONSISTENCY, "botched axis computation in docell");
 #endif
 				/* compute offset vectors */
@@ -350,8 +315,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 */
@@ -369,14 +334,13 @@ register struct cellact	*cap;
 
 
 int
-doview(cap, vp)			/* visit cells for a given view */
+doview(cap)			/* visit cells for a given view */
 struct cellact	*cap;
-VIEW	*vp;
 {
 	int	orient;
 	FVECT	org, dir[4];
 					/* compute view pyramid */
-	orient = viewpyramid(org, dir, hdlist[voxel[cap->vi].hd], vp);
+	orient = viewpyramid(org, dir, hdlist[voxel[cap->vi].hd], cap->vp);
 	if (!orient)
 		error(INTERNAL, "unusable view in doview");
 	cap->rev = orient < 0;
@@ -385,95 +349,51 @@ VIEW	*vp;
 }
 
 
-mvview(voxi, vold, vnew)	/* move view for a voxel */
-int	voxi;
-VIEW	*vold, *vnew;
+beam_init(fresh)		/* clear beam list for new view(s) */
+int	fresh;
 {
-	int	netchange = 0;
-	struct cellact	oca, nca;
-	int	ocnt, ncnt;
-	int	c;
-	GCOORD	*ogcl, *ngcl;
-	register GCOORD	*ogcp, *ngcp;
-				/* get old and new cell lists */
-	ogcp = ogcl = getviewcells(&ocnt, hdlist[voxel[voxi].hd], vold);
-	ngcp = ngcl = getviewcells(&ncnt, hdlist[voxel[voxi].hd], vnew);
-				/* set up actions */
-	oca.vi = nca.vi = voxi;
-	oca.add = 0; nca.add = 1;
-	if ((oca.rev = ocnt < 0))
-		ocnt = -ocnt;
-	if ((nca.rev = ncnt < 0))
-		ncnt = -ncnt;
-	if (nca.rev == oca.rev)		/* add and delete cells in order */
-		while (ocnt > 0 & ncnt > 0)
-			if ((c = cellcmp(ogcp, ngcp)) > 0) {	/* new cell */
-				netchange += docell(ngcp++, &nca);
-				ncnt--;
-			} else if (c < 0) {			/* old cell */
-				netchange -= docell(ogcp++, &oca);
-				ocnt--;
-			} else {				/* same cell */
-				ogcp++; ocnt--;
-				ngcp++; ncnt--;
-			}
-				/* take care of list tails */
-	for ( ; ncnt > 0; ncnt--)
-		netchange += docell(ngcp++, &nca);
-	for ( ; ocnt > 0; ocnt--)
-		netchange -= docell(ogcp++, &oca);
-				/* clean up */
-	if (ogcl != NULL) free((char *)ogcl);
-	if (ngcl != NULL) free((char *)ngcl);
-	return(netchange);
-}
+	register int	i;
 
-
-int
-beam_sync()		/* synchronize beams on server */
-{
-	cbeamop(DR_NEWSET, cbeam, ncbeams, &odev.v, odev.hres, odev.vres);
-	return(ncbeams);
+	if (fresh)			/* discard old beams? */
+		ncbeams = xcbeams = 0;
+	else				/* else clear sample requests */
+		for (i = ncbeams+xcbeams; i--; )
+			cbeam[i].nr = 0;
+	voxel[0].hd = -1;		/* clear voxel list */
 }
 
 
-beam_view(vn)			/* change beam view (if advisable) */
+beam_view(vn, hr, vr)		/* add beam view (if advisable) */
 VIEW	*vn;
+int	hr, vr;
 {
 	struct cellact	ca;
-	VOXL	vlnew[8];
-	int	n, comn;
-
-	if (vn == NULL || !vn->type) {	/* clear our beam list */
-		set_voxels(vlnew, 0);
-		cbeamop(DR_DELSET, cbeam, ncbeams, NULL, 0, 0);
-		ncbeams = 0;
-		dvw.type = 0;
-		return(1);
-	}
-					/* find our new voxels */
-	n = get_voxels(vlnew, vn->vp);
-	if (dvw.type && !n) {
-		copystruct(vn, &dvw);		/* cancel move */
+	unsigned int4	vfl;
+					/* sort our list */
+	cbeamsort(1);
+					/* add new voxels */
+	vfl = add_voxels(vn->vp);
+	if (!vfl)
 		return(0);
-	}
-					/* set the new voxels */
-	comn = set_voxels(vlnew, n);
-	if (!dvw.type)
-		comn = 0;
-	ca.add = 1;			/* update our beam list */
-	for (ca.vi = n; ca.vi--; )
-		if (comn & 1<<ca.vi)	/* change which cells we see */
-			mvview(ca.vi, &dvw, vn);
-		else			/* else add all new cells */
-			doview(&ca, vn);
-					/* inform server of new beams */
-	cbeamop(DR_ADDSET, cbeam+ncbeams, xcbeams, vn, odev.hres, odev.vres);
-					/* sort list to put orphans at end */
-	cbeamsort(0);
-					/* tell server to delete orphans */
-	cbeamop(DR_DELSET, cbeam+ncbeams, xcbeams, NULL, 0, 0);
-	xcbeams = 0;			/* truncate our list */
-	copystruct(&dvw, vn);		/* record new view */
+	ca.vp = vn; ca.hr = hr; ca.vr = vr;
+					/* update our beam list */
+	for (ca.vi = 0; vfl; vfl >>= 1, ca.vi++)
+		if (vfl & 1)
+			doview(&ca);
 	return(1);
+}
+
+
+int
+beam_sync(all)			/* update beam list on server */
+int	all;
+{
+					/* sort list (put orphans at end) */
+	cbeamsort(all < 0);
+	if (all)
+		cbeamop(DR_NEWSET, cbeam, ncbeams);
+	else
+		cbeamop(DR_ADJSET, cbeam, ncbeams+xcbeams);
+	xcbeams = 0;			/* truncate our list */
+	return(ncbeams);
 }