Frederic: Add display list support without changing plib.

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

diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index b5bd427a41cffb7afba2c332b2762a2c2c3f2c8b..7c4a1910563abba22955f0449d230ada5769ad87 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -35,10 +35,8 @@
 
 #include <queue>
 
-#include <plib/ssg.h>
-
 #include <simgear/bucket/newbucket.hxx>
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS) && ENABLE_THREADS
 #  include <simgear/threads/SGQueue.hxx>
 #endif // ENABLE_THREADS
 
@@ -56,6 +54,8 @@ SG_USING_STD( queue );
 
 
 // forward declaration
+class ssgBranch;
+class ssgEntity;
 class FGTileEntry;
 class FGDeferredModel;
 
@@ -108,7 +108,6 @@ private:
      * Queue tiles for loading.
      */
     FGTileLoader loader;
-    int counter_hack;
 
     /**
      * Work queues.
@@ -119,7 +118,7 @@ private:
      * model_queue is the set of models that need to be loaded by the
      * primary render thread.
      */
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS) && ENABLE_THREADS
     static SGLockedQueue<FGTileEntry *> attach_queue;
     static SGLockedQueue<FGDeferredModel *> model_queue;
 #else
@@ -160,6 +159,9 @@ public:
     // internal function, do not call directly.)
     void update_queues();
 
+    // get state of all the scenery loading queues
+    bool all_queues_empty();
+
     // given the current lon/lat (in degrees), fill in the array of
     // local chunks.  If the chunk isn't already in the cache, then
     // read it from disk.