Check for the plib version when using display lists, just to be sure.

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

diff --git a/src/Scenery/newcache.cxx b/src/Scenery/newcache.cxx
index 9e1040d3d0506961a964fcf06fa3e07c4aabccc9..033e11e8c911cdaef01062be649f975ad8de4b1f 100644 (file)
--- a/src/Scenery/newcache.cxx
+++ b/src/Scenery/newcache.cxx
@@ -25,13 +25,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#include <GL/glut.h>
-#include <GL/gl.h>
-
 #include <plib/ssg.h>          // plib include
 
 #include <simgear/bucket/newbucket.hxx>
@@ -105,6 +98,7 @@ bool FGNewCache::exists( const SGBucket& b ) const {
 }
 
 
+#if 0
 // Ensure at least one entry is free in the cache
 bool FGNewCache::make_space() {
     SG_LOG( SG_TERRAIN, SG_DEBUG, "Make space in cache" );
@@ -131,7 +125,8 @@ bool FGNewCache::make_space() {
        for ( ; current != end; ++current ) {
            long index = current->first;
            FGTileEntry *e = current->second;
-           if ( e->is_loaded() && (e->get_pending_models() == 0) ) {
+           // if ( e->is_loaded() && (e->get_pending_models() == 0) ) {
+           if ( e->is_loaded() ) {
 
                 timestamp = e->get_timestamp();
                 if ( timestamp < min_time ) {
@@ -143,7 +138,7 @@ bool FGNewCache::make_space() {
                 }
 
            } else {
-                SG_LOG( SG_TERRAIN, SG_INFO, "loaded = " << e->is_loaded()
+                SG_LOG( SG_TERRAIN, SG_DEBUG, "loaded = " << e->is_loaded()
                         << " pending models = " << e->get_pending_models()
                         << " time stamp = " << e->get_timestamp() );
             }
@@ -152,9 +147,9 @@ bool FGNewCache::make_space() {
        // If we made it this far, then there were no open cache entries.
        // We will instead free the oldest cache entry and return true
         
-        SG_LOG( SG_TERRAIN, SG_INFO, "    min_time = " << min_time );
-        SG_LOG( SG_TERRAIN, SG_INFO, "    index = " << max_index );
-        SG_LOG( SG_TERRAIN, SG_INFO, "    max_time = " << max_time );
+        SG_LOG( SG_TERRAIN, SG_DEBUG, "    min_time = " << min_time );
+        SG_LOG( SG_TERRAIN, SG_DEBUG, "    index = " << max_index );
+        SG_LOG( SG_TERRAIN, SG_DEBUG, "    max_time = " << max_time );
        if ( max_index >= 0 ) {
            entry_free( max_index );
            return true;
@@ -169,13 +164,14 @@ bool FGNewCache::make_space() {
             "FGNewCache::make_space()." );
     return false;
 }
+#endif
 
 
 // Return the index of the oldest tile in the cache, return -1 if
 // nothing available to be removed.
 long FGNewCache::get_oldest_tile() {
     // we need to free the furthest entry
-    long max_index = -1;
+    long min_index = -1;
     double timestamp = 0.0;
     double min_time = 2419200000.0f; // one month should be enough
     double max_time = 0;
@@ -190,7 +186,7 @@ long FGNewCache::get_oldest_tile() {
             
             timestamp = e->get_timestamp();
             if ( timestamp < min_time ) {
-                max_index = index;
+                min_index = index;
                 min_time = timestamp;
             }
             if ( timestamp > max_time ) {
@@ -204,14 +200,28 @@ long FGNewCache::get_oldest_tile() {
         }
     }
 
-    SG_LOG( SG_TERRAIN, SG_INFO, "    min_time = " << min_time );
-    SG_LOG( SG_TERRAIN, SG_INFO, "    index = " << max_index );
-    SG_LOG( SG_TERRAIN, SG_INFO, "    max_time = " << max_time );
+    SG_LOG( SG_TERRAIN, SG_DEBUG, "    min_time = " << min_time );
+    SG_LOG( SG_TERRAIN, SG_DEBUG, "    index = " << min_index );
+    SG_LOG( SG_TERRAIN, SG_DEBUG, "    max_time = " << max_time );
 
-    return max_index;
+    return min_index;
 }
 
 
+// Clear the inner ring flag for all tiles in the cache so that the
+// external tile scheduler can flag the inner ring correctly.
+void FGNewCache::clear_inner_ring_flags() {
+    tile_map_iterator current = tile_cache.begin();
+    tile_map_iterator end = tile_cache.end();
+    
+    for ( ; current != end; ++current ) {
+        FGTileEntry *e = current->second;
+        if ( e->is_loaded() && (e->get_pending_models() == 0) ) {
+            e->set_inner_ring( false );
+        }
+    }
+}
+
 // Clear a cache entry, note that the cache only holds pointers
 // and this does not free the object which is pointed to.
 void FGNewCache::clear_entry( long cache_index ) {
@@ -246,20 +256,15 @@ void FGNewCache::clear_cache() {
 bool FGNewCache::insert_tile( FGTileEntry *e ) {
     // set time of insertion for tracking age of tiles...
     e->set_timestamp(globals->get_sim_time_sec());
-    // clear out a distant entry in the cache if needed.
-    if ( make_space() ) {
-        // register it in the cache
-        long tile_index = e->get_tile_bucket().gen_index();
-        tile_cache[tile_index] = e;
 
-        return true;
-    } else {
-        // failed to find cache space
+    // register it in the cache
+    long tile_index = e->get_tile_bucket().gen_index();
+    tile_cache[tile_index] = e;
 
-        return false;
-    }
+    return true;
 }
 
+
 // Note this is the old version of FGNewCache::make_space(), currently disabled
 // It uses distance from a center point to determine tiles to be discarded...
 #if 0