Updates to the electrical system model. "Juice" is now propogated through

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

diff --git a/src/Objects/obj.hxx b/src/Objects/obj.hxx
index d833a9a3a5f712f4a4117c3b13b417e92d0ea0a4..803e7c4d5208598fa23bcf1fa9dff447f83575ed 100644 (file)
--- a/src/Objects/obj.hxx
+++ b/src/Objects/obj.hxx
@@ -34,27 +34,51 @@
 #  include <config.h>
 #endif
 
-#include <Include/compiler.h>
-
-// #ifdef HAVE_WINDOWS_H
-// #  include <windows.h>
-// #endif
-
-// #include <GL/glut.h>
+#include <simgear/compiler.h>
 
 #include STL_STRING
 
-#include <plib/ssg.h>          // plib include
+#include <plib/ssg.h>           // plib include
+
+#include <simgear/math/sg_types.hxx>
 
 #include <Scenery/tileentry.hxx>
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 
-// Load a .obj file and build the fragment list
-ssgBranch *fgObjLoad(const string& path, FGTileEntry *tile, const bool is_base);
+// duplicated from the TerraGear tools
+#define FG_MAX_NODES 4000
 
 
-#endif // _OBJ_HXX
+// Load a Binary obj file
+bool fgBinObjLoad( const string& path, const bool is_base,
+                   Point3D *center,
+                   double *bounding_radius,
+                   ssgBranch* geometry,
+                   ssgBranch* rwy_lights,
+                   ssgVertexArray *ground_lights );
+
+// Load an ascii object file
+ssgBranch *fgAsciiObjLoad(const string& path, FGTileEntry *tile,
+                          ssgVertexArray *lights, const bool is_base);
 
+// Generate an ocean tile
+bool fgGenTile( const string& path, SGBucket b,
+                Point3D *center,
+                double *bounding_radius,
+                ssgBranch* geometry );
 
+
+// Create a 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& normal_index,
+                   const int_list& tex_index,
+                   const bool calc_lights, ssgVertexArray *lights );
+
+
+#endif // _OBJ_HXX