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 0b2d8832bfadcaea04212db5ab6dc7f63ce01a9d..bc8b4f7100a68792bfee800c297d1bd326734a2f 100644 (file)
--- a/src/Scenery/scenery.hxx
+++ b/src/Scenery/scenery.hxx
@@ -70,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);
 
@@ -87,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.
@@ -102,6 +100,11 @@ public:
     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();