- adjusted for no-value constructor for FGPanel

[flightgear.git] / src / Scenery / tilemgr.cxx

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index b47e6246d60cd8ef61d61177ceb36ae7f26fdf64..9ecffda84af2999dedea1a88deea1228c3f9db97 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -70,9 +70,14 @@ static inline Point3D operator + (const Point3D& a, const sgdVec3 b)
 }
 
 #ifdef ENABLE_THREADS
-SGLockedQueue<FGTileEntry*> FGTileMgr::loaded_queue;
+SGLockedQueue<FGTileEntry *> FGTileMgr::attach_queue;
+SGLockedQueue<FGDeferredModel *> FGTileMgr::model_queue;
+#else
+queue<FGTileEntry *> FGTileMgr::attach_queue;
+queue<FGDeferredModel *> FGTileMgr::model_queue;
 #endif // ENABLE_THREADS
 
+
 // Constructor
 FGTileMgr::FGTileMgr():
     state( Start ),
@@ -91,15 +96,30 @@ FGTileMgr::~FGTileMgr() {
 int FGTileMgr::init() {
     SG_LOG( SG_TERRAIN, SG_INFO, "Initializing Tile Manager subsystem." );
 
-    if ( state != Start ) {
-       SG_LOG( SG_TERRAIN, SG_INFO,
-               "... Reinitializing." );
-       destroy_queue();
-    } else {
-       SG_LOG( SG_TERRAIN, SG_INFO,
-               "... First time through." );
-       tile_cache.init();
+    tile_cache.init();
+
+#if 0
+
+    // instead it's just a lot easier to let any pending work flush
+    // through, rather than trying to arrest the queue and nuke all
+    // the various work at all the various stages and get everything
+    // cleaned up properly.
+
+    while ( ! attach_queue.empty() ) {
+        attach_queue.pop();
+    }
+
+    while ( ! model_queue.empty() ) {
+#ifdef ENABLE_THREADS
+       FGDeferredModel* dm = model_queue.pop();
+#else
+        FGDeferredModel* dm = model_queue.front();
+        model_queue.pop();
+#endif
+        delete dm;
     }
+    loader.reinit();
+#endif
 
     hit_list.clear();
 
@@ -133,25 +153,6 @@ void FGTileMgr::sched_tile( const SGBucket& b ) {
 }
 
 
-// depricated for threading
-#if 0
-// load a tile
-void FGTileMgr::load_tile( const SGBucket& b ) {
-    // see if tile already exists in the cache
-    FGTileEntry *t = tile_cache.get_tile( b );
-
-    if ( t == NULL ) {
-       SG_LOG( SG_TERRAIN, SG_DEBUG, "Loading tile " << b );
-       tile_cache.fill_in( b );
-       t = tile_cache.get_tile( b );
-       t->prep_ssg_node( scenery.center, vis);
-    } else {
-       SG_LOG( SG_TERRAIN, SG_DEBUG, "Tile already in cache " << b );
-    }
-}
-#endif
-
-
 static void CurrentNormalInLocalPlane(sgVec3 dst, sgVec3 src) {
     sgVec3 tmp;
     sgSetVec3(tmp, src[0], src[1], src[2] );
@@ -202,8 +203,8 @@ bool FGTileMgr::current_elev_ssg( sgdVec3 abs_view_pos, double *terrain_elev ) {
        sgSetVec3(tmp, hit_list.get_normal(this_hit));
        // cout << "cur_normal: " << tmp[0] << " " << tmp[1] << " "
        //      << tmp[2] << endl;
-       ssgState *IntersectedLeafState =
-           ((ssgLeaf*)hit_list.get_entity(this_hit))->getState();
+       /* ssgState *IntersectedLeafState =
+           ((ssgLeaf*)hit_list.get_entity(this_hit))->getState(); */
        CurrentNormalInLocalPlane(tmp, tmp);
        sgdSetVec3( scenery.cur_normal, tmp );
        // cout << "NED: " << tmp[0] << " " << tmp[1] << " " << tmp[2] << endl;
@@ -312,15 +313,6 @@ void FGTileMgr::initialize_queue()
 }
 
 
-// forced emptying of the queue
-// This is necessay to keep bookeeping straight for the
-// tile_cache   -- which actually handles all the
-// (de)allocations  
-void FGTileMgr::destroy_queue() {
-    // load_queue.clear();
-}
-
-
 // given the current lon/lat (in degrees), fill in the array of local
 // chunks.  If the chunk isn't already in the cache, then read it from
 // disk.
@@ -358,17 +350,33 @@ int FGTileMgr::update( double lon, double lat ) {
        state = Running;
     }
 
-    // now handled by threaded tile pager
-#if 0
-    if ( load_queue.size() ) {
-       SG_LOG( SG_TERRAIN, SG_INFO, "Load queue size = " << load_queue.size()
-               << " loading a tile" );
+    // load the next tile in the load queue (or authorize the next
+    // load in the case of the threaded tile pager)
+    loader.update();
 
-       SGBucket pending = load_queue.front();
-       load_queue.pop_front();
-       load_tile( pending );
-    }
+    // load the next model in the load queue.  Currently this must
+    // happen in the render thread because model loading can trigger
+    // texture loading which involves use of the opengl api.
+    if ( !model_queue.empty() ) {
+        cout << "loading next model ..." << endl;
+        // load the next tile in the queue
+#ifdef ENABLE_THREADS
+       FGDeferredModel* dm = model_queue.pop();
+#else
+        FGDeferredModel* dm = model_queue.front();
+        model_queue.pop();
 #endif
+       
+       ssgTexturePath( (char *)(dm->get_texture_path().c_str()) );
+       ssgEntity *obj_model
+           = ssgLoad( (char *)(dm->get_model_path().c_str()) );
+        if ( obj_model != NULL ) {
+            dm->get_obj_trans()->addKid( obj_model );
+        }
+        dm->get_tile()->dec_pending_models();
+
+       delete dm;
+    }
 
     if ( scenery.center == Point3D(0.0) ) {
        // initializing
@@ -418,15 +426,16 @@ int FGTileMgr::update( double lon, double lat ) {
         // Notify the tile loader that it can load another tile
         // loader.update();
 
+       if ( !attach_queue.empty() ) {
 #ifdef ENABLE_THREADS
-       if (!loaded_queue.empty())
-       {
-           FGTileEntry* e = loaded_queue.pop();
+           FGTileEntry* e = attach_queue.pop();
+#else
+           FGTileEntry* e = attach_queue.front();
+            attach_queue.pop();
+#endif
            e->add_ssg_nodes( terrain, ground );
-           //std::cout << "Adding ssg nodes for "
-           //<< e->get_tile_bucket() << "\n";
+           // cout << "Adding ssg nodes for "
        }
-#endif // ENABLE_THREADS
     }
 
     return 1;