--- ray/src/common/radogl.h	1998/06/09 11:18:36	3.1
+++ ray/src/common/radogl.h	2003/04/23 02:28:06	3.6
@@ -1,17 +1,16 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
-/* SCCSid "$SunId$ SGI" */
-
+/* RCSid $Id: radogl.h,v 3.6 2003/04/23 02:28:06 greg Exp $ */
 /*
  * Header file for Radiance - OpenGL routines.
  */
 
+#include "copyright.h"
+
 #include "standard.h"
+#include <GL/glu.h>
 #include "color.h"
 #include "object.h"
 #include "otypes.h"
 #include "lookup.h"
-#include <GL/glu.h>
 
 #define MAXLIGHTS	8	/* number of OGL light sources */
 
@@ -37,16 +36,102 @@ typedef struct {
 
 extern double	expval;		/* global exposure value */
 extern COLOR	ambval;		/* global ambient value */
+extern int	glightid[MAXLIGHTS];	/* OpenGL GL_LIGHTi values */
 extern int	dolights;	/* are we outputting light sources? */
 extern int	domats;		/* are we doing materials? */
 
 extern LUTAB	mtab;		/* material/modifier lookup table */
 
-extern MATREC	*newmaterial(), *getmatp();
+#define issrcmat(m)	((m) != NULL && islight((m)->type) && \
+				(m)->type != MAT_GLOW)
 
-extern int	newglist();
+#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 int	o_unsupported();
+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();
 
-#define issrcmat(m)	((m) != NULL && islight((m)->type) && \
-				(m)->type != MAT_GLOW)
+#else
+				/* defined in rgldomat.c */
+extern void	domatobj(MATREC *mp, FVECT cent);
+extern void	domatvert(MATREC *mp, FVECT v, FVECT n);
+				/* defined in rglfile.c */
+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 void	rgl_load(char *inpspec);
+extern void	rgl_object(char *name, FILE *fp);
+				/* defined in rglinst.c */
+extern int	o_instance(OBJREC *o);
+extern int	loadoctrees(void);
+extern double	checkoct(char *fname, FVECT cent);
+extern int	loadoct(char *fname);
+				/* defined in rglmat.c */
+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 int	m_normal(OBJREC *o);
+extern int	m_aniso(OBJREC *o);
+extern int	m_glass(OBJREC *o);
+extern int	m_brdf(OBJREC *o);
+extern int	m_brdf2(OBJREC *o);
+extern int	m_light(OBJREC *o);
+extern int	m_mirror(OBJREC *o);
+extern int	m_prism(OBJREC *o);
+				/* defined in rglsrc.c */
+extern void	lightinit(void);
+extern void	lightclean(void);
+extern void	lightdefs(void);
+extern int	o_source(OBJREC *o);
+extern int	doflatsrc(MATREC *m, FVECT pos, FVECT norm, double area);
+extern int	dosphsrc(MATREC *m, FVECT pos, double area);
+				/* defined in rglsurf.c */
+extern void	setmaterial(MATREC *mp, FVECT cent, int ispoly);
+extern double	polyarea(FVECT cent, FVECT norm, int n, FVECT v[]);
+extern int	o_face(OBJREC *o);
+extern void	surfclean(void);
+extern int	o_sphere(OBJREC *o);
+extern int	o_cone(OBJREC *o);
+extern int	o_ring(OBJREC *o);
+
+#endif