warnings--

[flightgear.git] / src / AIModel / AIBase.hxx

diff --git a/src/AIModel/AIBase.hxx b/src/AIModel/AIBase.hxx
index cbd6681f5b9880096a961185eae4dff7c8db47a9..5fd191c8713d2dd885f782c3298f872ce421e738 100644 (file)
--- a/src/AIModel/AIBase.hxx
+++ b/src/AIModel/AIBase.hxx
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef _FG_AIBASE_HXX
 #define _FG_AIBASE_HXX
@@ -24,6 +24,7 @@
 #include <list>
 
 #include <simgear/constants.h>
+#include <simgear/math/SGMath.hxx>
 #include <simgear/math/point3d.hxx>
 #include <simgear/scene/model/placement.hxx>
 #include <simgear/misc/sg_path.hxx>
@@ -47,7 +48,6 @@ public:
 
     FGAIBase(object_type ot);
     virtual ~FGAIBase();
-    inline const Point3D& GetPos() const { return(pos); }
 
     virtual void readFromScenario(SGPropertyNode* scFileNode);
 
@@ -56,7 +56,7 @@ public:
     virtual void bind();
     virtual void unbind();
 
-    void setManager(FGAIManager* mgr);
+    void setManager(FGAIManager* mgr, SGPropertyNode* p);
     void setPath( const char* model );
     void setSpeed( double speed_KTAS );
     void setAltitude( double altitude_ft );
@@ -75,8 +75,7 @@ public:
     void setDie( bool die );
     bool getDie();
 
-    Point3D getCartPosAt(const Point3D& off) const;
-    Point3D getGeocPosAt(const Point3D& off) const;
+    SGVec3d getCartPosAt(const SGVec3d& off) const;
 
 protected:
 
@@ -84,22 +83,22 @@ protected:
     FGAIManager* manager;
 
     // these describe the model's actual state
-    Point3D pos;       // WGS84 lat & lon in degrees, elev above sea-level in meters
+    SGGeod pos;        // WGS84 lat & lon in degrees, elev above sea-level in meters
     double hdg;                // True heading in degrees
     double roll;       // degrees, left is negative
     double pitch;      // degrees, nose-down is negative
     double speed;       // knots true airspeed
-    double altitude;    // meters above sea level
-    double vs;          // vertical speed, feet per minute  
+    double altitude_ft; // feet above sea level
+    double vs;          // vertical speed, feet per minute
     double turn_radius_ft; // turn radius ft at 15 kts rudder angle 15 degrees
 
     double ft_per_deg_lon;
     double ft_per_deg_lat;
 
     // these describe the model's desired state
-    double tgt_heading;  // target heading, degrees true
-    double tgt_altitude; // target altitude, *feet* above sea level
-    double tgt_speed;    // target speed, KTAS
+    double tgt_heading;     // target heading, degrees true
+    double tgt_altitude_ft; // target altitude, *feet* above sea level
+    double tgt_speed;       // target speed, KTAS
     double tgt_roll;
     double tgt_pitch;
     double tgt_yaw;
@@ -116,7 +115,7 @@ protected:
     double x_shift;      // value used by radar display instrument
     double y_shift;      // value used by radar display instrument
     double rotation;     // value used by radar display instrument
-
+    double ht_diff;             // value used by radar display instrument
 
     string model_path;    //Path to the 3D model
     ssgSharedPtr<ssgBranch> model; //The 3D model object
@@ -167,60 +166,61 @@ public:
     double rho;
     double T;                             // temperature, degs farenheit
     double p;                             // pressure lbs/sq ft
-       double a;                             // speed of sound at altitude (ft/s)
-       double Mach;                          // Mach number
-       
+    double a;                             // speed of sound at altitude (ft/s)
+    double Mach;                          // Mach number
+
     static const double e;
     static const double lbs_to_slugs;
 
     inline double _getRange() { return range; };
-  ssgBranch * load3DModel(const string& fg_root, 
-                         const string &path,
-                         SGPropertyNode *prop_root, 
-                         double sim_time_sec);
+    ssgBranch * load3DModel(const string& fg_root,
+                            const string &path,
+                            SGPropertyNode *prop_root,
+                            double sim_time_sec);
 
     static bool _isNight();
 };
 
-inline void FGAIBase::setManager(FGAIManager* mgr) {
-  manager = mgr;
+inline void FGAIBase::setManager(FGAIManager* mgr, SGPropertyNode* p) {
+    manager = mgr;
+    props = p;
 }
 
 inline void FGAIBase::setPath(const char* model ) {
-  model_path.append(model);
+    model_path.append(model);
 }
 
 inline void FGAIBase::setSpeed( double speed_KTAS ) {
-  speed = tgt_speed = speed_KTAS;
+    speed = tgt_speed = speed_KTAS;
 }
 
 inline void FGAIBase::setRadius( double radius ) {
-  turn_radius_ft = radius;
+    turn_radius_ft = radius;
 }
 
 inline void FGAIBase::setHeading( double heading ) {
-  hdg = tgt_heading = heading;
+    hdg = tgt_heading = heading;
 }
 
-inline void FGAIBase::setAltitude( double altitude_ft ) {
-    altitude = tgt_altitude = altitude_ft;
-    pos.setelev(altitude * SG_FEET_TO_METER);
+inline void FGAIBase::setAltitude( double alt_ft ) {
+    altitude_ft = tgt_altitude_ft = alt_ft;
+    pos.setElevationFt(altitude_ft);
 }
 
 inline void FGAIBase::setBank( double bank ) {
-  roll = tgt_roll = bank;
-  no_roll = false;
+    roll = tgt_roll = bank;
+    no_roll = false;
 }
 
 inline void FGAIBase::setPitch( double newpitch ) {
-  pitch = tgt_pitch = newpitch;
+    pitch = tgt_pitch = newpitch;
 }
 
 inline void FGAIBase::setLongitude( double longitude ) {
-    pos.setlon( longitude );
+    pos.setLongitudeDeg( longitude );
 }
 inline void FGAIBase::setLatitude ( double latitude ) {
-    pos.setlat( latitude );
+    pos.setLatitudeDeg( latitude );
 }
 
 inline void FGAIBase::setDie( bool die ) { delete_me = die; }