Fixed runway-altitude problem that prevented starts at airports higher

[flightgear.git] / src / Objects / obj.hxx

diff --git a/src/Objects/obj.hxx b/src/Objects/obj.hxx
index bed0908eda98956fa3630c1dbc70ee47d2462e6e..05a7180d7afc78f3180197b4646519de4e49abeb 100644 (file)
--- a/src/Objects/obj.hxx
+++ b/src/Objects/obj.hxx
@@ -34,21 +34,49 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
+#include <simgear/compiler.h>
+
+// #ifdef HAVE_WINDOWS_H
+// #  include <windows.h>
+// #endif
+
+// #include <GL/glut.h>
 
-#include <GL/glut.h>
+#include STL_STRING
 
-#include <string>
+#include <plib/ssg.h>          // plib include
+
+#include <simgear/math/sg_types.hxx>
 
 #include <Scenery/tileentry.hxx>
 
+SG_USING_STD(string);
 
-// Load a .obj file and build the GL fragment list
-int fgObjLoad(const string& path, FGTileEntry *tile);
 
+// duplicated from the TerraGear tools
+#define FG_MAX_NODES 4000
 
-#endif // _OBJ_HXX
 
+// Load a binary object file
+ssgBranch *fgBinObjLoad(const string& path, FGTileEntry *tile,
+                       ssgVertexArray *lights, const bool is_base);
+
+// Load an ascii object file
+ssgBranch *fgAsciiObjLoad(const string& path, FGTileEntry *tile,
+                         ssgVertexArray *lights, const bool is_base);
 
+// Generate an ocean tile
+ssgBranch *fgGenTile( const string& path, FGTileEntry *t);
+
+
+// Create an ssg leaf
+ssgLeaf *gen_leaf( const string& path,
+                  const GLenum ty, const string& material,
+                  const point_list& nodes, const point_list& normals,
+                  const point_list& texcoords,
+                  const int_list node_index,
+                  const int_list& tex_index,
+                  const bool calc_lights, ssgVertexArray *lights );
+
+
+#endif // _OBJ_HXX