//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
#endif
#include <simgear/compiler.h>
+#include <simgear/structure/exception.hxx>
#include <Main/globals.hxx>
#include "FGTileLoader.hxx"
extern ssgBranch *terrain;
extern ssgBranch *ground;
+
/**
*
*/
FGTileLoader::FGTileLoader()
{
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS)
// Create and start the loader threads.
for (int i = 0; i < MAX_THREADS; ++i)
{
threads[i] = new LoaderThread(this);
- threads[i]->start();
+ threads[i]->start( 1 );
}
#endif // ENABLE_THREADS
}
*/
FGTileLoader::~FGTileLoader()
{
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS)
// Wake up its time to die.
// queue_cond.broadcast();
{
/**
* Initialise tile_path here and not in ctor to avoid problems
- * with the initialastion order of global objects.
+ * with the initialisation order of global objects.
*/
static bool beenhere = false;
- if (!beenhere)
- {
- SGPath tmp;
- if ( !globals->get_fg_scenery().empty() ) {
- tmp.set( globals->get_fg_scenery() );
- } else {
- tmp.set( globals->get_fg_root() );
- tmp.append( "Scenery" );
- }
- tile_path = tmp.str();
- beenhere = true;
+ if (!beenhere) {
+ tile_path = globals->get_fg_scenery();
+ if (!tile_path.size())
+ throw sg_throwable(string("No valid scenery path defined!"));
+
+ beenhere = true;
}
tile_load_queue.push( tile );
FGTileLoader::update()
{
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS)
// send a signal to the pager thread that it is allowed to load
// another tile
mutex.lock();
}
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS)
+/**
+ * Ensure mutex is unlocked.
+ */
+void
+cleanup_handler( void* arg )
+{
+ FGTileLoader* loader = (FGTileLoader*) arg;
+ loader->mutex.unlock();
+}
+
/**
*
*/
}
pthread_cleanup_pop(1);
}
-
-/**
- * Ensure mutex is unlocked.
- */
-void
-cleanup_handler( void* arg )
-{
- FGTileLoader* loader = (FGTileLoader*) arg;
- loader->mutex.unlock();
-}
#endif // ENABLE_THREADS