Replaced some debugging structure David inadvertantly removed.

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

diff --git a/src/Objects/obj.hxx b/src/Objects/obj.hxx
index 5ad0804e00cdd6d5bd3df967213ad5a9f96deff9..1a3d8b9348ef3f58b5efb881d3179247e6e9fc49 100644 (file)
--- a/src/Objects/obj.hxx
+++ b/src/Objects/obj.hxx
@@ -46,6 +46,8 @@
 
 #include <plib/ssg.h>          // plib include
 
+#include <simgear/math/sg_types.hxx>
+
 #include <Scenery/tileentry.hxx>
 
 SG_USING_STD(string);
@@ -55,24 +57,34 @@ SG_USING_STD(string);
 #define FG_MAX_NODES 4000
 
 
-// Load a binary object file
-ssgBranch *fgBinObjLoad(const string& path, FGTileEntry *tile,
-                       ssgVertexArray *lights, const bool is_base);
+// Load an 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
-ssgBranch *fgGenTile( const string& path, FGTileEntry *t);
-
-
-// Generate a taxi sign
-ssgBranch *gen_taxi_sign( const string path, const string content );
-
-
-// Generate a runway sign
-ssgBranch *gen_runway_sign( const string path, const string name );
+bool fgGenTile( const string& path, SGBucket b,
+               Point3D *center,
+               double *bounding_radius,
+               ssgBranch* geometry );
+
+
+// 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 normal_index,
+                  const int_list& tex_index,
+                  const bool calc_lights, ssgVertexArray *lights );
 
 
 #endif // _OBJ_HXX