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 0dfc968ed29eddc83ec3c79f687707917cc4c449..7c4a1910563abba22955f0449d230ada5769ad87 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -30,13 +30,13 @@
 #endif                                   
 
 #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
 
@@ -50,8 +50,12 @@
 #  define FG_MEM_COPY(to,from,n)        bcopy(from, to, n)
 #endif
 
+SG_USING_STD( queue );
+
 
 // forward declaration
+class ssgBranch;
+class ssgEntity;
 class FGTileEntry;
 class FGDeferredModel;
 
@@ -72,24 +76,12 @@ private:
     // initialize the cache
     void initialize_queue();
 
-    // forced emptying of the queue.  This is necessay to keep
-    // bookeeping straight for the tile_cache -- which actually
-    // handles all the (de)allocations
-    void destroy_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();
-
-    // see comment at prep_ssg_nodes()
-    void prep_ssg_node( int idx );
-       
-    // int hitcount;
-    // sgdVec3 hit_pts [ MAX_HITS ] ;
+    void schedule_needed(double visibility_meters, SGBucket curr_bucket);
 
-    // ssgEntity *last_hit;
     FGHitList hit_list;
 
     SGBucket previous_bucket;
@@ -105,8 +97,7 @@ private:
     // current longitude latitude
     double longitude;
     double latitude;
-    double last_longitude;
-    double last_latitude;
+    double altitude_m;
 
     /**
      * tile cache
@@ -117,7 +108,6 @@ private:
      * Queue tiles for loading.
      */
     FGTileLoader loader;
-    int counter_hack;
 
     /**
      * Work queues.
@@ -128,13 +118,19 @@ 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
     static queue<FGTileEntry *> attach_queue;
     static queue<FGDeferredModel *> model_queue;
 #endif // ENABLE_THREADS
+    static queue<FGTileEntry *> delete_queue;
+
+    /**
+     * Tile filter indicator, to implement multipass rendering
+     */
+    static bool tile_filter;
 
 public:
 
@@ -143,11 +139,6 @@ public:
      */
     static void ready_to_attach( FGTileEntry *t ) { attach_queue.push( t ); }
 
-    /**
-     * Tile is detatched from scene graph and is ready to delete
-     */
-    inline void ready_to_delete( FGTileEntry *t ) { loader.remove( t ); }
-
     /**
      * Add a pending model to the 'deferred model load' queue
      */
@@ -164,10 +155,22 @@ public:
     // Initialize the Tile Manager subsystem
     int init();
 
+    // Update the various queues maintained by the tilemagr (private
+    // 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 );
+    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
@@ -180,17 +183,22 @@ public:
                     const sgdVec3 p, const sgdVec3 dir,
                     FGHitList *list );
 
-    bool current_elev_ssg( sgdVec3 abs_view_pos, double *terrain_elev );
-       
-    // Prepare the ssg nodes ... for each tile, set it's proper
-    // transform and update it's range selector based on current
-    // visibilty
-    void prep_ssg_nodes();
-};
+    // Prepare the ssg nodes corresponding to each tile.  For each
+    // 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( SGLocation *location, float visibility_meters );
 
+    // Set flag with event manager so that non-moving view refreshes
+    // tiles...
+    void refresh_view_timestamps();
 
-// the tile manager
-extern FGTileMgr global_tile_mgr;
+    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 );
+};
 
 
 #endif // _TILEMGR_HXX