Merge commit 'refs/merge-requests/13' of git://gitorious.org/fg/flightgear into next

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

diff --git a/src/Scenery/scenery.hxx b/src/Scenery/scenery.hxx
index 0fdd9cd89f615dd5990b008b5e59c861b5e39621..bd976ba231ce82121a8ce1895528aa7fe8821bf6 100644 (file)
--- a/src/Scenery/scenery.hxx
+++ b/src/Scenery/scenery.hxx
@@ -70,10 +70,9 @@ 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);
+                         const SGMaterial** material,
+                         const osg::Node* butNotFrom = 0);
 
     /// Compute the elevation of the scenery beow the cartesian point pos.
     /// you the returned scenery altitude is not higher than the position
@@ -87,7 +86,8 @@ 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,
+                              const osg::Node* butNotFrom = 0);
 
     /// Compute the nearest intersection point of the line starting from 
     /// start going in direction dir with the terrain.
@@ -95,7 +95,8 @@ public:
     /// usual earth centered wgs84 coordiante system. Units are meters.
     /// On success, true is returned.
     bool get_cart_ground_intersection(const SGVec3d& start, const SGVec3d& dir,
-                                      SGVec3d& nearestHit);
+                                      SGVec3d& nearestHit,
+                                      const osg::Node* butNotFrom = 0);
 
     osg::Group *get_scene_graph () const { return scene_graph.get(); }
     osg::Group *get_terrain_branch () const { return terrain_branch.get(); }
@@ -105,7 +106,7 @@ public:
     /// 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(double lat, double lon, double range_m);
+    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.