ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/radogl.h
(Generate patch)

Comparing ray/src/common/radogl.h (file contents):
Revision 3.6 by greg, Wed Apr 23 02:28:06 2003 UTC vs.
Revision 3.12 by greg, Wed Apr 25 22:21:06 2012 UTC

# Line 2 | Line 2
2   /*
3   * Header file for Radiance - OpenGL routines.
4   */
5 + #ifndef _RAD_RADOGL_H_
6 + #define _RAD_RADOGL_H_
7  
6 #include "copyright.h"
7
8   #include "standard.h"
9 < #include <GL/glu.h>
9 > #ifdef __APPLE__
10 >  #include <OpenGL/glu.h>
11 > #else
12 >  #ifdef _WIN32
13 >    #include <windows.h>
14 >  #endif
15 >  #include <GL/glu.h>
16 > #endif
17   #include "color.h"
18   #include "object.h"
19   #include "otypes.h"
20   #include "lookup.h"
21  
22 + #ifdef __cplusplus
23 + extern "C" {
24 + #endif
25 +
26   #define MAXLIGHTS       8       /* number of OGL light sources */
27  
28   #define MAXSPECEXP      128.    /* maximum allowed specular exponent */
# Line 45 | Line 56 | extern LUTAB   mtab;           /* material/modifier lookup table
56   #define issrcmat(m)     ((m) != NULL && islight((m)->type) && \
57                                  (m)->type != MAT_GLOW)
58  
48 #ifdef NOPROTO
49
50 extern void     domatobj();
51 extern void     domatvert();
52 extern int      newglist();
53 extern void     rgl_checkerr();
54 extern int      rgl_filelist();
55 extern int      rgl_octlist();
56 extern void     rgl_load();
57 extern void     rgl_object();
58 extern int      o_instance();
59 extern int      loadoctrees();
60 extern double   checkoct();
61 extern int      loadoct();
62 extern void     rgl_matclear();
63 extern MATREC   *getmatp();
64 extern int      o_default();
65 extern int      o_unsupported();
66 extern MATREC   *newmaterial();
67 extern void     freemtl();
68 extern int      m_normal();
69 extern int      m_aniso();
70 extern int      m_glass();
71 extern int      m_brdf();
72 extern int      m_brdf2();
73 extern int      m_light();
74 extern int      m_mirror();
75 extern int      m_prism();
76 extern void     lightinit();
77 extern void     lightclean();
78 extern void     lightdefs();
79 extern int      o_source();
80 extern int      doflatsrc();
81 extern int      dosphsrc();
82 extern void     setmaterial();
83 extern double   polyarea();
84 extern int      o_face();
85 extern void     surfclean();
86 extern int      o_sphere();
87 extern int      o_cone();
88 extern int      o_ring();
89
90 #else
59                                  /* defined in rgldomat.c */
60   extern void     domatobj(MATREC *mp, FVECT cent);
61   extern void     domatvert(MATREC *mp, FVECT v, FVECT n);
# Line 95 | Line 63 | extern void    domatvert(MATREC *mp, FVECT v, FVECT n);
63   extern int      newglist(void);
64   extern void     rgl_checkerr(char *where);
65   extern int      rgl_filelist(int ic, char **inp, int *nl);
66 < extern int      rgl_octlist(char *fname, FVECT cent, FLOAT *radp, int *nl);
66 > extern int      rgl_octlist(char *fname, FVECT cent, RREAL *radp, int *nl);
67   extern void     rgl_load(char *inpspec);
68   extern void     rgl_object(char *name, FILE *fp);
69                                  /* defined in rglinst.c */
# Line 109 | Line 77 | extern MATREC  *getmatp(char *nam);
77   extern int      o_default(OBJREC *o);
78   extern int      o_unsupported(OBJREC *o);
79   extern MATREC   *newmaterial(char *nam);
80 < extern void     freemtl(MATREC *mp);
80 > extern void     freemtl(void *p);
81   extern int      m_normal(OBJREC *o);
82   extern int      m_aniso(OBJREC *o);
83   extern int      m_glass(OBJREC *o);
# Line 134 | Line 102 | extern int     o_sphere(OBJREC *o);
102   extern int      o_cone(OBJREC *o);
103   extern int      o_ring(OBJREC *o);
104  
105 +
106 + #ifdef __cplusplus
107 + }
108   #endif
109 + #endif /* _RAD_RADOGL_H_ */
110 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines