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 62eea0490743b031bfd1d195fdcfcd4555287e09..7c4a1910563abba22955f0449d230ada5769ad87 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -31,18 +31,15 @@
 
 #include <simgear/compiler.h>
 #include <simgear/math/point3d.hxx>
+#include <simgear/scene/model/location.hxx>
 
 #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
 
-#include <Main/location.hxx>
-
 #include "FGTileLoader.hxx"
 #include "hitlist.hxx"
 #include "newcache.hxx"
@@ -57,6 +54,8 @@ SG_USING_STD( queue );
 
 
 // forward declaration
+class ssgBranch;
+class ssgEntity;
 class FGTileEntry;
 class FGDeferredModel;
 
@@ -78,14 +77,11 @@ private:
     void initialize_queue();
 
     // schedule a tile for loading
-    void sched_tile( const SGBucket& b );
+    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);
 
-    // see comment at prep_ssg_nodes()
-    void prep_ssg_node( int idx );
-       
     FGHitList hit_list;
 
     SGBucket previous_bucket;
@@ -101,8 +97,7 @@ private:
     // current longitude latitude
     double longitude;
     double latitude;
-    double last_longitude;
-    double last_latitude;
+    double altitude_m;
 
     /**
      * tile cache
@@ -113,7 +108,6 @@ private:
      * Queue tiles for loading.
      */
     FGTileLoader loader;
-    int counter_hack;
 
     /**
      * Work queues.
@@ -124,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
@@ -133,6 +127,11 @@ private:
 #endif // ENABLE_THREADS
     static queue<FGTileEntry *> delete_queue;
 
+    /**
+     * Tile filter indicator, to implement multipass rendering
+     */
+    static bool tile_filter;
+
 public:
 
     /**
@@ -160,13 +159,18 @@ 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.
-    int update( double lon, double lat, double visibility_meters );
-    int update( double lon, double lat, double visibility_meters, sgdVec3 abs_pos_vector, SGBucket p_current, SGBucket p_previous, Point3D center );
-    void setCurrentTile( double longitude, double latitude );
-    int updateCurrentElevAtPos(sgdVec3 abs_pos_vector, Point3D center );
+    int update( double visibility_meters );
+    int update( SGLocation *location, double visibility_meters,
+                sgdVec3 abs_pos_vector );
+
+    int updateCurrentElevAtPos( sgdVec3 abs_pos_vector, double altitude_m,
+                                Point3D center );
 
     // Determine scenery altitude.  Normally this just happens when we
     // render the scene, but we'd also like to be able to do this
@@ -183,7 +187,7 @@ public:
     // tile, set the ssg transform and update it's range selector
     // based on current visibilty void prep_ssg_nodes( float
     // visibility_meters );
-    void prep_ssg_nodes( FGLocation *location, float visibility_meters );
+    void prep_ssg_nodes( SGLocation *location, float visibility_meters );
 
     // Set flag with event manager so that non-moving view refreshes
     // tiles...
@@ -191,11 +195,10 @@ public:
 
     inline SGBucket get_current_bucket () { return current_bucket; }
     inline SGBucket get_previous_bucket () { return previous_bucket; }
-};
 
-
-// the tile manager
-extern FGTileMgr global_tile_mgr;
+    static bool set_tile_filter( bool f );
+    static int tile_filter_cb( ssgEntity *, int );
+};
 
 
 #endif // _TILEMGR_HXX