fly/flightgear
1
0
Fork 0
Code Activity

Respect tile expiry time when cache is disabled.

Browse source 
Tiles added via the visible mechanism always have an
expiry time of 0.0, so this only affects tiles added by elevation queries, from the AI or FDM.
This commit is contained in:
James Turner 2014-05-24 14:23:59 +01:00
parent 2e76a2c72a
commit fd248e9391
3 changed files with 5 additions and 5 deletions

4
src/Scenery/tilecache.cxx
View file

@ -127,14 +127,14 @@ long TileCache::get_drop_tile() {
return min_index;
}
long TileCache::get_first_invisible_tile() const
long TileCache::get_first_expired_tile() const
{
const_tile_map_iterator current = tile_cache.begin();
const_tile_map_iterator end = tile_cache.end();
for ( ; current != end; ++current ) {
TileEntry *e = current->second;
if (!e->is_current_view())
if (!e->is_current_view() && e->is_expired(current_time))
{
return current->first;
}

2
src/Scenery/tilecache.hxx
View file

@ -74,7 +74,7 @@ public:
// nothing available to be removed.
long get_drop_tile();
long get_first_invisible_tile() const;
long get_first_expired_tile() const;
// Clear all flags indicating tiles belonging to the current view
void clear_current_view();

4
src/Scenery/tilemgr.cxx
View file

@ -370,7 +370,7 @@ void FGTileMgr::update_queues(bool& isDownloadingScenery)
if (dropTiles)
{
long drop_index = _enableCache ? tile_cache.get_drop_tile() :
tile_cache.get_first_invisible_tile();
tile_cache.get_first_expired_tile();
while ( drop_index > -1 )
{
// schedule tile for deletion with osg pager
@ -387,7 +387,7 @@ void FGTileMgr::update_queues(bool& isDownloadingScenery)
_pager->queueDeleteRequest(subgraph);
if (!_enableCache)
drop_index = tile_cache.get_first_invisible_tile();
drop_index = tile_cache.get_first_expired_tile();
// limit tiles dropped to drop_count
else if (--drop_count > 0)
drop_index = tile_cache.get_drop_tile();