fly/flightgear
1
0
Fork 0
Code Activity

Use observer_ptr in OrthophotoManager

Browse source
This commit is contained in:
Nathaniel Warner 2020-11-29 15:01:23 -08:00
parent f03358d4f8
commit 512f1ba3d9
3 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Scenery/tileentry.cxx
View file

@ -83,12 +83,6 @@ void TileEntry::_create_orthophoto() {
} }
} }
void TileEntry::_free_orthophoto() {
if (_orthophoto && tile_bucket.isValid()) {
simgear::OrthophotoManager::instance()->unregisterOrthophoto(tile_bucket.gen_index());
}
}
// Destructor // Destructor
TileEntry::~TileEntry () TileEntry::~TileEntry ()
{ {
@ -135,7 +129,5 @@ TileEntry::removeFromSceneGraph()
parent->removeChild( _node.get() ); parent->removeChild( _node.get() );
} }
} }
_free_orthophoto();
} }

1
src/Scenery/tileentry.hxx
View file

@ -79,7 +79,6 @@ private:
double _time_expired; double _time_expired;
void _create_orthophoto(); void _create_orthophoto();
void _free_orthophoto();
public: public:

2
src/Scenery/tilemgr.cxx
View file

@ -180,8 +180,6 @@ void FGTileMgr::reinit()
SG_LOG( SG_TERRAIN, SG_INFO, "Initializing Tile Manager subsystem." ); SG_LOG( SG_TERRAIN, SG_INFO, "Initializing Tile Manager subsystem." );
auto terraSync = globals->get_subsystem<simgear::SGTerraSync>(); auto terraSync = globals->get_subsystem<simgear::SGTerraSync>();
simgear::OrthophotoManager::instance()->unregisterAll();
// drops the previous options reference // drops the previous options reference
_options = new simgear::SGReaderWriterOptions; _options = new simgear::SGReaderWriterOptions;
_listener.reset(new TileManagerListener(this)); _listener.reset(new TileManagerListener(this));