Currently, when the sim pauses, all IO is also halted. To me it generally

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

diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index 62eea0490743b031bfd1d195fdcfcd4555287e09..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>
 
@@ -41,8 +42,6 @@
 #  include <simgear/threads/SGQueue.hxx>
 #endif // ENABLE_THREADS
 
-#include <Main/location.hxx>
-
 #include "FGTileLoader.hxx"
 #include "hitlist.hxx"
 #include "newcache.hxx"
@@ -101,6 +100,7 @@ private:
     // current longitude latitude
     double longitude;
     double latitude;
+    double altitude_m;
     double last_longitude;
     double last_latitude;
 
@@ -163,10 +163,12 @@ 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, 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 +185,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...
@@ -194,8 +196,4 @@ public:
 };
 
 
-// the tile manager
-extern FGTileMgr global_tile_mgr;
-
-
 #endif // _TILEMGR_HXX