--- ray/src/common/octree.h	2003/02/22 02:07:22	2.5
+++ ray/src/common/octree.h	2003/06/27 06:53:21	2.10
@@ -1,65 +1,13 @@
-/* RCSid: $Id: octree.h,v 2.5 2003/02/22 02:07:22 greg Exp $ */
+/* RCSid $Id: octree.h,v 2.10 2003/06/27 06:53:21 greg Exp $ */
 /*
  *  octree.h - header file for routines using octrees.
  */
+#ifndef _RAD_OCTREE_H_
+#define _RAD_OCTREE_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *         notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
-
 /*
  *	An octree is expressed as an integer which is either
  *	an index to eight other nodes, the empty tree, or an index
@@ -88,10 +36,10 @@
 #define  octti(ot)	(((ot)&03777)<<3)/* octree index in block */
 
 #ifndef  MAXOBLK
-#ifdef  BIGMEM
-#define  MAXOBLK	32767		/* maximum octree block */
-#else
+#ifdef  SMLMEM
 #define  MAXOBLK	4095		/* maximum octree block */
+#else
+#define  MAXOBLK	32767		/* maximum octree block */
 #endif
 #endif
 
@@ -134,20 +82,7 @@ extern CUBE  thescene;			/* the main scene */
 #define  O_HIT		1		/* intersection */
 #define  O_IN		2		/* cube contained entirely */
 
-#ifdef NOPROTO
 
-extern OCTREE	octalloc();
-extern void	octfree();
-extern void	octdone();
-extern OCTREE	combine();
-extern void	culocate();
-extern void	cucopy();
-extern int	incube();
-
-extern int	readoct();
-
-#else
-
 extern OCTREE	octalloc(void);
 extern void	octfree(OCTREE ot);
 extern void	octdone(void);
@@ -158,4 +93,12 @@ extern int	incube(CUBE *cu, FVECT pt);
 
 extern int	readoct(char *fname, int load, CUBE *scene, char *ofn[]);
 
+extern void	readscene(FILE *fp, int objsiz);
+extern void	writescene(int firstobj, int nobjs, FILE *fp);
+
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_OCTREE_H_ */
+