--- ray/src/hd/rhd_qtree.h	1997/11/20 18:03:43	3.2
+++ ray/src/hd/rhd_qtree.h	1997/11/21 13:35:58	3.3
@@ -18,30 +18,37 @@
 #define	UL		2		/* up left */
 #define	UR		3		/* up right */
 
-#define	BRF(i)		(1<<(i))	/* branch flag bit */
-#define CHF(i)		(0x10<<(i))	/* change flag bit */
-#define	CHBRF(i)	(0x11<<(i))	/* changed branch flags */
-#define CH_ANY		0xf0		/* flags for any change */
+#define	BRF(i)		(0x1<<(i))	/* branch flag bit */
+#define LFF(i)		(0x10<<(i))	/* leaf flag bit */
+#define CHF(i)		(0x100<<(i))	/* change flag bit */
+#define	CHBRF(i)	(0x101<<(i))	/* changed branch bit */
+#define CHLFF(i)	(0x110<<(i))	/* changed leaf bit */
+#define BR_ANY		0xf		/* flags for any branches */
+#define LF_ANY		0xf0		/* flags for any leaves */
+#define CH_ANY		0xf00		/* flags for any change */
 
-typedef struct {
-	float		wp[3];		/* world intersection point */
-	TMbright	brt;		/* encoded brightness (LogY) */
-	BYTE		chr[3];		/* encoded chrominance (RGB) */
-}	RLEAF;			/* recorded ray (leaf) value */
-
 typedef struct rtree {
-	short	flgs;			/* branch flags */
+	short	flgs;			/* content flags (defined above) */
 	union {
 		struct rtree	*b;		/* if branch */
-		RLEAF	*l;			/* if leaf */
+		int	li;			/* if leaf */
 	} k[4];				/* children */
 }	RTREE;
 
+extern struct rleaves {
+	float		(*wp)[3];	/* world intersection point array */
+	TMbright	*brt;		/* encoded brightness array */
+	BYTE		(*chr)[3];	/* encoded chrominance array */
+	BYTE		(*rgb)[3];	/* tone-mapped color array */
+	int		nl;		/* count of leaves in our pile */
+	int		bl, tl;		/* bottom and top (next) leaf index */
+	int		tml;		/* next leaf needing tone-mapping */
+	char		*base;		/* base of allocated memory */
+}	qtL;			/* our pile of leaves */
+
 extern RTREE	qtrunk;		/* trunk of quadtree */
 extern double	qtDepthEps;	/* epsilon to compare depths (z fraction) */
 extern int	qtMinNodesiz;	/* minimum node dimension (pixels) */
-
-extern RLEAF	*qtFindLeaf();
 
 
 /************************************************************************