Updates to the scenery loading infrastructure to make it more flexible,

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

diff --git a/src/Scenery/newcache.hxx b/src/Scenery/newcache.hxx
index 4eb92388e8c5afc99731a0885c3595b721969791..0afbb9b39ea79d8c907e53c0d24694f3ceb7a3d7 100644 (file)
--- a/src/Scenery/newcache.hxx
+++ b/src/Scenery/newcache.hxx
@@ -46,7 +46,6 @@
 #include <simgear/math/point3d.hxx>
 
 #include "tileentry.hxx"
-#include "FGTileLoader.hxx"
 
 SG_USING_STD(map);
 
@@ -69,11 +68,6 @@ class FGNewCache {
     // Free a tile cache entry
     void entry_free( long cache_index );
 
-    /**
-     * Queue tiles for loading.
-     */
-    FGTileLoader loader;
-
 public:
 
     // Constructor
@@ -89,7 +83,10 @@ public:
     bool exists( const SGBucket& b ) const;
 
     // Ensure at least one entry is free in the cache
-    void make_space();
+    bool make_space();
+
+    // Clear all completely loaded tiles (ignores partially loaded tiles)
+    void clear_cache();
 
     // Fill in a tile cache entry with real data for the specified bucket 
     // void fill_in( const SGBucket& b );
@@ -127,8 +124,9 @@ public:
     /**
      * Create a new tile and enqueue it for loading.
      * @param b 
+     * @return success/failure
      */
-    void load_tile( const SGBucket& b );
+    bool insert_tile( FGTileEntry* e );
 };