toggle fullscreen: also adapt GUI plane when resizing

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

diff --git a/src/Scenery/scenery.hxx b/src/Scenery/scenery.hxx
index bd976ba231ce82121a8ce1895528aa7fe8821bf6..d53344354ab818d55675b09932af6a13f46c037f 100644 (file)
--- a/src/Scenery/scenery.hxx
+++ b/src/Scenery/scenery.hxx
@@ -38,7 +38,9 @@
 
 #include "SceneryPager.hxx"
 
-class SGMaterial;
+namespace simgear {
+class BVHMaterial;
+}
 
 // Define a structure containing global scenery parameters
 class FGScenery : public SGSubsystem {
@@ -48,6 +50,7 @@ class FGScenery : public SGSubsystem {
     osg::ref_ptr<osg::Group> terrain_branch;
     osg::ref_ptr<osg::Group> models_branch;
     osg::ref_ptr<osg::Group> aircraft_branch;
+    osg::ref_ptr<flightgear::SceneryPager> _pager;
 
 public:
 
@@ -71,12 +74,12 @@ public:
     /// value is undefined. 
     /// All values are meant to be in meters or degrees.
     bool get_elevation_m(const SGGeod& geod, double& alt,
-                         const SGMaterial** material,
+                         const simgear::BVHMaterial** material,
                          const osg::Node* butNotFrom = 0);
 
-    /// Compute the elevation of the scenery beow the cartesian point pos.
+    /// Compute the elevation of the scenery below the cartesian point pos.
     /// you the returned scenery altitude is not higher than the position
-    /// pos plus an ofset given with max_altoff.
+    /// pos plus an offset given with max_altoff.
     /// If the exact flag is set to true, the scenery center is moved to
     /// gain a higher accuracy of that query. The center is restored past
     /// that to the original value.
@@ -86,13 +89,14 @@ public:
     /// value is undefined.
     /// All values are meant to be in meters.
     bool get_cart_elevation_m(const SGVec3d& pos, double max_altoff,
-                              double& elevation, const SGMaterial** material,
+                              double& elevation,
+                              const simgear::BVHMaterial** material,
                               const osg::Node* butNotFrom = 0);
 
     /// Compute the nearest intersection point of the line starting from 
     /// start going in direction dir with the terrain.
     /// The input and output values should be in cartesian coordinates in the
-    /// usual earth centered wgs84 coordiante system. Units are meters.
+    /// usual earth centered wgs84 coordinate system. Units are meters.
     /// On success, true is returned.
     bool get_cart_ground_intersection(const SGVec3d& start, const SGVec3d& dir,
                                       SGVec3d& nearestHit,
@@ -103,7 +107,7 @@ 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
+    /// Returns true if scenery is available 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);
@@ -111,6 +115,7 @@ public:
     // Static because access to the pager is needed before the rest of
     // the scenery is initialized.
     static flightgear::SceneryPager* getPagerSingleton();
+    flightgear::SceneryPager* getPager() { return _pager.get(); }
 };