X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScenery%2Fscenery.hxx;h=d53344354ab818d55675b09932af6a13f46c037f;hb=948aa70af78626584042b70fdf3c3babfb5aa804;hp=49b3dce4e64dc83c3147ffccf55971ab9a5ada21;hpb=4fe615fff546df5e381f7fc9ddae92dd3dc36251;p=flightgear.git

diff --git a/src/Scenery/scenery.hxx b/src/Scenery/scenery.hxx
index 49b3dce4e..d53344354 100644
--- a/src/Scenery/scenery.hxx
+++ b/src/Scenery/scenery.hxx
@@ -29,37 +29,28 @@
 # error This library requires C++
 #endif                                   
 
-#include <list>
-
 #include <osg/ref_ptr>
 #include <osg/Group>
 
 #include <simgear/compiler.h>
+#include <simgear/math/SGMath.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/math/point3d.hxx>
-#include <simgear/scene/model/placementtrans.hxx>
-#include <simgear/scene/util/SGPickCallback.hxx>
-
-SG_USING_STD(list);
 
-class SGMaterial;
+#include "SceneryPager.hxx"
 
+namespace simgear {
+class BVHMaterial;
+}
 
 // Define a structure containing global scenery parameters
 class FGScenery : public SGSubsystem {
-    // FIXME this should be a views property
-    // angle of sun relative to current local horizontal
-    double sun_angle;
 
     // scene graph
     osg::ref_ptr<osg::Group> scene_graph;
     osg::ref_ptr<osg::Group> terrain_branch;
-    osg::ref_ptr<osg::Group> gnd_lights_root;
-    osg::ref_ptr<osg::Group> vasi_lights_root;
-    osg::ref_ptr<osg::Group> rwy_lights_root;
-    osg::ref_ptr<osg::Group> taxi_lights_root;
     osg::ref_ptr<osg::Group> models_branch;
     osg::ref_ptr<osg::Group> aircraft_branch;
+    osg::ref_ptr<flightgear::SceneryPager> _pager;
 
 public:
 
@@ -82,13 +73,13 @@ 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 exact = false);
+    bool get_elevation_m(const SGGeod& geod, double& alt,
+                         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.
@@ -98,64 +89,33 @@ 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,
-                              bool exact = false);
+                              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, bool exact = false);
+                                      SGVec3d& nearestHit,
+                                      const osg::Node* butNotFrom = 0);
 
     osg::Group *get_scene_graph () const { return scene_graph.get(); }
-    inline void set_scene_graph (osg::Group * s) { scene_graph = s; }
-
     osg::Group *get_terrain_branch () const { return terrain_branch.get(); }
-    inline void set_terrain_branch (osg::Group * t) { terrain_branch = t; }
-
-    inline osg::Group *get_gnd_lights_root () const {
-        return gnd_lights_root.get();
-    }
-    inline void set_gnd_lights_root (osg::Group *r) {
-        gnd_lights_root = r;
-    }
-
-    inline osg::Group *get_vasi_lights_root () const {
-        return vasi_lights_root.get();
-    }
-    inline void set_vasi_lights_root (osg::Group *r) {
-        vasi_lights_root = r;
-    }
-
-    inline osg::Group *get_rwy_lights_root () const {
-        return rwy_lights_root.get();
-    }
-    inline void set_rwy_lights_root (osg::Group *r) {
-        rwy_lights_root = r;
-    }
-
-    inline osg::Group *get_taxi_lights_root () const {
-        return taxi_lights_root.get();
-    }
-    inline void set_taxi_lights_root (osg::Group *r) {
-        taxi_lights_root = r;
-    }
-
-    inline osg::Group *get_models_branch () const {
-        return models_branch.get();
-    }
-    inline void set_models_branch (osg::Group *t) {
-        models_branch = t;
-    }
-
-    inline osg::Group *get_aircraft_branch () const {
-        return aircraft_branch.get();
-    }
-    inline void set_aircraft_branch (osg::Group *t) {
-        aircraft_branch = t;
-    }
+    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 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);
+
+    // 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(); }
 };