X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIFlightPlan.hxx;h=c70028dd3e85a3fa37b206eff29a1f19133f2d0f;hb=bb2d1f55e9912d3b9b81b6d5e12900f77eef4365;hp=0e9e29e40624a93ced4b6bbde4badd06ffa348cd;hpb=8a756eee5404eefbe88d0899439366b50e491c2a;p=flightgear.git

diff --git a/src/AIModel/AIFlightPlan.hxx b/src/AIModel/AIFlightPlan.hxx
index 0e9e29e40..c70028dd3 100644
--- a/src/AIModel/AIFlightPlan.hxx
+++ b/src/AIModel/AIFlightPlan.hxx
@@ -23,16 +23,20 @@
 #include <vector>
 #include <string>
 
+
 #include <Airports/simple.hxx>
 #include <Navaids/awynet.hxx>
 
 #include "AIBase.hxx"
 
+
+
 using std::vector;
 using std::string;
 
 class FGTaxiRoute;
 class FGRunway;
+class FGAIAircraft;
 
 class FGAIFlightPlan {
 
@@ -54,9 +58,10 @@ public:
    string time;
 
   } waypoint;
-
+  FGAIFlightPlan();
   FGAIFlightPlan(const string& filename);
-  FGAIFlightPlan(const std::string& p,
+  FGAIFlightPlan(FGAIAircraft *,
+                 const std::string& p,
 		 double course,
 		 time_t start,
 		 FGAirport *dep,
@@ -76,6 +81,7 @@ public:
    waypoint* const getCurrentWaypoint( void ) const;
    waypoint* const getNextWaypoint( void ) const;
    void IncrementWaypoint( bool erase );
+   void DecrementWaypoint( bool erase );
 
    double getDistanceToGo(double lat, double lon, waypoint* wp) const;
    int getLeg () const { return leg;};
@@ -86,7 +92,7 @@ public:
    double getBearing(double lat, double lon, waypoint* next) const;
   time_t getStartTime() const { return start_time; }
 
-  void    create(FGAirport *dep, FGAirport *arr, int leg, double alt, double speed, double lat, double lon,
+  void    create(FGAIAircraft *, FGAirport *dep, FGAirport *arr, int leg, double alt, double speed, double lat, double lon,
 		 bool firstLeg, double radius, const string& fltType, const string& aircraftType, const string& airline);
 
   void setLeg(int val) { leg = val;}
@@ -105,8 +111,20 @@ public:
   string getRunway() { return activeRunway; }
   bool isActive(time_t time) {return time >= this->getStartTime();}
 
+  void setRunway(string rwy) { activeRunway = rwy; };
+  string getRunwayClassFromTrafficType(string fltType);
+
+  void addWaypoint(waypoint* wpt) { waypoints.push_back(wpt); };
+
+  void setName(string n) { name = n; };
+  string getName() { return name; };
+
+  void setSID(FGAIFlightPlan* fp) { sid = fp;};
+  FGAIFlightPlan* getSID() { return sid; };
+
 private:
   FGRunway* rwy;
+  FGAIFlightPlan *sid;
   typedef vector <waypoint*> wpt_vector_type;
   typedef wpt_vector_type::const_iterator wpt_vector_iterator;
 
@@ -123,31 +141,36 @@ private:
   string activeRunway;
   FGAirRoute airRoute;
   FGTaxiRoute *taxiRoute;
-
-  void createPushBack(bool, FGAirport*, double, double, double, const string&, const string&, const string&);
-  void createPushBackFallBack(bool, FGAirport*, double, double, double, const string&, const string&, const string&);
-  void createTakeOff(bool, FGAirport *, double, const string&);
-  void createClimb(bool, FGAirport *, double, double, const string&);
-  void createCruise(bool, FGAirport*, FGAirport*, double, double, double, double, const string&);
-  void createDecent(FGAirport *, const string&);
-  void createLanding(FGAirport *);
-  void createParking(FGAirport *, double radius);
+  string name;
+
+  void createPushBack(FGAIAircraft *, bool, FGAirport*, double, double, double, const string&, const string&, const string&);
+  void createPushBackFallBack(FGAIAircraft *, bool, FGAirport*, double, double, double, const string&, const string&, const string&);
+  void createTakeOff(FGAIAircraft *, bool, FGAirport *, double, const string&);
+  void createClimb(FGAIAircraft *, bool, FGAirport *, double, double, const string&);
+  void createCruise(FGAIAircraft *, bool, FGAirport*, FGAirport*, double, double, double, double, const string&);
+  void createDecent(FGAIAircraft *, FGAirport *, const string&);
+  void createLanding(FGAIAircraft *, FGAirport *, const string&);
+  void createParking(FGAIAircraft *, FGAirport *, double radius);
   void deleteWaypoints(); 
   void resetWaypoints();
 
-  void createLandingTaxi(FGAirport *apt, double radius, const string& fltType, const string& acType, const string& airline);
-  void createDefaultLandingTaxi(FGAirport* aAirport);
-  void createDefaultTakeoffTaxi(FGAirport* aAirport, FGRunway* aRunway);
-  void createTakeoffTaxi(bool firstFlight, FGAirport *apt, double radius, const string& fltType, const string& acType, const string& airline);
+  void createLandingTaxi(FGAIAircraft *, FGAirport *apt, double radius, const string& fltType, const string& acType, const string& airline);
+  void createDefaultLandingTaxi(FGAIAircraft *, FGAirport* aAirport);
+  void createDefaultTakeoffTaxi(FGAIAircraft *, FGAirport* aAirport, FGRunway* aRunway);
+  void createTakeoffTaxi(FGAIAircraft *, bool firstFlight, FGAirport *apt, double radius, const string& fltType, const string& acType, const string& airline);
         
-  waypoint* createOnGround(const std::string& aName, const SGGeod& aPos, double aElev, double aSpeed);
-  waypoint* createInAir(const std::string& aName, const SGGeod& aPos, double aElev, double aSpeed);
-  waypoint* cloneWithPos(waypoint* aWpt, const std::string& aName, const SGGeod& aPos);
+  waypoint* createOnGround(FGAIAircraft *, const std::string& aName, const SGGeod& aPos, double aElev, double aSpeed);
+  waypoint* createInAir(FGAIAircraft *, const std::string& aName, const SGGeod& aPos, double aElev, double aSpeed);
+  waypoint* cloneWithPos(FGAIAircraft *, waypoint* aWpt, const std::string& aName, const SGGeod& aPos);
+  waypoint* clone(waypoint* aWpt);
     
-  string getRunwayClassFromTrafficType(string fltType);
 
   //void createCruiseFallback(bool, FGAirport*, FGAirport*, double, double, double, double);
  void evaluateRoutePart(double deplat, double deplon, double arrlat, double arrlon);
+ public:
+  wpt_vector_iterator getFirstWayPoint() { return waypoints.begin(); };
+  wpt_vector_iterator getLastWayPoint()  { return waypoints.end(); };
+
 };    
 
 #endif  // _FG_AIFLIGHTPLAN_HXX