Changed #ifdef FILE_H to #ifdef _FILE_H

[flightgear.git] / Scenery / mesh.h

diff --git a/Scenery/mesh.h b/Scenery/mesh.h
index 75a144852e9d4d55f08a64205ee6b02f211ce88c..e08c539e2dac38c5450986fba1bdb4bd10cc445a 100644 (file)
--- a/Scenery/mesh.h
+++ b/Scenery/mesh.h
@@ -24,11 +24,14 @@
  **************************************************************************/
 
 
-#ifndef MESH_H
-#define MESH_H
+#ifndef _MESH_H
+#define _MESH_H
 
 
-struct mesh {
+#include <GL/glut.h>
+
+
+struct MESH {
     /* start coordinates (in arc seconds) */
     double originx, originy;
 
@@ -49,36 +52,55 @@ struct mesh {
 
 
 /* return a pointer to a new mesh structure (no data array allocated yet) */
-struct mesh *(new_mesh)();
+struct MESH *(new_mesh)( void );
 
 /* initialize the non-array mesh values */
-void mesh_init(struct mesh *m);
+void mesh_init(struct MESH *m);
 
 /* return a pointer to a dynamically allocated array */
 float *(new_mesh_data)(int nrows, int ncols);
 
 /* set the option name in the mesh data structure */
-void mesh_set_option_name(struct mesh *m, char *name);
+void mesh_set_option_name(struct MESH *m, char *name);
 
 /* set an option value in the mesh data structure */
-void mesh_set_option_value(struct mesh *m, char *value);
+void mesh_set_option_value(struct MESH *m, char *value);
 
 /* do whatever needs to be done with the mesh now that it's been
  * loaded, such as generating the OpenGL call list. */
-void mesh_do_it(struct mesh *m);
+void mesh_do_it(struct MESH *m);
 
 /* return the current altitude based on mesh data.  We should rewrite
  * this to interpolate exact values, but for now this is good enough */
 double mesh_altitude(double lon, double lat);
 
+/* walk through mesh and make opengl calls */
+GLint mesh_to_OpenGL(struct MESH *m);
 
-#endif MESH_H
+
+#endif /* _MESH_H */
 
 
 /* $Log$
-/* Revision 1.4  1997/07/08 18:20:14  curt
-/* Working on establishing a hard ground.
+/* Revision 1.9  1998/01/22 02:59:41  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.8  1998/01/19 18:40:37  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
+ * Revision 1.7  1997/08/27 03:30:29  curt
+ * Changed naming scheme of basic shared structures.
+ *
+ * Revision 1.6  1997/08/02 19:10:15  curt
+ * Incorporated mesh2GL.c into mesh.c
+ *
+ * Revision 1.5  1997/07/23 21:52:25  curt
+ * Put comments around the text after an #endif for increased portability.
+ *
+ * Revision 1.4  1997/07/08 18:20:14  curt
+ * Working on establishing a hard ground.
+ *
  * Revision 1.3  1997/06/22 21:44:41  curt
  * Working on intergrating the VRML (subset) parser.
  *