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 05a7180d7afc78f3180197b4646519de4e49abeb..1a3d8b9348ef3f58b5efb881d3179247e6e9fc49 100644 (file)
--- a/src/Objects/obj.hxx
+++ b/src/Objects/obj.hxx
@@ -57,16 +57,23 @@ 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);
+bool fgGenTile( const string& path, SGBucket b,
+               Point3D *center,
+               double *bounding_radius,
+               ssgBranch* geometry );
 
 
 // Create an ssg leaf
@@ -75,6 +82,7 @@ ssgLeaf *gen_leaf( const string& path,
                   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 );