X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIFlightPlan.hxx;h=cff51aaa657ca26b0d4b8e77b5110d8710acc646;hb=1613d7e63e02ccad8ebdfaaf8359ab34e0b88e7a;hp=15c479672078b184f0862c97a862dec4904dbdef;hpb=54594e521947b8238fa73efd02f6a4d90d809eb4;p=flightgear.git

diff --git a/src/AIModel/AIFlightPlan.hxx b/src/AIModel/AIFlightPlan.hxx
index 15c479672..cff51aaa6 100644
--- a/src/AIModel/AIFlightPlan.hxx
+++ b/src/AIModel/AIFlightPlan.hxx
@@ -25,6 +25,7 @@
 
 #include <Airports/simple.hxx>
 #include <Airports/runways.hxx>
+#include <Navaids/awynet.hxx>
 
 #include "AIBase.hxx"
 
@@ -47,52 +48,66 @@ public:
    bool gear_down;
    bool flaps_down;
    bool on_ground;
+    int routeIndex;  // For AI/ATC purposes;
+   double time_sec;
+   string time;
+
   } waypoint;
 
-   FGAIFlightPlan(string filename);
-  FGAIFlightPlan(FGAIModelEntity *entity,
+   FGAIFlightPlan(const string& filename);
+  FGAIFlightPlan(const std::string& p,
 		 double course,
 		 time_t start,
 		 FGAirport *dep,
 		 FGAirport *arr,
 		 bool firstLeg,
 		 double radius,
-		 string fltType,
-		 string acType,
-		 string airline);
+                 double alt,
+                 double lat,
+                 double lon,
+                 double speed,
+		 const string& fltType,
+		 const string& acType,
+		 const string& airline);
    ~FGAIFlightPlan();
 
-   waypoint* getPreviousWaypoint( void );
-   waypoint* getCurrentWaypoint( void );
-   waypoint* getNextWaypoint( void );
+   waypoint* const getPreviousWaypoint( void ) const;
+   waypoint* const getCurrentWaypoint( void ) const;
+   waypoint* const getNextWaypoint( void ) const;
    void IncrementWaypoint( bool erase );
 
-   double getDistanceToGo(double lat, double lon, waypoint* wp);
-   int getLeg () { return leg;};
+   double getDistanceToGo(double lat, double lon, waypoint* wp) const;
+   int getLeg () const { return leg;};
    void setLeadDistance(double speed, double bearing, waypoint* current, waypoint* next);
    void setLeadDistance(double distance_ft);
    double getLeadDistance( void ) const {return lead_distance;}
-   double getBearing(waypoint* previous, waypoint* next);
-   double getBearing(double lat, double lon, waypoint* next);
-  time_t getStartTime() { return start_time; }; 
+   double getBearing(waypoint* previous, waypoint* next) const;
+   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,
-		 bool firstLeg, double radius, string fltType, string aircraftType, string airline);
+		 bool firstLeg, double radius, const string& fltType, const string& aircraftType, const string& airline);
 
   void setLeg(int val) { leg = val;};
   void setTime(time_t st) { start_time = st; };
-  int getGate() { return gateId; };
-  double getLeadInAngle() { return leadInAngle; };
-  string getRunway() { return rwy._rwy_no; };
-  string getRunwayId() { return rwy._id; };
+  int getGate() const { return gateId; };
+  double getLeadInAngle() const { return leadInAngle; };
+  const string& getRunway() const { return rwy._rwy_no; };
+  const string& getRunwayId() const { return rwy._id; };
   void setRepeat(bool r) { repeat = r; };
-  bool getRepeat(void) { return repeat; };
+  bool getRepeat(void) const { return repeat; };
   void restart(void);
+  int getNrOfWayPoints() { return waypoints.size(); };
+  int getRouteIndex(int i); // returns the AI related index of this current routes. 
+  FGTaxiRoute *getTaxiRoute() { return taxiRoute; };
+  void deleteTaxiRoute();
+  string getRunway() { return activeRunway; };
+    bool isActive(time_t time) {return time >= this->getStartTime();};
 
 private:
   FGRunway rwy;
   typedef vector <waypoint*> wpt_vector_type;
-  typedef wpt_vector_type::iterator wpt_vector_iterator;
+  typedef wpt_vector_type::const_iterator wpt_vector_iterator;
 
   wpt_vector_type       waypoints;
   wpt_vector_iterator   wpt_iterator;
@@ -105,20 +120,33 @@ private:
   int leg;
   int gateId;
   string activeRunway;
+  FGAirRoute airRoute;
+  FGTaxiRoute *taxiRoute;
+
+
+  Point3D temp;
+  sgdVec3 a, b, cross;
+  sgdVec3 newPos;
+  sgdMat4 matrix;
+  double angle;
+  double midlat, midlon;
+  double course, distance;  
 
-  void createPushBack(bool, FGAirport*, double, double, double, string, string, string);
-  void createTaxi(bool, int, FGAirport *, double, double, double, string, string, string);
+  void createPushBack(bool, FGAirport*, double, double, double, const string&, const string&, const string&);
+  void createTaxi(bool, int, FGAirport *, double, double, double, const string&, const string&, const string&);
   void createTakeOff(bool, FGAirport *, double);
   void createClimb(bool, FGAirport *, double, double);
   void createCruise(bool, FGAirport*, FGAirport*, double, double, double, double);
   void createDecent(FGAirport *);
   void createLanding(FGAirport *);
-  void createParking(FGAirport *);
+  void createParking(FGAirport *, double radius);
   void deleteWaypoints(); 
   void resetWaypoints();
+
+  //void createCruiseFallback(bool, FGAirport*, FGAirport*, double, double, double, double);
+ void evaluateRoutePart(double deplat, double deplon, double arrlat, double arrlon);
 };    
 
 
 
 #endif  // _FG_AIFLIGHTPLAN_HXX
-