--- ray/src/hd/holo.c	1997/10/31 10:23:29	3.1
+++ ray/src/hd/holo.c	1997/11/20 10:52:57	3.8
@@ -16,13 +16,14 @@ float	hd_depthmap[DCINF-DCLIN];
 
 static double	logstep;
 
+static int	wg0[6] = {1,1,2,2,0,0};
+static int	wg1[6] = {2,2,0,0,1,1};
 
+
 hdcompgrid(hp)			/* compute derived grid vector and index */
 register HOLO	*hp;
 {
-	FVECT	AxB;
 	double	d;
-	register FLOAT	*v;
 	register int	i, j;
 				/* initialize depth map */
 	if (hd_depthmap[0] < 1.) {
@@ -35,22 +36,13 @@ register HOLO	*hp;
 	}
 				/* compute grid coordinate vectors */
 	for (i = 0; i < 3; i++) {
-		fcross(AxB, hp->xv[(i+1)%3], v=hp->xv[(i+2)%3]);
-		VCOPY(hp->wn[i], AxB);
+		fcross(hp->wn[i], hp->xv[(i+1)%3], hp->xv[(i+2)%3]);
 		if (normalize(hp->wn[i]) == 0.)
 			error(USER, "degenerate holodeck section");
 		hp->wo[i<<1] = DOT(hp->wn[i],hp->orig);
-		hp->wo[i<<1|1] = hp->wo[i<<1] + DOT(hp->wn[i],hp->xv[i]);
-		fcross(hp->gv[i][0], v, AxB);
-		d = DOT(v,v) / DOT(hp->gv[i][0],hp->gv[i][0]) *
-				hp->grid[(i+1)%3];
-		for (j = 0; j < 3; j++)
-			hp->gv[i][0][j] *= d;
-		fcross(hp->gv[i][1], AxB, v=hp->xv[(i+1)%3]);
-		d = DOT(v,v) / DOT(hp->gv[i][1],hp->gv[i][1]) *
-				hp->grid[(i+2)%3];
-		for (j = 0; j < 3; j++)
-			hp->gv[i][1][j] *= d;
+		d = DOT(hp->wn[i],hp->xv[i]);
+		hp->wo[i<<1|1] = hp->wo[i<<1] + d;
+		hp->wg[i] = (double)hp->grid[i] / d;
 	}
 				/* compute linear depth range */
 	hp->tlin = VLEN(hp->xv[0]) + VLEN(hp->xv[1]) + VLEN(hp->xv[2]);
@@ -59,10 +51,8 @@ register HOLO	*hp;
 	for (i = 1; i < 6; i++) {
 		hp->wi[i] = 0;
 		for (j = i; j < 6; j++)
-			hp->wi[i] += hp->grid[((j>>1)+1)%3] *
-					hp->grid[((j>>1)+2)%3];
-		hp->wi[i] *= hp->grid[(((i-1)>>1)+1)%3] *
-				hp->grid[(((i-1)>>1)+2)%3];
+			hp->wi[i] += hp->grid[wg0[j]] * hp->grid[wg1[j]];
+		hp->wi[i] *= hp->grid[wg0[i-1]] * hp->grid[wg1[i-1]];
 		hp->wi[i] += hp->wi[i-1];
 	}
 }
@@ -103,13 +93,13 @@ HDGRID	*hproto;
 
 
 hdbcoord(gc, hp, i)		/* compute beam coordinates from index */
-BCOORD	gc;		/* returned */
+GCOORD	gc[2];		/* returned */
 register HOLO	*hp;
 register int	i;
 {
 	register int	j, n;
 	int	n2, reverse;
-	BCOORD	g2;
+	GCOORD	g2[2];
 					/* check range */
 	if (i < 1 | i > nbeams(hp))
 		return(0);
@@ -120,23 +110,23 @@ register int	i;
 			break;
 	i -= hp->wi[gc[0].w=j];
 					/* find w1 */
-	n2 = hp->grid[((j>>1)+1)%3] * hp->grid[((j>>1)+2)%3];
+	n2 = hp->grid[wg0[j]] * hp->grid[wg1[j]];
 	while (++j < 5)	{
-		n = n2 * hp->grid[((j>>1)+1)%3] * hp->grid[((j>>1)+2)%3];
+		n = n2 * hp->grid[wg0[j]] * hp->grid[wg1[j]];
 		if (n > i)
 			break;
 		i -= n;
 	}
 	gc[1].w = j;
 					/* find position on w0 */
-	n2 = hp->grid[((j>>1)+1)%3] * hp->grid[((j>>1)+2)%3];
+	n2 = hp->grid[wg0[j]] * hp->grid[wg1[j]];
 	n = i / n2;
-	gc[0].i[1] = n / hp->grid[((gc[0].w>>1)+1)%3];
-	gc[0].i[0] = n - gc[0].i[1]*hp->grid[((gc[0].w>>1)+1)%3];
+	gc[0].i[1] = n / hp->grid[wg0[gc[0].w]];
+	gc[0].i[0] = n - gc[0].i[1]*hp->grid[wg0[gc[0].w]];
 	i -= n*n2;
 					/* find position on w1 */
-	gc[1].i[1] = i / hp->grid[((gc[1].w>>1)+1)%3];
-	gc[1].i[0] = i - gc[1].i[1]*hp->grid[((gc[1].w>>1)+1)%3];
+	gc[1].i[1] = i / hp->grid[wg0[gc[1].w]];
+	gc[1].i[0] = i - gc[1].i[1]*hp->grid[wg0[gc[1].w]];
 	if (reverse) {
 		copystruct(g2, gc+1);
 		copystruct(gc+1, gc);
@@ -149,9 +139,9 @@ register int	i;
 int
 hdbindex(hp, gc)		/* compute index from beam coordinates */
 register HOLO	*hp;
-register BCOORD	gc;
+register GCOORD	gc[2];
 {
-	BCOORD	g2;
+	GCOORD	g2[2];
 	int	reverse;
 	register int	i, j;
 					/* check ordering and limits */
@@ -165,47 +155,65 @@ register BCOORD	gc;
 		return(0);
 	i = 0;				/* compute index */
 	for (j = gc[0].w+1; j < gc[1].w; j++)
-		i += hp->grid[((j>>1)+1)%3] * hp->grid[((j>>1)+2)%3];
-	i *= hp->grid[((gc[0].w>>1)+1)%3] * hp->grid[((gc[0].w>>1)+2)%3];
+		i += hp->grid[wg0[j]] * hp->grid[wg1[j]];
+	i *= hp->grid[wg0[gc[0].w]] * hp->grid[wg1[gc[0].w]];
 	i += hp->wi[gc[0].w];
-	i += (hp->grid[((gc[0].w>>1)+1)%3]*gc[0].i[1] + gc[0].i[0]) *
-			hp->grid[((gc[1].w>>1)+1)%3] *
-			hp->grid[((gc[1].w>>1)+2)%3] ;
-	i += hp->grid[((gc[1].w>>1)+1)%3]*gc[1].i[1] + gc[1].i[0];
+	i += (hp->grid[wg0[gc[0].w]]*gc[0].i[1] + gc[0].i[0]) *
+			hp->grid[wg0[gc[1].w]] * hp->grid[wg1[gc[1].w]] ;
+	i += hp->grid[wg0[gc[1].w]]*gc[1].i[1] + gc[1].i[0];
 	if (reverse)
 		i += hp->wi[5] - 1;
 	return(i);
 }
 
 
+hdcell(cp, hp, gc)		/* compute cell coordinates */
+register FVECT	cp[4];	/* returned (may be passed as FVECT cp[2][2]) */
+register HOLO	*hp;
+register GCOORD	*gc;
+{
+	register FLOAT	*v;
+	double	d;
+					/* compute common component */
+	VCOPY(cp[0], hp->orig);
+	if (gc->w & 1) {
+		v = hp->xv[gc->w>>1];
+		cp[0][0] += v[0]; cp[0][1] += v[1]; cp[0][2] += v[2];
+	}
+	v = hp->xv[wg0[gc->w]];
+	d = (double)gc->i[0] / hp->grid[wg0[gc->w]];
+	VSUM(cp[0], cp[0], v, d);
+	v = hp->xv[wg1[gc->w]];
+	d = (double)gc->i[1] / hp->grid[wg1[gc->w]];
+	VSUM(cp[0], cp[0], v, d);
+					/* compute x1 sums */
+	v = hp->xv[wg0[gc->w]];
+	d = 1.0 / hp->grid[wg0[gc->w]];
+	VSUM(cp[1], cp[0], v, d);
+	VSUM(cp[3], cp[0], v, d);
+					/* compute y1 sums */
+	v = hp->xv[wg1[gc->w]];
+	d = 1.0 / hp->grid[wg1[gc->w]];
+	VSUM(cp[2], cp[0], v, d);
+	VSUM(cp[3], cp[3], v, d);
+}
+
+
 hdlseg(lseg, hp, i)			/* compute line segment for beam */
-int	lseg[2][3];
+register int	lseg[2][3];
 register HOLO	*hp;
 int	i;
 {
-	BCOORD	gc;
+	GCOORD	gc[2];
 	register int	k;
 
-	if (!hdbcoord(gc, hp, i))
+	if (!hdbcoord(gc, hp, i))		/* compute grid coordinates */
 		return(0);
-	for (k = 0; k < 2; k++)		/* compute line segment */
-		switch (gc[k].w>>1) {
-		case 0:
-			lseg[k][0] = (gc[k].w & 1) * (hp->grid[0]-1);
-			lseg[k][1] = gc[k].i[0];
-			lseg[k][2] = gc[k].i[1];
-			break;
-		case 1:
-			lseg[k][0] = gc[k].i[1];
-			lseg[k][1] = (gc[k].w & 1) * (hp->grid[1]-1);
-			lseg[k][2] = gc[k].i[0];
-			break;
-		case 2:
-			lseg[k][0] = gc[k].i[0];
-			lseg[k][1] = gc[k].i[1];
-			lseg[k][2] = (gc[k].w & 1) * (hp->grid[2]-1);
-			break;
-		}
+	for (k = 0; k < 2; k++) {		/* compute end points */
+		lseg[k][gc[k].w>>1] = gc[k].w&1	? hp->grid[gc[k].w>>1]-1 : 0 ;
+		lseg[k][wg0[gc[k].w]] = gc[k].i[0];
+		lseg[k][wg1[gc[k].w]] = gc[k].i[1];
+	}
 	return(1);
 }
 
@@ -229,32 +237,58 @@ double	d;
 }
 
 
+hdgrid(gp, hp, wp)		/* compute grid coordinates */
+FVECT	gp;		/* returned */
+register HOLO	*hp;
+FVECT	wp;
+{
+	FVECT	vt;
+
+	vt[0] = wp[0] - hp->orig[0];
+	vt[1] = wp[1] - hp->orig[1];
+	vt[2] = wp[2] - hp->orig[2];
+	gp[0] = DOT(vt, hp->wn[0]) * hp->wg[0];
+	gp[1] = DOT(vt, hp->wn[1]) * hp->wg[1];
+	gp[2] = DOT(vt, hp->wn[2]) * hp->wg[2];
+}
+
+
+hdworld(wp, hp, gp)		/* compute world coordinates */
+register FVECT	wp;
+register HOLO	*hp;
+FVECT	gp;
+{
+	register double	d;
+
+	d = gp[0]/hp->grid[0];
+	VSUM(wp, hp->orig, hp->xv[0], d);
+
+	d = gp[1]/hp->grid[1];
+	VSUM(wp, wp, hp->xv[1], d);
+
+	d = gp[2]/hp->grid[2];
+	VSUM(wp, wp, hp->xv[2], d);
+}
+
+
 double
 hdray(ro, rd, hp, gc, r)	/* compute ray within a beam */
 FVECT	ro, rd;		/* returned */
-register HOLO	*hp;
-register BCOORD	gc;
+HOLO	*hp;
+GCOORD	gc[2];
 BYTE	r[2][2];
 {
-	FVECT	p[2];
-	register int	i;
-	register FLOAT	*v;
-	double	d;
+	FVECT	cp[4], p[2];
+	register int	i, j;
+	double	d0, d1;
 					/* compute entry and exit points */
 	for (i = 0; i < 2; i++) {
-		VCOPY(p[i], hp->orig);
-		if (gc[i].w & 1) {
-			v = hp->xv[gc[i].w>>1];
-			p[i][0] += *v++; p[i][1] += *v++; p[i][2] += *v;
-		}
-		d = ( gc[i].i[0] + (1./256.)*(r[i][0]+.5) ) /
-				hp->grid[((gc[i].w>>1)+1)%3];
-		v = hp->xv[((gc[i].w>>1)+1)%3];
-		p[i][0] += d * *v++; p[i][1] += d * *v++; p[i][2] += d * *v;
-		d = (gc[i].i[1] + (1./256.)*(r[i][1]+.5)) /
-				hp->grid[((gc[i].w>>1)+2)%3];
-		v = hp->xv[((gc[i].w>>1)+2)%3];
-		p[i][0] += d * *v++; p[i][1] += d * *v++; p[i][2] += d * *v;
+		hdcell(cp, hp, gc+i);
+		d0 = (1./256.)*(r[i][0]+.5);
+		d1 = (1./256.)*(r[i][1]+.5);
+		for (j = 0; j < 3; j++)
+			p[i][j] = (1.-d0-d1)*cp[0][j] +
+					d0*cp[1][j] + d1*cp[2][j];
 	}
 	VCOPY(ro, p[0]);		/* assign ray origin and direction */
 	rd[0] = p[1][0] - p[0][0];
@@ -266,7 +300,7 @@ BYTE	r[2][2];
 
 double
 hdinter(gc, r, hp, ro, rd)	/* compute ray intersection with section */
-register BCOORD	gc;	/* returned */
+register GCOORD	gc[2];	/* returned */
 BYTE	r[2][2];	/* returned */
 register HOLO	*hp;
 FVECT	ro, rd;		/* rd should be normalized */
@@ -317,18 +351,14 @@ FVECT	ro, rd;		/* rd should be normalized */
 		vt[0] = p[i][0] - hp->orig[0];
 		vt[1] = p[i][1] - hp->orig[1];
 		vt[2] = p[i][2] - hp->orig[2];
-		if (gc[i].w & 1) {
-			v = hp->xv[gc[i].w>>1];
-			vt[0] -= *v++; vt[1] -= *v++; vt[2] -= *v;
-		}
-		v = hp->gv[gc[i].w>>1][0];
-		d = DOT(vt, v);
-		if (d < 0. || (gc[i].i[0] = d) >= hp->grid[((gc[i].w>>1)+1)%3])
+		v = hp->wn[wg0[gc[i].w]];
+		d = DOT(vt, v) * hp->wg[wg0[gc[i].w]];
+		if (d < 0. || (gc[i].i[0] = d) >= hp->grid[wg0[gc[i].w]])
 			return(FHUGE);		/* outside wall */
 		r[i][0] = 256. * (d - gc[i].i[0]);
-		v = hp->gv[gc[i].w>>1][1];
-		d = DOT(vt, v);
-		if (d < 0. || (gc[i].i[1] = d) >= hp->grid[((gc[i].w>>1)+2)%3])
+		v = hp->wn[wg1[gc[i].w]];
+		d = DOT(vt, v) * hp->wg[wg1[gc[i].w]];
+		if (d < 0. || (gc[i].i[1] = d) >= hp->grid[wg1[gc[i].w]])
 			return(FHUGE);		/* outside wall */
 		r[i][1] = 256. * (d - gc[i].i[1]);
 	}