Added static port system and a new altimeter model connected to it.

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

diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index ff5fe42ba3eb1bf8038e1c15f3d1447f33350cfd..d268d4a861d237f71af911892a79c03bd125e0dc 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -30,6 +30,7 @@
 #endif                                   
 
 #include <simgear/compiler.h>
+#include <simgear/math/point3d.hxx>
 
 #include <queue>
 
@@ -78,7 +79,7 @@ private:
     void sched_tile( const SGBucket& b );
 
     // schedule a needed buckets for loading
-    void schedule_needed();
+    void schedule_needed(double visibility_meters, SGBucket curr_bucket);
 
     // see comment at prep_ssg_nodes()
     void prep_ssg_node( int idx );
@@ -128,6 +129,7 @@ private:
     static queue<FGTileEntry *> attach_queue;
     static queue<FGDeferredModel *> model_queue;
 #endif // ENABLE_THREADS
+    static queue<FGTileEntry *> delete_queue;
 
 public:
 
@@ -136,13 +138,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
      */
@@ -162,7 +157,10 @@ public:
     // 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 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 );
 
     // Determine scenery altitude.  Normally this just happens when we
     // render the scene, but we'd also like to be able to do this
@@ -178,7 +176,16 @@ public:
     // 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();
+    void prep_ssg_nodes(float visibility_meters);
+    void prep_ssg_nodes(float visibility_meters, sgVec3 up, Point3D center);
+
+    //
+    // Set flag with event manager so that non-moving view refreshes tiles...
+    //
+    void refresh_view_timestamps();
+
+    inline SGBucket get_current_bucket () { return current_bucket; }
+    inline SGBucket get_previous_bucket () { return previous_bucket; }
 };