--- ray/src/ot/o_instance.c	1989/02/02 10:33:04	1.1
+++ ray/src/ot/o_instance.c	2003/02/22 02:07:26	2.2
@@ -1,9 +1,6 @@
-/* Copyright (c) 1988 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: o_instance.c,v 2.2 2003/02/22 02:07:26 greg Exp $";
 #endif
-
 /*
  *  o_instance.c - routines for creating octrees for other octrees.
  *
@@ -14,6 +11,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "object.h"
 
+#include  "octree.h"
+
 #include  "instance.h"
 
 #include  "plocate.h"
@@ -45,7 +44,7 @@ o_instance(o, cu)			/* determine if cubes intersect */
 OBJREC  *o;
 CUBE  *cu;
 {
-	static char  vstart[4] = {0, 3, 5, 6};
+	static int  vstart[4] = {0, 3, 5, 6};
 	FVECT  cumin, cumax;
 	FVECT  vert[8];
 	FVECT  v1, v2;
@@ -53,7 +52,7 @@ CUBE  *cu;
 	int  vloc, vout;
 	register int  i, j;
 					/* get octree arguments */
-	in = getinstance(o, GET_BOUNDS);
+	in = getinstance(o, IO_BOUNDS);
 					/* check if cube vertex in octree */
 	for (j = 0; j < 3; j++)
 		cumax[j] = (cumin[j] = in->obj->scube.cuorg[j]) +
@@ -66,17 +65,17 @@ CUBE  *cu;
 			if (i & 1<<j)
 				v1[j] += cu->cusize;
 		}
-		multp3(v2, v1, in->b.xfm);
+		multp3(v2, v1, in->x.b.xfm);
 		if (j = plocate(v2, cumin, cumax))
 			vout++;
 		vloc &= j;
 	}
 	if (vout == 0)			/* all inside */
-		return(2);
+		return(O_IN);
 	if (vout < 8)			/* some inside */
-		return(1);
+		return(O_HIT);
 	if (vloc)			/* all to one side */
-		return(0);
+		return(O_MISS);
 					/* octree vertices in cube? */
 	for (j = 0; j < 3; j++)
 		cumax[j] = (cumin[j] = cu->cuorg[j]) + cu->cusize;
@@ -87,14 +86,14 @@ CUBE  *cu;
 			if (i & 1<<j)
 				v1[j] += in->obj->scube.cusize;
 		}
-		multp3(vert[i], v1, in->f.xfm);
+		multp3(vert[i], v1, in->x.f.xfm);
 		if (j = plocate(vert[i], cumin, cumax))
 			vloc &= j;
 		else
-			return(1);	/* vertex inside */
+			return(O_HIT);	/* vertex inside */
 	}
 	if (vloc)			/* all to one side */
-		return(0);
+		return(O_MISS);
 					/* check edges */
 	for (i = 0; i < 4; i++)
 		for (j = 0; j < 3; j++) {
@@ -102,8 +101,8 @@ CUBE  *cu;
 			VCOPY(v1, vert[vstart[i]]);
 			VCOPY(v2, vert[vstart[i] ^ 1<<j]);
 			if (clip(v1, v2, cumin, cumax))
-				return(1);		/* edge inside */
+				return(O_HIT);		/* edge inside */
 		}
 
-	return(0);			/* no intersection */
+	return(O_MISS);			/* no intersection */
 }