Initial commit of the new sound system, expect more updates to follow

[flightgear.git] / src / ATCDCL / AIGAVFRTraffic.hxx

diff --git a/src/ATCDCL/AIGAVFRTraffic.hxx b/src/ATCDCL/AIGAVFRTraffic.hxx
index 9aabd87466cd7a6245d8b66935d867262d20ed2e..fda97cf39671d78c4b02e6daf875d90699e5fcc8 100644 (file)
--- a/src/ATCDCL/AIGAVFRTraffic.hxx
+++ b/src/ATCDCL/AIGAVFRTraffic.hxx
@@ -22,13 +22,13 @@
 #ifndef _FG_AIGAVFRTraffic_HXX
 #define _FG_AIGAVFRTraffic_HXX
 
-#include <simgear/math/point3d.hxx>
+#include <simgear/math/SGMath.hxx>
 #include <Main/fg_props.hxx>
 
 #include "AILocalTraffic.hxx"
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 class FGAIGAVFRTraffic : public FGAILocalTraffic {
        
@@ -38,7 +38,7 @@ public:
        ~FGAIGAVFRTraffic();
        
        // Init en-route to destID at point pt. (lat, lon, elev) (elev in meters, lat and lon in degrees).
-       bool Init(const Point3D& pt, const string& destID, const string& callsign);
+       bool Init(const SGGeod& pt, const string& destID, const string& callsign);
        // Init at srcID to fly to destID
        bool Init(const string& srcID, const string& destID, const string& callsign, OperatingState state = PARKED);
        
@@ -96,14 +96,14 @@ private:
        bool _clearedStraightIn;
        bool _downwindEntry;
        bool _clearedDownwindEntry;
-       Point3D _wp;    // Next waypoint (ie. the one we're currently heading for)
+       SGGeod _wp;     // Next waypoint (ie. the one we're currently heading for)
        bool _enroute;
        string _destID;
        bool _climbout;
        double _cruise_alt;
        double _cruise_ias;
        double _cruise_climb_ias;
-       Point3D _destPos;
+       SGGeod _destPos;
        bool _local;
        bool _incoming;
        bool _established;
@@ -111,11 +111,9 @@ private:
        bool _entering;
        bool _turning;
        
-       //ssgBranch* _model;
-       
        int GetQuadrangleAltitude(int dir, int des_alt);
        
-       Point3D GetPatternApproachPos();
+       SGGeod GetPatternApproachPos();
        
        void FlyPlane(double dt);