--- ray/src/common/radogl.h	2003/02/22 02:07:22	3.4
+++ ray/src/common/radogl.h	2003/09/16 06:31:48	3.11
@@ -1,65 +1,10 @@
-/* RCSid: $Id: radogl.h,v 3.4 2003/02/22 02:07:22 greg Exp $ */
+/* RCSid $Id: radogl.h,v 3.11 2003/09/16 06:31:48 greg Exp $ */
 /*
  * Header file for Radiance - OpenGL routines.
  */
+#ifndef _RAD_RADOGL_H_
+#define _RAD_RADOGL_H_
 
-/* ====================================================================
- * 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 "standard.h"
 #include <GL/glu.h>
 #include "color.h"
@@ -67,6 +12,10 @@
 #include "otypes.h"
 #include "lookup.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MAXLIGHTS	8	/* number of OGL light sources */
 
 #define MAXSPECEXP	128.	/* maximum allowed specular exponent */
@@ -100,48 +49,6 @@ extern LUTAB	mtab;		/* material/modifier lookup table 
 #define issrcmat(m)	((m) != NULL && islight((m)->type) && \
 				(m)->type != MAT_GLOW)
 
-#ifdef NOPROTO
-
-extern void	domatobj();
-extern void	domatvert();
-extern int	newglist();
-extern void	rgl_checkerr();
-extern int	rgl_filelist();
-extern int	rgl_octlist();
-extern void	rgl_load();
-extern void	rgl_object();
-extern int	o_instance();
-extern int	loadoctrees();
-extern double	checkoct();
-extern int	loadoct();
-extern void	rgl_matclear();
-extern MATREC	*getmatp();
-extern int	o_default();
-extern MATREC	*newmaterial();
-extern void	freemtl();
-extern int	m_normal();
-extern int	m_aniso();
-extern int	m_glass();
-extern int	m_brdf();
-extern int	m_brdf2();
-extern int	m_light();
-extern int	m_mirror();
-extern int	m_prism();
-extern void	lightinit();
-extern void	lightclean();
-extern void	lightdefs();
-extern int	o_source();
-extern int	doflatsrc();
-extern int	dosphsrc();
-extern void	setmaterial();
-extern double	polyarea();
-extern int	o_face();
-extern void	surfclean();
-extern int	o_sphere();
-extern int	o_cone();
-extern int	o_ring();
-
-#else
 				/* defined in rgldomat.c */
 extern void	domatobj(MATREC *mp, FVECT cent);
 extern void	domatvert(MATREC *mp, FVECT v, FVECT n);
@@ -149,7 +56,7 @@ extern void	domatvert(MATREC *mp, FVECT v, FVECT n);
 extern int	newglist(void);
 extern void	rgl_checkerr(char *where);
 extern int	rgl_filelist(int ic, char **inp, int *nl);
-extern int	rgl_octlist(char *fname, FVECT cent, FLOAT *radp, int *nl);
+extern int	rgl_octlist(char *fname, FVECT cent, RREAL *radp, int *nl);
 extern void	rgl_load(char *inpspec);
 extern void	rgl_object(char *name, FILE *fp);
 				/* defined in rglinst.c */
@@ -161,8 +68,9 @@ extern int	loadoct(char *fname);
 extern void	rgl_matclear(void);
 extern MATREC	*getmatp(char *nam);
 extern int	o_default(OBJREC *o);
+extern int	o_unsupported(OBJREC *o);
 extern MATREC	*newmaterial(char *nam);
-extern void	freemtl(MATREC *mp);
+extern void	freemtl(void *p);
 extern int	m_normal(OBJREC *o);
 extern int	m_aniso(OBJREC *o);
 extern int	m_glass(OBJREC *o);
@@ -187,4 +95,9 @@ extern int	o_sphere(OBJREC *o);
 extern int	o_cone(OBJREC *o);
 extern int	o_ring(OBJREC *o);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_RADOGL_H_ */
+