A long, long time ago, a bug was inadvertently introduced into the threaded

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

diff --git a/src/Scenery/scenery.hxx b/src/Scenery/scenery.hxx
index 3c753e1d1bb59117a72845d74857de1c881109ff..996eb8ddcfed7e8fd60a5e044711135450eaa3f4 100644 (file)
--- a/src/Scenery/scenery.hxx
+++ b/src/Scenery/scenery.hxx
@@ -29,15 +29,19 @@
 # error This library requires C++
 #endif                                   
 
+#include <list>
 
 #include <plib/sg.h>
 
+#include <simgear/compiler.h>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/math/point3d.hxx>
 
+SG_USING_STD(list);
 
 class ssgRoot;
 class ssgBranch;
+class ssgPlacementTransform;
 
 
 // Define a structure containing global scenery parameters
@@ -48,20 +52,10 @@ class FGScenery : public SGSubsystem {
     // next center of current scenery chunk
     Point3D next_center;
 
+    // FIXME this should be a views property
     // angle of sun relative to current local horizontal
     double sun_angle;
 
-    // elevation of terrain at our current lat/lon (based on the
-    // actual drawn polygons)
-    double cur_elev;
-
-    // the distance (radius) from the center of the earth to the
-    // current scenery elevation point
-    double cur_radius;
-
-    // unit normal at point used to determine current elevation
-    sgdVec3 cur_normal;
-
     // SSG scene graph
     ssgRoot *scene_graph;
     ssgBranch *terrain_branch;
@@ -72,6 +66,10 @@ class FGScenery : public SGSubsystem {
     ssgBranch *models_branch;
     ssgBranch *aircraft_branch;
 
+    // list of all placement transform, used to move the scenery center on the fly.
+    typedef list<ssgPlacementTransform*> placement_list_type;
+    placement_list_type _placement_list;
+
 public:
 
     FGScenery();
@@ -83,17 +81,46 @@ public:
     void unbind ();
     void update (double dt);
 
-    inline double get_cur_elev() const { return cur_elev; }
-    inline void set_cur_elev( double e ) { cur_elev = e; }
-
-    inline Point3D get_center() const { return center; }
-    inline void set_center( Point3D p ) { center = p; }
-
-    inline Point3D get_next_center() const { return next_center; }
-    inline void set_next_center( Point3D p ) { next_center = p; }
-
-    inline void set_cur_radius( double r ) { cur_radius = r; }
-    inline void set_cur_normal( sgdVec3 n ) { sgdCopyVec3( cur_normal, n ); }
+    /// Compute the elevation of the scenery at geodetic latitude lat,
+    /// geodetic longitude lon and not higher than max_alt.
+    /// 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.
+    /// The altitude hit is returned in the alt argument.
+    /// The method returns true if the scenery is available for the given
+    /// 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, bool exact = false);
+
+    /// Compute the elevation of the scenery beow the cartesian point pos.
+    /// you the returned scenery altitude is not higher than the position
+    /// pos plus an ofset 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.
+    /// The altitude hit is returned in the alt argument.
+    /// The method returns true if the scenery is available for the given
+    /// lat/lon pair. If there is no scenery for that point, the altitude
+    /// value is undefined.
+    /// All values are meant to be in meters.
+    bool get_cart_elevation_m(const sgdVec3& pos, double max_altoff,
+                              double& radius, bool exact = false);
+
+    /// 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.
+    /// On success, true is returned.
+    bool get_cart_ground_intersection(const sgdVec3& start, const sgdVec3& dir,
+                                      sgdVec3& nearestHit, bool exact = false);
+
+    inline const Point3D& get_center() const { return center; }
+    void set_center( const Point3D& p );
+
+    inline const Point3D& get_next_center() const { return next_center; }
+    inline void set_next_center( const Point3D& p ) { next_center = p; }
 
     inline ssgRoot *get_scene_graph () const { return scene_graph; }
     inline void set_scene_graph (ssgRoot * s) { scene_graph = s; }
@@ -142,6 +169,9 @@ public:
     inline void set_aircraft_branch (ssgBranch *t) {
         aircraft_branch = t;
     }
+
+    void register_placement_transform(ssgPlacementTransform *trans);
+    void unregister_placement_transform(ssgPlacementTransform *trans);
 };