A long, long time ago, a bug was inadvertently introduced into the threaded

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

diff --git a/src/Scenery/newcache.hxx b/src/Scenery/newcache.hxx
index 8060a1becea9dfe8b2978cd779d4bd55c0aa3b21..7f2b8ccebc49deccd086f7876cc47d0249efb968 100644 (file)
--- a/src/Scenery/newcache.hxx
+++ b/src/Scenery/newcache.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started December 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson  - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -34,12 +34,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#include <GL/glut.h>
-
 #include <map>
 
 #include <simgear/bucket/newbucket.hxx>
@@ -82,13 +76,19 @@ public:
     // Check if the specified "bucket" exists in the cache
     bool exists( const SGBucket& b ) const;
 
+#if 0
     // Ensure at least one entry is free in the cache
     bool make_space();
+#endif
 
     // Return the index of the oldest tile in the cache, return -1 if
     // nothing available to be removed.
     long get_oldest_tile();
 
+    // Clear the inner ring flag for all tiles in the cache so that
+    // the external tile scheduler can flag the inner ring correctly.
+    void clear_inner_ring_flags();
+
     // Clear a cache entry, note that the cache only holds pointers
     // and this does not free the object which is pointed to.
     void clear_entry( long cache_entry );
@@ -96,12 +96,9 @@ public:
     // 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 );
-
     // Return a pointer to the specified tile cache entry 
-    inline FGTileEntry *get_tile( const long tile_index ) {
-       tile_map_iterator it = tile_cache.find( tile_index );
+    inline FGTileEntry *get_tile( const long tile_index ) const {
+       const_tile_map_iterator it = tile_cache.find( tile_index );
        if ( it != tile_cache.end() ) {
            it->second->set_timestamp(globals->get_sim_time_sec());
            return it->second;
@@ -111,7 +108,7 @@ public:
     }
 
     // Return a pointer to the specified tile cache entry 
-    inline FGTileEntry *get_tile( const SGBucket& b ) {
+    inline FGTileEntry *get_tile( const SGBucket& b ) const {
        return get_tile( b.gen_index() );
     }
 
@@ -121,7 +118,7 @@ public:
     // External linear traversal of cache
     inline void reset_traversal() { current = tile_cache.begin(); }
     inline bool at_end() { return current == tile_cache.end(); }
-    inline FGTileEntry *get_current() {
+    inline FGTileEntry *get_current() const {
        // cout << "index = " << current->first << endl;
        return current->second;
     }