--- ray/src/common/rglinst.c	1998/06/09 11:18:35	3.1
+++ ray/src/common/rglinst.c	2003/02/22 02:07:22	3.5
@@ -1,16 +1,72 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rglinst.c,v 3.5 2003/02/22 02:07:22 greg Exp $";
 #endif
-
 /*
  * Routines for reading instances and converting to OpenGL.
  */
 
+/* ====================================================================
+ * 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/>.
+ */
+
 #include "radogl.h"
 #include "octree.h"
 
+#define MAXLEVEL	16		/* maximum instance hierarchy level */
+
 typedef struct {
 	int	listid;				/* our list id */
 	short	localmatl;			/* uses local material only */
@@ -18,14 +74,12 @@ typedef struct {
 	char	octfile[256];			/* octree file path */
 } OCTINST;				/* octree to instantiate */
 
-OBJECT  nobjects;			/* number of objects loaded so far */
-
-extern int	free();
-
 static double  ogetflt();
 static long  ogetint();
 static char  *ogetstr();
-static int  loadobj(), octerror(), skiptree();
+static int  loadobj();
+static void  skiptree();
+static void  octerror();
 static OCTINST	*getoct();
 
 static char  *infn;			/* input file name */
@@ -33,12 +87,13 @@ static FILE  *infp;			/* input file stream */
 static int  objsize;			/* size of stored OBJECT's */
 static short  otypmap[NUMOTYPE+8];	/* object type map */
 
-static long	imhash(mod) char *mod; {return((long)mod);}
+static unsigned long	imhash(mod) char *mod; {return((unsigned long)mod);}
 static LUTAB	imtab = {imhash,NULL,NULL,NULL,0,NULL,0};
 
 static LUTAB	ottab = LU_SINIT(free,free);
 
 
+int
 o_instance(o)				/* convert instance to list call */
 register OBJREC	*o;
 {
@@ -67,11 +122,12 @@ register OBJREC	*o;
 	}
 	ot = getoct(o->oargs.sarg[0]);	/* get octree reference */
 	if (ot->localmatl &= o->os != NULL)	/* set material */
-		setmaterial(o->os, ot->cent, 0);
+		setmaterial((MATREC *)o->os, ot->cent, 0);
 					/* call the assigned list */
 	glCallList(ot->listid);
 
 	if (o->oargs.nsargs > 1) {	/* end transform */
+		glMatrixMode(GL_MODELVIEW);
 		glPopMatrix();
 		glPopAttrib();
 	}
@@ -101,10 +157,13 @@ LUENT	*lp;
 int
 loadoctrees()				/* load octrees we've saved up */
 {
+	int	levelsleft = MAXLEVEL;
 	int	nocts = 0;
 	LUTAB	looptab;
 				/* loop through new octree references */
 	while (ottab.tsiz) {
+		if (!levelsleft--)
+			error(USER, "too many octree levels -- instance loop?");
 		copystruct(&looptab, &ottab);
 		ottab.tsiz = 0;
 		nocts += lu_doall(&looptab, buildoctlist);
@@ -191,6 +250,7 @@ FVECT	cent;
 }
 
 
+int
 loadoct(fname)				/* read in objects from octree */
 char  *fname;
 {
@@ -280,7 +340,7 @@ ogetflt()			/* get a floating point number */
 }
 	
 
-static
+static void
 skiptree()				/* skip octree on input */
 {
 	register int  i;
@@ -305,7 +365,7 @@ skiptree()				/* skip octree on input */
 }
 
 
-static
+static int
 loadobj()				/* get next object */
 {
 	static OBJREC	 ob;
@@ -378,7 +438,7 @@ memerr:
 }
 
 
-static
+static void
 octerror(etyp, msg)			/* octree error */
 int  etyp;
 char  *msg;