Make use of the ground material types

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

diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index a487264dadf67d7b75e2fd574c65b254caafcf62..a206d1cc39d75cf8e1c584b7a8a6fbdc153053c9 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -36,12 +36,11 @@
 #include <queue>
 
 #include <simgear/bucket/newbucket.hxx>
-#if defined(ENABLE_THREADS) && ENABLE_THREADS
+#if defined(ENABLE_THREADS)
 #  include <simgear/threads/SGQueue.hxx>
 #endif // ENABLE_THREADS
 
 #include "FGTileLoader.hxx"
-#include "hitlist.hxx"
 #include "newcache.hxx"
 
 #if defined(USE_MEM) || defined(WIN32)
@@ -80,9 +79,7 @@ private:
     void sched_tile( const SGBucket& b, const bool is_inner_ring );
 
     // schedule a needed buckets for loading
-    void schedule_needed(double visibility_meters, SGBucket curr_bucket);
-
-    FGHitList hit_list;
+    void schedule_needed(double visibility_meters, const SGBucket& curr_bucket);
 
     SGBucket previous_bucket;
     SGBucket current_bucket;
@@ -118,7 +115,7 @@ private:
      * model_queue is the set of models that need to be loaded by the
      * primary render thread.
      */
-#if defined(ENABLE_THREADS) && ENABLE_THREADS
+#if defined(ENABLE_THREADS)
     static SGLockedQueue<FGTileEntry *> attach_queue;
     static SGLockedQueue<FGDeferredModel *> model_queue;
 #else
@@ -178,8 +175,8 @@ public:
     // tiles...
     void refresh_view_timestamps();
 
-    inline SGBucket get_current_bucket () { return current_bucket; }
-    inline SGBucket get_previous_bucket () { return previous_bucket; }
+    inline const SGBucket& get_current_bucket () const { return current_bucket; }
+    inline const SGBucket& get_previous_bucket () const { return previous_bucket; }
 
     static bool set_tile_filter( bool f );
     static int tile_filter_cb( ssgEntity *, int );