# 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>
}
+#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" );
}
} 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() );
}
// 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;
"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;
timestamp = e->get_timestamp();
if ( timestamp < min_time ) {
- max_index = index;
+ min_index = index;
min_time = timestamp;
}
if ( timestamp > max_time ) {
}
}
- 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;
}
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