Only disable display lists if using VBOs.

[simgear.git] / simgear / scene / tgdb / TreeBin.hxx

diff --git a/simgear/scene/tgdb/TreeBin.hxx b/simgear/scene/tgdb/TreeBin.hxx
index 3c7970281005d2e83d1f9bd756aa801b1f19005f..9b9c3bc91a2e5466bce318d7ed2026b655993a57 100644 (file)
--- a/simgear/scene/tgdb/TreeBin.hxx
+++ b/simgear/scene/tgdb/TreeBin.hxx
@@ -29,19 +29,17 @@
 #include <osg/Group>
 #include <osg/Matrix>
 
-#include <simgear/math/SGMath.hxx>
+#include <simgear/scene/util/OsgMath.hxx>
 
 namespace simgear
 {
 class TreeBin {
 public:
   struct Tree {
-    Tree(const SGVec3f& p, int t, float s) :
-      position(p), texture_index(t), scale(s)
+    Tree(const SGVec3f& p) :
+      position(p)
     { }
     SGVec3f position;
-    int texture_index;
-    float scale;
   };
 
     typedef std::vector<Tree> TreeList;
@@ -51,20 +49,26 @@ public:
     float height;
     float width;
     std::string texture;
-
+    
     void insert(const Tree& t)
     { _trees.push_back(t); }
     void insert(const SGVec3f& p, int t, float s)
-    { insert(Tree(p, t, s)); }
+    { insert(Tree(p)); }
 
     unsigned getNumTrees() const
     { return _trees.size(); }
     const Tree& getTree(unsigned i) const
     { return _trees[i]; }
     TreeList _trees;
+    
+    ~TreeBin() {
+      _trees.clear();
+    }    
 };
 
-osg::Geometry* createOrthQuads(float w, float h, const osg::Matrix& rotate);
-osg::Group* createForest(TreeBin& forest, const osg::Matrix& transform);
+typedef std::list<TreeBin*> SGTreeBinList;
+
+osg::Group* createForest(SGTreeBinList& forestList, const osg::Matrix& transform,
+                         const SGReaderWriterOptions* options);
 }
 #endif