Fix the nmea and garmin output to a) fake a GSA sentence, b) fix a y2k bug

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

diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index d268d4a861d237f71af911892a79c03bd125e0dc..686ab45140b7ca603b70353f14606c775cd49e0f 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -31,6 +31,7 @@
 
 #include <simgear/compiler.h>
 #include <simgear/math/point3d.hxx>
+#include <simgear/scene/model/location.hxx>
 
 #include <queue>
 
@@ -99,6 +100,7 @@ private:
     // current longitude latitude
     double longitude;
     double latitude;
+    double altitude_m;
     double last_longitude;
     double last_latitude;
 
@@ -154,13 +156,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, 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
@@ -173,15 +181,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);
-    void prep_ssg_nodes(float visibility_meters, sgVec3 up, Point3D center);
+    // 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; }
@@ -189,8 +196,4 @@ public:
 };
 
 
-// the tile manager
-extern FGTileMgr global_tile_mgr;
-
-
 #endif // _TILEMGR_HXX