--- ray/src/hd/sm_qtree.h	1998/10/06 18:18:54	3.7
+++ ray/src/hd/sm_qtree.h	2003/08/30 08:17:32	3.17
@@ -1,13 +1,16 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
-/* SCCSid "$SunId$ SGI" */
-
+/* RCSid: $Id: sm_qtree.h,v 3.17 2003/08/30 08:17:32 schorsch Exp $ */
 /*
  *  sm_qtree.h - header file for routines using spherical quadtrees.
  *
  *    adapted from octree.h 
  */
+#ifndef _RAD_SM_QTREE_H_
+#define _RAD_SM_QTREE_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  *	An quadtree is expressed as an integer which is either
  *	an index to 4 other nodes, the empty tree, or an index
@@ -19,8 +22,16 @@
  *
  *		< -1:	it is an index to a set of objects
  */
-#include "object.h"
 
+typedef struct _FUNC {
+    int (*func)();
+    int (*func_after)();
+    int *argptr;
+}FUNC;
+
+#define F_FUNC(f) (f.func)
+#define F_FUNC2(f) (f.func_after)
+#define F_ARGS(f) (f.argptr)
 #define  QUADTREE		int
 
 #define  EMPTY		(-1)
@@ -37,10 +48,10 @@
 
 
 #ifndef  QT_MAX_BLK
-#ifdef  BIGMEM
-#define  QT_MAX_BLK	16383		/* maximum quadtree block */
-#else
+#ifdef  SMLMEM
 #define  QT_MAX_BLK	2047		/* maximum quadtree block */
+#else
+#define  QT_MAX_BLK	16383		/* maximum quadtree block */
 #endif
 #endif
 
@@ -64,7 +75,7 @@
 #define QT_SET_NTH_ELEM(s,n)   ((s)[(n)])   
 
 #define QT_CLEAR_SET(s)        ((s)[0] = 0)
-#define QT_SET_NEXT_ELEM(p)    (*(p)++)
+#define QT_SET_NEXT_ELEM(p)    (*(++p))
 #define QT_SET_PTR(s)          (&((s)[1]))
 
 
@@ -72,14 +83,14 @@
 #define MAXCSET          2*QT_MAXSET
 #define QT_MAXCSET       MAXCSET
 #ifndef QT_SET_THRESHOLD
-#define QT_SET_THRESHOLD 30  
+#define QT_SET_THRESHOLD 32  
 #endif
 
 #ifndef QT_MAX_LEVELS
-#define QT_MAX_LEVELS     12
+#define QT_MAX_LEVELS     10
 #endif
 
-#define QT_FILL_THRESHOLD 3
+#define QT_FILL_THRESHOLD 2
 #define QT_EXPAND   8
 #define QT_COMPRESS 16
 #define QT_DONE 32
@@ -93,27 +104,40 @@
 #define QT_FLAG_SET_MODIFIED(f)   ((f) |= QT_MODIFIED)
 
 #define qtSubdivide(qt) (qt = qtAlloc(),QT_CLEAR_CHILDREN(qt))
-#define qtSubdivide_tri(v0,v1,v2,a,b,c) (EDGE_MIDPOINT_VEC3(a,v0,v1), \
-					 EDGE_MIDPOINT_VEC3(b,v1,v2), \
-					 EDGE_MIDPOINT_VEC3(c,v2,v0))
+#define qtSubdivide_tri(v0,v1,v2,a,b,c) (EDGE_MIDPOINT(a,v1,v2), \
+					 EDGE_MIDPOINT(b,v2,v0), \
+					 EDGE_MIDPOINT(c,v0,v1))
  
 extern QUADTREE  qtnewleaf(), qtaddelem(), qtdelelem();
 
 extern QUADTREE  *quad_block[QT_MAX_BLK];	/* quadtree blocks */
-extern int4  *quad_flag;			/* zeroeth quadtree flag */
+extern int32  *quad_flag;			/* zeroeth quadtree flag */
 
 extern OBJECT	**qtsettab;		/* quadtree leaf node table */
 extern QUADTREE  qtnumsets;		/* number of used set indices */
-extern int4   *qtsetflag;
+extern int32   *qtsetflag;
 #ifdef DEBUG
 extern OBJECT	*qtqueryset();
 #else
 #define qtqueryset(qt)	(qtsettab[QT_SET_INDEX(qt)])
 #endif
-
+#if 0
+#define qtremovelast(qt) ((*(qtqueryset(qt)))--)
+#endif
 #define qtinset(qt,id)	inset(qtqueryset(qt),id)
 #define qtgetset(os,qt)	setcopy(os,qtqueryset(qt))
 
+
+#define SIDES_GTR(b0,b1,b2,s0,s1,s2,a,b,c) \
+    (s0 = ((b0[0] > a?4:0) | (b1[0] > a?2:0) | (b2[0] > a?1:0)), \
+     s1 = ((b0[1] > b?4:0) | (b1[1] > b?2:0) | (b2[1] > b?1:0)), \
+     s2 = ((b0[2] > c?4:0) | (b1[2] > c?2:0) | (b2[2] > c?1:0)))
+
+#define SIDES_LESS(b0,b1,b2,s0,s1,s2,a,b,c) \
+    (s0 = ((b0[0] < a?4:0) | (b1[0] < a?2:0) | (b2[0] < a?1:0)), \
+     s1 = ((b0[1] < b?4:0) | (b1[1] < b?2:0) | (b2[1] < b?1:0)), \
+     s2 = ((b0[2] < c?4:0) | (b1[2] < c?2:0) | (b2[2] < c?1:0)))
+
 /* 
 QUADTREE qtRoot_point_locate(qt,q0,q1,q2,peq,pt,r0,r1,r2)
    QUADTREE qt;
@@ -133,3 +157,10 @@ extern QUADTREE qtRoot_remove_tri();
 extern QUADTREE qtAdd_tri();
 extern QUADTREE qtRoot_visit_tri_edges();
 extern QUADTREE qtRoot_trace_ray();
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_SM_QTREE_H_ */
+