Boris Koenig:

[flightgear.git] / src / Scenery / tileentry.hxx

diff --git a/src/Scenery/tileentry.hxx b/src/Scenery/tileentry.hxx
index 2bf8130b90aac0fac6769ac8d6028982e98c155c..de188cd90ee51bdfa3170423658c0995c938d996 100644 (file)
--- a/src/Scenery/tileentry.hxx
+++ b/src/Scenery/tileentry.hxx
@@ -38,8 +38,6 @@
 #include <vector>
 #include STL_STRING
 
-#include <plib/ssg.h>          // plib includes
-
 #include <simgear/bucket/newbucket.hxx>
 #include <simgear/math/point3d.hxx>
 #include <simgear/misc/sg_path.hxx>
@@ -56,6 +54,13 @@ typedef vector < Point3D > point_list;
 typedef point_list::iterator point_list_iterator;
 typedef point_list::const_iterator const_point_list_iterator;
 
+
+class ssgLeaf;
+class ssgBranch;
+class ssgTransform;
+class ssgSelector;
+class ssgRangeSelector;
+class ssgVertexArray;
 class FGTileEntry;
 
 
@@ -70,21 +75,25 @@ private:
     string texture_path;
     FGTileEntry *tile;
     ssgTransform *obj_trans;
+    SGBucket bucket;
+
 
 public:
 
     inline FGDeferredModel() { }
-    inline FGDeferredModel( const string mp, const string tp,
+    inline FGDeferredModel( const string mp, const string tp, SGBucket b,
                     FGTileEntry *t, ssgTransform *ot )
     {
        model_path = mp;
        texture_path = tp;
+        bucket = b;
        tile = t;
        obj_trans = ot;
     }
     inline ~FGDeferredModel() { }
     inline string get_model_path() const { return model_path; }
     inline string get_texture_path() const { return texture_path; }
+    inline SGBucket get_bucket() const { return bucket; }
     inline FGTileEntry *get_tile() const { return tile; }
     inline ssgTransform *get_obj_trans() const { return obj_trans; }
 };
@@ -227,7 +236,7 @@ public:
      * @param base name of directory containing tile data file.
      * @param is_base is this a base terrain object for which we should generate
      *        random ground light points */
-    void load( const string &base_path, bool is_base );
+    void load( const string_list &base_path, bool is_base );
 
     /**
      * Return true if the tile entry is loaded, otherwise return false
@@ -250,6 +259,11 @@ public:
      */
     inline SGBucket get_tile_bucket() const { return tile_bucket; }
 
+    /**
+     * Apply ssgLeaf::makeDList to all leaf of a branch
+     */
+    void makeDList( ssgBranch *b );
+
     /**
      * Add terrain mesh and ground lighting to scene graph.
      */