# include <config.h>
#endif
+#include <simgear/compiler.h>
+
#include <Main/globals.hxx>
#include "FGTileLoader.hxx"
#include "tileentry.hxx"
#endif // ENABLE_THREADS
}
+
+#if 0 // we don't ever want to do this I don't think
+/**
+ *
+ */
+void FGTileLoader::reinit() {
+ while ( !tile_load_queue.empty() ) {
+ tile_load_queue.pop();
+ }
+}
+#endif
+
+
/**
*
*/
static bool beenhere = false;
if (!beenhere)
{
- if ( globals->get_fg_scenery() != (string)"" ) {
- tile_path.set( globals->get_fg_scenery() );
+ if ( !globals->get_fg_scenery().empty() ) {
+ tile_path = globals->get_fg_scenery();
} else {
- tile_path.set( globals->get_fg_root() );
- tile_path.append( "Scenery" );
+ SGPath tmp;
+ tmp.set( globals->get_fg_root() );
+ tmp.append( "Scenery" );
+ tile_path = tmp.str();
}
beenhere = true;
}
void
FGTileLoader::update()
{
+
#ifdef ENABLE_THREADS
// send a signal to the pager thread that it is allowed to load
// another tile
mutex.unlock();
#else
if ( !tile_load_queue.empty() ) {
- cout << "loading next tile ..." << endl;
+ // cout << "loading next tile ..." << endl;
// load the next tile in the queue
FGTileEntry* tile = tile_load_queue.front();
tile_load_queue.pop();
+
tile->load( tile_path, true );
- FGTileMgr::loaded( tile );
+
+ FGTileMgr::ready_to_attach( tile );
}
+#ifdef WISH_PLIB_WAS_THREADED // but it isn't
if ( !tile_free_queue.empty() ) {
- cout << "freeing next tile ..." << endl;
+ // cout << "freeing next tile ..." << endl;
// free the next tile in the queue
FGTileEntry* tile = tile_free_queue.front();
tile_free_queue.pop();
tile->free_tile();
delete tile;
}
+#endif
#endif // ENABLE_THREADS
+
}
#ifdef WISH_PLIB_WAS_THREADED // but it isn't
// Handle and pending removals
while ( !loader->tile_free_queue.empty() ) {
- cout << "freeing next tile ..." << endl;
+ // cout << "freeing next tile ..." << endl;
// free the next tile in the queue
FGTileEntry* tile = loader->tile_free_queue.pop();
tile->free_tile();