--- ray/src/ot/bbox.c	2003/03/11 17:08:55	2.4
+++ ray/src/ot/bbox.c	2005/06/14 17:10:06	2.6
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bbox.c,v 2.4 2003/03/11 17:08:55 greg Exp $";
+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,25 +8,26 @@ static const char RCSid[] = "$Id: bbox.c,v 2.4 2003/03
 #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;
@@ -92,8 +93,12 @@ FVECT  bbmin, bbmax;
 }
 
 
-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;
 
@@ -106,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;
 	}
 }