Add method to reload specific scenery tiles.

diff --git a/simgear/scene/tgdb/TileCache.cxx b/simgear/scene/tgdb/TileCache.cxx
index 3032dea18bdb69b3f5b340059c40c7e203b2917d..5028d1973a6122f59e88dbea70ea1993be83fffd 100644 (file)
--- a/simgear/scene/tgdb/TileCache.cxx
+++ b/simgear/scene/tgdb/TileCache.cxx
@@ -47,12 +47,11 @@ TileCache::~TileCache( void ) {
 
 
 // Free a tile cache entry
-void TileCache::entry_free( long cache_index ) {
-    SG_LOG( SG_TERRAIN, SG_DEBUG, "FREEING CACHE ENTRY = " << cache_index );
-    TileEntry *tile = tile_cache[cache_index];
+void TileCache::entry_free( long tile_index ) {
+    SG_LOG( SG_TERRAIN, SG_DEBUG, "FREEING CACHE ENTRY = " << tile_index );
+    TileEntry *tile = tile_cache[tile_index];
     tile->removeFromSceneGraph();
-    tile_cache.erase( cache_index );
-
+    tile_cache.erase( tile_index );
     delete tile;
 }
 
@@ -144,8 +143,8 @@ void TileCache::clear_current_view()
 
 // Clear a cache entry, note that the cache only holds pointers
 // and this does not free the object which is pointed to.
-void TileCache::clear_entry( long cache_index ) {
-    tile_cache.erase( cache_index );
+void TileCache::clear_entry( long tile_index ) {
+    tile_cache.erase( tile_index );
 }
 
 
@@ -182,6 +181,26 @@ bool TileCache::insert_tile( TileEntry *e ) {
     return true;
 }
 
+/**
+ * Reloads a tile when it's already in memory.
+ */
+void TileCache::refresh_tile(long tile_index)
+{
+    const_tile_map_iterator it = tile_cache.find( tile_index );
+    if ( it == tile_cache.end() )
+        return;
+
+    SG_LOG( SG_TERRAIN, SG_DEBUG, "REFRESHING CACHE ENTRY = " << tile_index );
+
+    TileEntry* e = NULL;
+    if (!it->second->is_expired(current_time))
+        e = new TileEntry(it->second);
+
+    entry_free(tile_index);
+    if (e)
+        tile_cache[tile_index] = e;
+}
+
 // update tile's priority and expiry time according to current request
 void TileCache::request_tile(TileEntry* t,float priority,bool current_view,double request_time)
 {

diff --git a/simgear/scene/tgdb/TileCache.hxx b/simgear/scene/tgdb/TileCache.hxx
index 5fedab9c1c5ac8d4bf2807fdc791802ca3fe7e6a..5b6619644ad96fd5adcd1e2fb4e053a12cd25463 100644 (file)
--- a/simgear/scene/tgdb/TileCache.hxx
+++ b/simgear/scene/tgdb/TileCache.hxx
@@ -83,6 +83,9 @@ public:
     // and this does not free the object which is pointed to.
     void clear_entry( long cache_entry );
 
+    // Refresh/reload a tile when it's already in memory.
+    void refresh_tile(long tile_index);
+
     // Clear all completely loaded tiles (ignores partially loaded tiles)
     void clear_cache();
 

diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx
index 0e417865c2a474c544e335f3525003d928b30a2c..0b16242b4341e6c383531664c41dceb01d882ac7 100644 (file)
--- a/simgear/scene/tgdb/TileEntry.cxx
+++ b/simgear/scene/tgdb/TileEntry.cxx
@@ -82,6 +82,20 @@ TileEntry::TileEntry ( const SGBucket& b )
     _node->setRange(0, 0.0, 10000.0);
 }
 
+TileEntry::TileEntry( const TileEntry& t )
+: tile_bucket( t.tile_bucket ),
+  tileFileName(t.tileFileName),
+  _node( new osg::LOD ),
+  _priority(t._priority),
+  _current_view(t._current_view),
+  _time_expired(t._time_expired)
+{
+    _node->setName(tileFileName);
+    // Give a default LOD range so that traversals that traverse
+    // active children (like the groundcache lookup) will work before
+    // tile manager has had a chance to update this node.
+    _node->setRange(0, 0.0, 10000.0);
+}
 
 // Destructor
 TileEntry::~TileEntry ()

diff --git a/simgear/scene/tgdb/TileEntry.hxx b/simgear/scene/tgdb/TileEntry.hxx
index ffe789478f79514726fe971000c608b2303d3edc..3edbfd1fa810e7ff8b5b43f473e2075e6c647c68 100644 (file)
--- a/simgear/scene/tgdb/TileEntry.hxx
+++ b/simgear/scene/tgdb/TileEntry.hxx
@@ -91,6 +91,7 @@ public:
 
     // Constructor
     TileEntry( const SGBucket& b );
+    TileEntry( const TileEntry& t );
 
     // Destructor
     ~TileEntry();

diff --git a/simgear/threads/SGQueue.hxx b/simgear/threads/SGQueue.hxx
index e7311e56d9f33c7130ecc32e1ae5609f9be33c3e..bcdda1d35fad5f52650671908c392ea62144f119 100644 (file)
--- a/simgear/threads/SGQueue.hxx
+++ b/simgear/threads/SGQueue.hxx
@@ -283,6 +283,14 @@ public:
      */
     ~SGBlockingDeque() {}
 
+    /**
+     * 
+     */
+    virtual void clear() {
+    OpenThreads::ScopedLock<OpenThreads::Mutex> g(mutex);
+    this->queue.clear();
+    }
+    
     /**
      * 
      */