--- ray/src/hd/rholo3.c	1997/11/26 21:34:28	3.11
+++ ray/src/hd/rholo3.c	1997/12/15 20:44:28	3.13
@@ -50,31 +50,31 @@ int	nents;
 		if (complist == NULL)
 			goto memerr;
 		bcopy((char *)clist, (char *)complist, nents*sizeof(PACKHEAD));
-		complen = nents;
-		listpos = 0;
-		lastin = -1;		/* flag for initial sort */
+		complen = nents;	/* finish initialization below */
 		break;
 	case BS_ADD:			/* add to computation set */
 	case BS_ADJ:			/* adjust set quantities */
 		if (nents <= 0)
 			return;
 					/* merge any common members */
-		for (i = 0; i < complen; i++) {
-			for (n = 0; n < nents; n++)
+		for (n = 0; n < nents; n++) {
+			for (i = 0; i < complen; i++)
 				if (clist[n].bi == complist[i].bi &&
 						clist[n].hd == complist[i].hd) {
+					int	oldnr = complist[i].nr;
 					if (op == BS_ADD)
 						complist[i].nr += clist[n].nr;
 					else /* op == BS_ADJ */
 						complist[i].nr = clist[n].nr;
 					clist[n].nr = 0;
-					clist[n].nc = 1;
-					lastin = -1;	/* flag full sort */
+					clist[n].nc = complist[i].nc;
+					if (complist[i].nr != oldnr)
+						lastin = -1;	/* flag sort */
 					break;
 				}
-			if (n >= nents)
-				clist[i].nc = bnrays(hdlist[clist[i].hd],
-						clist[i].bi);
+			if (i >= complen)
+				clist[n].nc = bnrays(hdlist[clist[n].hd],
+						clist[n].bi);
 		}
 					/* sort updated list */
 		sortcomplist();
@@ -149,6 +149,8 @@ int	nents;
 		for (i = 0; i < complen; i++)	/* ...get number computed */
 			complist[i].nc = bnrays(hdlist[complist[i].hd],
 						complist[i].bi);
+		listpos = 0;
+		lastin = -1;		/* flag for initial sort */
 	}
 	return;
 memerr:
@@ -156,74 +158,49 @@ memerr:
 }
 
 
-int
-weightf(hp, x0, x1, x2)		/* voxel weighting function */
-register HOLO	*hp;
-register int	x0, x1, x2;
-{
-	switch (vlet(OCCUPANCY)) {
-	case 'U':		/* uniform weighting */
-		return(1);
-	case 'C':		/* center weighting (crude) */
-		x0 += x0 - hp->grid[0] + 1;
-		x0 = abs(x0)*hp->grid[1]*hp->grid[2];
-		x1 += x1 - hp->grid[1] + 1;
-		x1 = abs(x1)*hp->grid[0]*hp->grid[2];
-		x2 += x2 - hp->grid[2] + 1;
-		x2 = abs(x2)*hp->grid[0]*hp->grid[1];
-		return(hp->grid[0]*hp->grid[1]*hp->grid[2] -
-				(x0+x1+x2)/3);
-	default:
-		badvalue(OCCUPANCY);
-	}
-}
-
-
-/* The following is by Daniel Cohen, taken from Graphics Gems IV, p. 368 */
-long
-lineweight(hp, x, y, z, dx, dy, dz)	/* compute weights along a line */
+double
+beamvolume(hp, bi)	/* compute approximate volume of a beam */
 HOLO	*hp;
-int	x, y, z, dx, dy, dz;
+int	bi;
 {
-	long	wres = 0;
-	int	n, sx, sy, sz, exy, exz, ezy, ax, ay, az, bx, by, bz;
-
-	sx = sgn(dx);	sy = sgn(dy);	sz = sgn(dz);
-	ax = abs(dx);	ay = abs(dy);	az = abs(dz);
-	bx = 2*ax;	by = 2*ay;	bz = 2*az;
-	exy = ay-ax;	exz = az-ax;	ezy = ay-az;
-	n = ax+ay+az + 1;		/* added increment to visit last */
-	while (n--) {
-		wres += weightf(hp, x, y, z);
-		if (exy < 0) {
-			if (exz < 0) {
-				x += sx;
-				exy += by; exz += bz;
-			} else {
-				z += sz;
-				exz -= bx; ezy += by;
-			}
-		} else {
-			if (ezy < 0) {
-				z += sz;
-				exz -= bx; ezy += by;
-			} else {
-				y += sy;
-				exy -= bx; ezy -= bz;
-			}
-		}
+	GCOORD	gc[2];
+	FVECT	cp[4], edgeA, edgeB, cent[2];
+	FVECT	v, crossp[2], diffv;
+	double	vol[2];
+	register int	i;
+					/* get grid coordinates */
+	if (!hdbcoord(gc, hp, bi))
+		error(CONSISTENCY, "bad beam index in beamvolume");
+	for (i = 0; i < 2; i++) {	/* compute cell area vectors */
+		hdcell(cp, hp, gc+i);
+		VSUM(edgeA, cp[1], cp[0], -1.0);
+		VSUM(edgeB, cp[3], cp[1], -1.0);
+		fcross(crossp[i], edgeA, edgeB);
+		VSUM(edgeA, cp[2], cp[3], -1.0);
+		VSUM(edgeB, cp[0], cp[2], -1.0);
+		fcross(v, edgeA, edgeB);
+		VSUM(crossp[i], crossp[i], v, 1.0);
+					/* compute center */
+		cent[i][0] = 0.5*(cp[0][0] + cp[2][0]);
+		cent[i][1] = 0.5*(cp[0][1] + cp[2][1]);
+		cent[i][2] = 0.5*(cp[0][2] + cp[2][2]);
 	}
-	return(wres);
+					/* compute difference vector */
+	VSUM(diffv, cent[1], cent[0], -1.0);
+	for (i = 0; i < 2; i++) {	/* compute volume contributions */
+		vol[i] = 0.25*DOT(crossp[i], diffv);
+		if (vol[i] < 0.) vol[i] = -vol[i];
+	}
+	return(vol[0] + vol[1]);	/* return total volume */
 }
 
 
 init_global()			/* initialize global ray computation */
 {
 	long	wtotal = 0;
-	int	i, j;
-	int	lseg[2][3];
 	double	frac;
-	register int	k;
+	int	i;
+	register int	j, k;
 					/* free old list */
 	if (complen > 0)
 		free((char *)complist);
@@ -236,25 +213,23 @@ init_global()			/* initialize global ray computation *
 		error(SYSTEM, "out of memory in init_global");
 					/* compute beam weights */
 	k = 0;
-	for (j = 0; hdlist[j] != NULL; j++)
+	for (j = 0; hdlist[j] != NULL; j++) {
+		frac = 512. * hdlist[j]->wg[0] *
+				hdlist[j]->wg[1] * hdlist[j]->wg[2];
 		for (i = nbeams(hdlist[j]); i > 0; i--) {
-			hdlseg(lseg, hdlist[j], i);
 			complist[k].hd = j;
 			complist[k].bi = i;
-			complist[k].nr = lineweight( hdlist[j],
-					lseg[0][0], lseg[0][1], lseg[0][2],
-					lseg[1][0] - lseg[0][0],
-					lseg[1][1] - lseg[0][1],
-					lseg[1][2] - lseg[0][2] );
+			complist[k].nr = frac*beamvolume(hdlist[j], i) + 0.5;
 			wtotal += complist[k++].nr;
 		}
+	}
 					/* adjust weights */
-	if (vdef(DISKSPACE)) {
+	if (vdef(DISKSPACE))
 		frac = 1024.*1024.*vflt(DISKSPACE) / (wtotal*sizeof(RAYVAL));
-		if (frac < 0.95 | frac > 1.05)
-			while (k--)
-				complist[k].nr = frac * complist[k].nr;
-	}
+	else
+		frac = 1024.*1024.*16384. / (wtotal*sizeof(RAYVAL));
+	while (k--)
+		complist[k].nr = frac * complist[k].nr;
 	listpos = 0; lastin = -1;	/* flag initial sort */
 }