Moved random ground cover object management code (userdata.[ch]xx) over

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

diff --git a/src/Objects/obj.hxx b/src/Objects/obj.hxx
index c4842e82083d632d00e5620a6eee72a23e4fc202..cfd99232d3cd9706ee62badef6a1b5d831f2ea0d 100644 (file)
--- a/src/Objects/obj.hxx
+++ b/src/Objects/obj.hxx
@@ -37,20 +37,20 @@
 
 #include <plib/ssg.h>           // plib include
 
-#include <simgear/bucket/newbucket.hxx>
-#include <simgear/math/sg_types.hxx>
+#include <simgear/math/point3d.hxx>
 
 SG_USING_STD(string);
 
-
-// duplicated from the TerraGear tools
-#define FG_MAX_NODES 4000
+class SGBucket;
+class SGMaterialLib;
 
 
 // Load a Binary obj file
 bool fgBinObjLoad( const string& path, const bool is_base,
                    Point3D *center,
                    double *bounding_radius,
+                   SGMaterialLib *matlib,
+                   bool use_random_objects,
                    ssgBranch* geometry,
                    ssgBranch* rwy_lights,
                    ssgBranch* taxi_lights,
@@ -58,20 +58,8 @@ bool fgBinObjLoad( const string& path, 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 );
+                Point3D *center, double *bounding_radius,
+                SGMaterialLib *matlib, ssgBranch* geometry );
 
 
 #endif // _OBJ_HXX