Added static port system and a new altimeter model connected to it.

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

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index 53d2d6d4eb59e1a210e66305530fc786e1f5baec..7cc4224b0ba3137feb33901a05ca2b203da9f431 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -39,10 +39,12 @@
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/vector.hxx>
+#include <simgear/misc/exception.hxx>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewer.hxx>
+#include <Model/loader.hxx>
 #include <Objects/obj.hxx>
 
 #include "newcache.hxx"
@@ -62,6 +64,7 @@ SGLockedQueue<FGDeferredModel *> FGTileMgr::model_queue;
 queue<FGTileEntry *> FGTileMgr::attach_queue;
 queue<FGDeferredModel *> FGTileMgr::model_queue;
 #endif // ENABLE_THREADS
+queue<FGTileEntry *> FGTileMgr::delete_queue;
 
 
 // Constructor
@@ -128,6 +131,20 @@ void FGTileMgr::sched_tile( const SGBucket& b ) {
     FGTileEntry *t = tile_cache.get_tile( b );
 
     if ( t == NULL ) {
+        // make space in the cache
+        while ( (int)tile_cache.get_size() > tile_cache.get_max_cache_size() ) {
+            long index = tile_cache.get_oldest_tile();
+            if ( index >= 0 ) {
+                FGTileEntry *old = tile_cache.get_tile( index );
+                old->disconnect_ssg_nodes();
+                delete_queue.push( old );
+                tile_cache.clear_entry( index );
+            } else {
+                // nothing to free ?!? forge ahead
+                break;
+            }
+        }
+
         // create a new entry
         FGTileEntry *e = new FGTileEntry( b );
 
@@ -157,10 +174,10 @@ void FGTileMgr::schedule_needed( double vis, SGBucket curr_bucket) {
         exit(-1);        
     }
 
-   SG_LOG( SG_TERRAIN, SG_INFO,
-           "scheduling needed tiles for " << longitude << " " << latitude );
+    SG_LOG( SG_TERRAIN, SG_INFO,
+            "scheduling needed tiles for " << longitude << " " << latitude );
 
-//   vis = fgGetDouble("/environment/visibility-m");
+    // vis = fgGetDouble("/environment/visibility-m");
 
     double tile_width = curr_bucket.get_width_m();
     double tile_height = curr_bucket.get_height_m();
@@ -169,13 +186,18 @@ void FGTileMgr::schedule_needed( double vis, SGBucket curr_bucket) {
 
     xrange = (int)(vis / tile_width) + 1;
     yrange = (int)(vis / tile_height) + 1;
-    if ( xrange < 1 ) { xrange = 1; }
+    if ( xrange < 1 ) { xrange /= 1; }
     if ( yrange < 1 ) { yrange = 1; }
-    // cout << "xrange = " << xrange << "  yrange = " << yrange << endl;
 
     // note * 2 at end doubles cache size (for fdm and viewer)
     tile_cache.set_max_cache_size( (2*xrange + 2) * (2*yrange + 2) * 2 );
 
+    /*
+    cout << "xrange = " << xrange << "  yrange = " << yrange << endl;
+    cout << "max cache size = " << tile_cache.get_max_cache_size()
+         << " current cache size = " << tile_cache.get_size() << endl;
+    */
+
     SGBucket b;
 
     // schedule center tile first so it can be loaded first
@@ -256,6 +278,7 @@ int FGTileMgr::update( double lon, double lat, double visibility_meters ) {
                        globals->get_scenery()->get_center() );
 }
 
+
 int FGTileMgr::update( double lon, double lat, double visibility_meters,
                        sgdVec3 abs_pos_vector, SGBucket p_current,
                        SGBucket p_previous, Point3D center ) {
@@ -308,13 +331,20 @@ int FGTileMgr::update( double lon, double lat, double visibility_meters,
 #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();
+       try
+       {
+           ssgEntity *obj_model =
+               globals->get_model_loader()->load_model(dm->get_model_path());
+           if ( obj_model != NULL ) {
+               dm->get_obj_trans()->addKid( obj_model );
+           }
+       }
+       catch (const sg_exception& exc)
+       {
+           SG_LOG( SG_ALL, SG_ALERT, exc.getMessage() );
+       }
 
+       dm->get_tile()->dec_pending_models();
        delete dm;
     }
     
@@ -345,6 +375,31 @@ int FGTileMgr::update( double lon, double lat, double visibility_meters,
        // cout << "Adding ssg nodes for "
     }
 
+    if ( !delete_queue.empty() ) {
+        // cout << "delete queue = " << delete_queue.size() << endl;
+
+        while ( delete_queue.size() > 30 ) {
+            // uh oh, delete queue is blowing up, we aren't clearing
+            // it fast enough.  Let's just panic, well not panic, but
+            // get real serious and agressively free up some tiles so
+            // we don't explode our memory usage.
+
+            SG_LOG( SG_TERRAIN, SG_ALERT,
+                    "Alert: catching up on tile delete queue" );
+
+            FGTileEntry* e = delete_queue.front();
+            while ( !e->free_tile() );
+            delete_queue.pop();
+            delete e;
+        }
+
+        FGTileEntry* e = delete_queue.front();
+        if ( e->free_tile() ) {
+            delete_queue.pop();
+            delete e;
+        }
+    }
+
     // no reason to update this if we haven't moved...
     if ( longitude != last_longitude || latitude != last_latitude ) {
       // update current elevation... 
@@ -363,11 +418,13 @@ int FGTileMgr::update( double lon, double lat, double visibility_meters,
 
 // timer event driven call to scheduler for the purpose of refreshing the tile timestamps
 void FGTileMgr::refresh_view_timestamps() {
-  SG_LOG( SG_TERRAIN, SG_INFO,
-      "Refreshing timestamps for " << current_bucket.get_center_lon() << " " << current_bucket.get_center_lat() );
-  schedule_needed(fgGetDouble("/environment/visibility-m"), current_bucket);
+    SG_LOG( SG_TERRAIN, SG_INFO,
+        "Refreshing timestamps for " << current_bucket.get_center_lon()
+        << " " << current_bucket.get_center_lat() );
+    schedule_needed(fgGetDouble("/environment/visibility-m"), current_bucket);
 }
 
+
 // check and set current tile and scenery center...
 void FGTileMgr::setCurrentTile(double longitude, double latitude) {
 
@@ -382,6 +439,7 @@ void FGTileMgr::setCurrentTile(double longitude, double latitude) {
     }
 }
 
+
 int FGTileMgr::updateCurrentElevAtPos(sgdVec3 abs_pos_vector, Point3D center) {
 
   sgdVec3 sc;
@@ -422,6 +480,7 @@ int FGTileMgr::updateCurrentElevAtPos(sgdVec3 abs_pos_vector, Point3D center) {
     return hit;
 }
 
+
 void FGTileMgr::prep_ssg_nodes(float vis) {
 
     // traverse the potentially viewable tile list and update range
@@ -438,6 +497,7 @@ void FGTileMgr::prep_ssg_nodes(float vis) {
 
 }
 
+
 void FGTileMgr::prep_ssg_nodes(float vis, sgVec3 up, Point3D center) {
 
     // traverse the potentially viewable tile list and update range