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 f0d3969cbace649ddb3c3ef36f544d003ee9f9d0..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
@@ -128,6 +127,11 @@ private:
 #endif // ENABLE_THREADS
     static queue<FGTileEntry *> delete_queue;
 
+    /**
+     * Tile filter indicator, to implement multipass rendering
+     */
+    static bool tile_filter;
+
 public:
 
     /**
@@ -155,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.
@@ -188,6 +195,9 @@ public:
 
     inline SGBucket get_current_bucket () { return current_bucket; }
     inline SGBucket get_previous_bucket () { return previous_bucket; }
+
+    static bool set_tile_filter( bool f );
+    static int tile_filter_cb( ssgEntity *, int );
 };