ignore resets for now because every z/Z key press would trigger a call to NOAA. We...

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

diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index 41a69669ec48283218bd8f8464943e872fd7c0b1..f0d3969cbace649ddb3c3ef36f544d003ee9f9d0 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -30,6 +30,8 @@
 #endif                                   
 
 #include <simgear/compiler.h>
+#include <simgear/math/point3d.hxx>
+#include <simgear/scene/model/location.hxx>
 
 #include <queue>
 
@@ -75,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;
@@ -98,8 +97,7 @@ private:
     // current longitude latitude
     double longitude;
     double latitude;
-    double last_longitude;
-    double last_latitude;
+    double altitude_m;
 
     /**
      * tile cache
@@ -128,6 +126,7 @@ private:
     static queue<FGTileEntry *> attach_queue;
     static queue<FGDeferredModel *> model_queue;
 #endif // ENABLE_THREADS
+    static queue<FGTileEntry *> delete_queue;
 
 public:
 
@@ -136,13 +135,6 @@ public:
      */
     static void ready_to_attach( FGTileEntry *t ) { attach_queue.push( t ); }
 
-#ifdef WISH_PLIB_WAS_THREADED // but it isn't
-    /**
-     * Tile is detatched from scene graph and is ready to delete
-     */
-    inline void ready_to_delete( FGTileEntry *t ) { loader.remove( t ); }
-#endif
-
     /**
      * Add a pending model to the 'deferred model load' queue
      */
@@ -159,13 +151,19 @@ 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();
+
     // 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 );
-    void setCurrentTile( double longitude, double latitude );
-    void updateCurrentElevAtPos(sgdVec3 abs_pos_vector);
+    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
@@ -178,14 +176,14 @@ public:
                     const sgdVec3 p, const sgdVec3 dir,
                     FGHitList *list );
 
-    // 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(float visibility_meters);
+    // 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...
-    //
+    // Set flag with event manager so that non-moving view refreshes
+    // tiles...
     void refresh_view_timestamps();
 
     inline SGBucket get_current_bucket () { return current_bucket; }
@@ -193,8 +191,4 @@ public:
 };
 
 
-// the tile manager
-extern FGTileMgr global_tile_mgr;
-
-
 #endif // _TILEMGR_HXX