Tile-manager can request VBOs.

Monitor /sim/rendering/use-vbos and pass the value into
our SGReaderWriterOptions.

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index 1d4bd40adb2a8feb5a929b76562a1f5643ea3d26..54fe7988e30c78dc08d93038d9fbd4f59b94857b 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -53,12 +53,37 @@
 
 using flightgear::SceneryPager;
 
+class FGTileMgr::TileManagerListener : public SGPropertyChangeListener
+{
+public:
+    TileManagerListener(FGTileMgr* manager) :
+        _manager(manager)
+    {
+        fgGetNode("/sim/rendering/use-vbos", true)->addChangeListener(this, true);
+    }
+    
+    ~TileManagerListener()
+    {
+        fgGetNode("/sim/rendering/use-vbos")->removeChangeListener(this);
+    }
+    
+    virtual void valueChanged(SGPropertyNode* prop)
+    {
+        bool useVBOs = prop->getBoolValue();
+        _manager->_options->setPluginStringData("SimGear::USE_VBOS",
+                                                useVBOs ? "ON" : "OFF");
+    }
+    
+private:
+    FGTileMgr* _manager;
+};
 
 FGTileMgr::FGTileMgr():
     state( Start ),
     last_state( Running ),
     scheduled_visibility(100.0),
     _terra_sync(NULL),
+    _listener(NULL),
     _visibilityMeters(fgGetNode("/environment/visibility-m", true)),
     _maxTileRangeM(fgGetNode("/sim/rendering/static-lod/bare", true)),
     _disableNasalHooks(fgGetNode("/sim/temp/disable-scenery-nasal", true)),
@@ -71,6 +96,8 @@ FGTileMgr::FGTileMgr():
 
 FGTileMgr::~FGTileMgr()
 {
+    delete _listener;
+    
     // remove all nodes we might have left behind
     osg::Group* group = globals->get_scenery()->get_terrain_branch();
     group->removeChildren(0, group->getNumChildren());
@@ -84,6 +111,7 @@ void FGTileMgr::init() {
     SG_LOG( SG_TERRAIN, SG_INFO, "Initializing Tile Manager subsystem." );
 
     _options = new simgear::SGReaderWriterOptions;
+    _listener = new TileManagerListener(this);
     
     materialLibChanged();
     _options->setPropertyNode(globals->get_props());

diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index 1f7627c043f77a4474d0e2a7df75129dbd6e6a98..6931d4acca956d3145d61b0dcc60f346534f6e1e 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -29,7 +29,6 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/bucket/newbucket.hxx>
 #include "SceneryPager.hxx"
-#include "tileentry.hxx"
 #include "tilecache.hxx"
 
 namespace osg
@@ -76,7 +75,11 @@ private:
      */
     TileCache tile_cache;
     simgear::SGTerraSync* _terra_sync;
-
+    
+    class TileManagerListener;
+    friend class TileManagerListener;
+    TileManagerListener* _listener;
+    
     // update various queues internal queues
     void update_queues(bool& isDownloadingScenery);