Port over remaining Point3D usage to the more type and unit safe SG* classes.

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

diff --git a/src/Scenery/scenery.hxx b/src/Scenery/scenery.hxx
index 75512b3aafcc39a615877c633e028cd450e8b61d..bc8b4f7100a68792bfee800c297d1bd326734a2f 100644 (file)
--- a/src/Scenery/scenery.hxx
+++ b/src/Scenery/scenery.hxx
@@ -36,6 +36,8 @@
 #include <simgear/math/SGMath.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
+#include "SceneryPager.hxx"
+
 class SGMaterial;
 
 // Define a structure containing global scenery parameters
@@ -68,8 +70,6 @@ public:
     /// lat/lon pair. If there is no scenery for that point, the altitude
     /// value is undefined. 
     /// All values are meant to be in meters or degrees.
-    bool get_elevation_m(double lat, double lon, double max_alt,
-                         double& alt, const SGMaterial** material);
     bool get_elevation_m(const SGGeod& geod, double& alt,
                          const SGMaterial** material);
 
@@ -85,7 +85,7 @@ public:
     /// value is undefined.
     /// All values are meant to be in meters.
     bool get_cart_elevation_m(const SGVec3d& pos, double max_altoff,
-                              double& radius, const SGMaterial** material);
+                              double& elevation, const SGMaterial** material);
 
     /// Compute the nearest intersection point of the line starting from 
     /// start going in direction dir with the terrain.
@@ -99,6 +99,15 @@ public:
     osg::Group *get_terrain_branch () const { return terrain_branch.get(); }
     osg::Group *get_models_branch () const { return models_branch.get(); }
     osg::Group *get_aircraft_branch () const { return aircraft_branch.get(); }
+
+    /// Returns true if scenery is avaliable for the given lat, lon position
+    /// within a range of range_m.
+    /// lat and lon are expected to be in degrees.
+    bool scenery_available(const SGGeod& position, double range_m);
+
+    // Static because access to the pager is needed before the rest of
+    // the scenery is initialized.
+    static flightgear::SceneryPager* getPagerSingleton();
 };