Merge branch 'vivian/cullsetting'

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

diff --git a/src/AIModel/AIAircraft.hxx b/src/AIModel/AIAircraft.hxx
index cf8e6babce1fd12164a83b32bf18df5011b3c3ed..7e65d0df51294732c4543a3dcff5c4461fc50f54 100644 (file)
--- a/src/AIModel/AIAircraft.hxx
+++ b/src/AIModel/AIAircraft.hxx
@@ -26,9 +26,9 @@
 
 #include <Traffic/SchedFlight.hxx>
 #include <Traffic/Schedule.hxx>
+#include <ATC/trafficcontrol.hxx>
 
 #include <string>
-SG_USING_STD(string);
 
 class PerformanceData;
 
@@ -61,21 +61,26 @@ public:
     void ClimbTo(double altitude);
     void TurnTo(double heading);
     
-    void setCallSign(const string& );
-
     void getGroundElev(double dt); //TODO these 3 really need to be public?
     void doGroundAltitude();
-    void loadNextLeg  ();
+    bool loadNextLeg  ();
 
-    void setAcType(const string& ac) { acType = ac; };
-    void setCompany(const string& comp) { company = comp;};
+    void setAcType(const std::string& ac) { acType = ac; };
+    void setCompany(const std::string& comp) { company = comp;};
 
     void announcePositionToController(); //TODO have to be public?
     void processATC(FGATCInstruction instruction);
+    void setTaxiClearanceRequest(bool arg) { needsTaxiClearance = arg; };
+    bool getTaxiClearanceRequest() { return needsTaxiClearance; };
+    FGAISchedule * getTrafficRef() { return trafficRef; };
 
     virtual const char* getTypeString(void) const { return "aircraft"; }
 
+    std::string GetTransponderCode() { return transponderCode; };
+    void SetTransponderCode(const std::string& tc) { transponderCode = tc;};
+
     // included as performance data needs them, who else?
+    inline PerformanceData* getPerformance() { return _performance; };
     inline bool onGround() const { return no_roll; };
     inline double getSpeed() const { return speed; };
     inline double getRoll() const { return roll; };
@@ -84,6 +89,7 @@ public:
     inline double getVerticalSpeed() const { return vs; };
     inline double altitudeAGL() const { return props->getFloatValue("position/altitude-agl-ft");};
     inline double airspeed() const { return props->getFloatValue("velocities/airspeed-kt");};
+    std::string atGate();
     
 protected:
     void Run(double dt);
@@ -97,6 +103,7 @@ private:
     double dt_count;
     double dt_elev_count;
     double headingChangeRate;
+    double headingError;
     double groundTargetSpeed;
     double groundOffset;
     double dt;
@@ -115,7 +122,9 @@ private:
     void controlHeading(FGAIFlightPlan::waypoint* curr);
     void controlSpeed(FGAIFlightPlan::waypoint* curr,
                       FGAIFlightPlan::waypoint* next);
-    void updatePrimaryTargetValues();
+    
+    void updatePrimaryTargetValues(bool& flightplanActive, bool& aiOutOfSight);
+    
     void updateSecondaryTargetValues();
     void updatePosition();
     void updateHeading();
@@ -124,11 +133,13 @@ private:
     void updatePitchAngleTarget();
     void updateActualState();
     void handleATCRequests();
+    void checkVisibility();
 
     double sign(double x);
 
-    string acType;
-    string company;
+    std::string acType;
+    std::string company;
+    std::string transponderCode;
 
     int spinCounter;
     double prevSpeed;
@@ -137,9 +148,12 @@ private:
     bool holdPos;
 
     bool _getGearDown() const;
-    const char *_getCallSign() const;
+
+    const char * _getTransponderCode() const;
+
     bool reachedWaypoint;
-    string callsign;             // The callsign of this tanker.
+    bool needsTaxiClearance;
+    time_t timeElapsed;
 
     PerformanceData* _performance; // the performance data for this aircraft
 };