--- ray/src/ot/bbox.c	1989/02/21 14:44:47	1.2
+++ ray/src/ot/bbox.c	2005/06/14 17:10:06	2.6
@@ -1,35 +1,38 @@
-/* Copyright (c) 1987 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: bbox.c,v 2.6 2005/06/14 17:10:06 greg Exp $";
 #endif
-
 /*
  *  bbox.c - routines for bounding box computation.
- *
- *	8/4/87
  */
 
-#include  "standard.h"
+#include  "copyright.h"
 
+#include  "standard.h"
 #include  "object.h"
-
+#include  "octree.h"
 #include  "otypes.h"
-
 #include  "face.h"
-
 #include  "cone.h"
-
 #include  "instance.h"
+#include  "mesh.h"
+#include  "oconv.h"
 
 
-add2bbox(o, bbmin, bbmax)		/* expand bounding box to fit object */
-register OBJREC  *o;
-FVECT  bbmin, bbmax;
+static void point2bbox(FVECT  p, FVECT  bbmin, FVECT  bbmax);
+static void circle2bbox(FVECT  cent, FVECT  norm, double  rad, FVECT  bbmin, FVECT  bbmax);
+
+
+void
+add2bbox(		/* expand bounding box to fit object */
+	register OBJREC  *o,
+	FVECT  bbmin,
+	FVECT  bbmax
+)
 {
 	CONE  *co;
 	FACE  *fo;
 	INSTANCE  *io;
+	MESHINST  *mi;
 	FVECT  v;
 	register int  i, j;
 
@@ -63,23 +66,39 @@ FVECT  bbmin, bbmax;
 		circle2bbox(CO_P1(co), co->ad, CO_R1(co), bbmin, bbmax);
 		break;
 	case OBJ_INSTANCE:
-		io = getinstance(o, GET_BOUNDS);
+		io = getinstance(o, IO_BOUNDS);
 		for (j = 0; j < 8; j++) {
 			for (i = 0; i < 3; i++) {
 				v[i] = io->obj->scube.cuorg[i];
 				if (j & 1<<i)
 					v[i] += io->obj->scube.cusize;
 			}
-			multp3(v, v, io->f.xfm);
+			multp3(v, v, io->x.f.xfm);
 			point2bbox(v, bbmin, bbmax);
 		}
 		break;
+	case OBJ_MESH:
+		mi = getmeshinst(o, IO_BOUNDS);
+		for (j = 0; j < 8; j++) {
+			for (i = 0; i < 3; i++) {
+				v[i] = mi->msh->mcube.cuorg[i];
+				if (j & 1<<i)
+					v[i] += mi->msh->mcube.cusize;
+			}
+			multp3(v, v, mi->x.f.xfm);
+			point2bbox(v, bbmin, bbmax);
+		}
+		break;
 	}
 }
 
 
-point2bbox(p, bbmin, bbmax)		/* expand bounding box to fit point */
-register FVECT  p, bbmin, bbmax;
+static void
+point2bbox(		/* expand bounding box to fit point */
+	register FVECT  p,
+	register FVECT  bbmin,
+	register FVECT  bbmax
+)
 {
 	register int  i;
 
@@ -92,25 +111,25 @@ register FVECT  p, bbmin, bbmax;
 }
 
 
-circle2bbox(cent, norm, rad, bbmin, bbmax)	/* expand bbox to fit circle */
-FVECT  cent, norm;
-double  rad;
-FVECT  bbmin, bbmax;
+static void
+circle2bbox(	/* expand bbox to fit circle */
+	FVECT  cent,
+	FVECT  norm,
+	double  rad,
+	FVECT  bbmin,
+	FVECT  bbmax
+)
 {
-	FVECT  v1, v2;
-	register int  i, j;
+	double	d, r;
+	register int  i;
 
 	for (i = 0; i < 3; i++) {
-		v1[0] = v1[1] = v1[2] = 0;
-		v1[i] = 1.0;
-		fcross(v2, norm, v1);
-		if (normalize(v2) == 0.0)
-			continue;
-		for (j = 0; j < 3; j++)
-			v1[j] = cent[j] + rad*v2[j];
-		point2bbox(v1, bbmin, bbmax);
-		for (j = 0; j < 3; j++)
-			v1[j] = cent[j] - rad*v2[j];
-		point2bbox(v1, bbmin, bbmax);
+		r = sqrt(1. - norm[i]*norm[i]);
+		d = cent[i] + r*rad;
+		if (d > bbmax[i])
+			bbmax[i] = d;
+		d = cent[i] - r*rad;
+		if (d < bbmin[i])
+			bbmin[i] = d;
 	}
 }