X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIAircraft.hxx;h=dec7a86a41c48ade05b7026d775614bd49fbbd5a;hb=afcdbd3158503773644aa07dd86cd92d67946bd4;hp=7504aaecf504479329cbd9d49dfff78e5758b134;hpb=5f3804e816be28db280c27ea2756ba0baefca5bd;p=flightgear.git diff --git a/src/AIModel/AIAircraft.hxx b/src/AIModel/AIAircraft.hxx index 7504aaecf..dec7a86a4 100644 --- a/src/AIModel/AIAircraft.hxx +++ b/src/AIModel/AIAircraft.hxx @@ -42,11 +42,10 @@ public: // virtual bool init(bool search_in_AI_path=false); virtual void bind(); - virtual void unbind(); virtual void update(double dt); - void setPerformance(const std::string& perfString); - void setPerformance(PerformanceData *ps); + void setPerformance(const std::string& acType, const std::string& perfString); + // void setPerformance(PerformanceData *ps); void setFlightPlan(const std::string& fp, bool repat = false); void SetFlightPlan(FGAIFlightPlan *f); @@ -69,6 +68,8 @@ public: double getBearing(double crse); void setAcType(const std::string& ac) { acType = ac; }; + std::string getAcType() const { return acType; } + void setCompany(const std::string& comp) { company = comp;}; void announcePositionToController(); //TODO have to be public? @@ -103,6 +104,7 @@ public: int getTakeOffStatus() { return takeOffStatus; }; void checkTcas(); + double calcVerticalSpeed(double vert_ft, double dist_m, double speed, double error); FGATCController * getATCController() { return controller; }; @@ -146,7 +148,6 @@ private: void updatePrimaryTargetValues(bool& flightplanActive, bool& aiOutOfSight); void updateSecondaryTargetValues(); - void updatePosition(); void updateHeading(); void updateBankAngleTarget(); void updateVerticalSpeedTarget(); @@ -181,6 +182,8 @@ private: time_t timeElapsed; PerformanceData* _performance; // the performance data for this aircraft + + void assertSpeed(double speed); };