Moved some of the low level scene graph construction code over to simgear.

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

diff --git a/src/Objects/obj.hxx b/src/Objects/obj.hxx
index eedbd1ff490648dd60d826a8e7976a08594afb58..1a197d5f0a2b759322a6be773811195356ced3c7 100644 (file)
--- a/src/Objects/obj.hxx
+++ b/src/Objects/obj.hxx
@@ -31,10 +31,6 @@
 #endif                                   
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_STRING
@@ -43,6 +39,7 @@
 
 #include <simgear/bucket/newbucket.hxx>
 #include <simgear/math/sg_types.hxx>
+#include <simgear/scene/material/matlib.hxx>
 
 SG_USING_STD(string);
 
@@ -55,6 +52,7 @@ SG_USING_STD(string);
 bool fgBinObjLoad( const string& path, const bool is_base,
                    Point3D *center,
                    double *bounding_radius,
+                   SGMaterialLib *matlib,
                    ssgBranch* geometry,
                    ssgBranch* rwy_lights,
                    ssgBranch* taxi_lights,
@@ -62,20 +60,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