X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIBallistic.hxx;h=e9938171266a1ad3c1fb9ea9b7e662b9312f853c;hb=d035fdf3a949e62f0c8e772e100d14087b6d4ba9;hp=63d55bd95f0912199f4875e1bc33d351aada57e5;hpb=0abf252ec8bc933b9b7c045f8782cfc7f16c0465;p=flightgear.git diff --git a/src/AIModel/AIBallistic.hxx b/src/AIModel/AIBallistic.hxx index 63d55bd95..e99381712 100644 --- a/src/AIModel/AIBallistic.hxx +++ b/src/AIModel/AIBallistic.hxx @@ -31,9 +31,6 @@ #include "AIManager.hxx" #include "AIBase.hxx" -using std::vector; -using std::list; - class FGAIBallistic : public FGAIBase { public: @@ -72,15 +69,15 @@ public: void setCollision(bool c); void setExpiry(bool e); void setImpact(bool i); - void setImpactReportNode(const string&); + void setImpactReportNode(const std::string&); void setContentsNode(const SGPropertyNode_ptr); void setFuseRange(double f); - void setSMPath(const string&); + void setSMPath(const std::string&); void setSubID(int i); - void setSubmodel(const string&); + void setSubmodel(const std::string&); void setExternalForce( bool f ); - void setForcePath(const string&); - void setContentsPath(const string&); + void setForcePath(const std::string&); + void setContentsPath(const std::string&); void setForceStabilisation( bool val ); void setGroundOffset(double g); void setLoadOffset(double l); @@ -188,7 +185,7 @@ private: bool _slave_load_to_ac;// if true, object will be slaved to the parent ac pos double _contents_lb; // contents of the object double _weight_lb; // weight of the object (no contents if appropriate) (lbs) - string _mat_name; + std::string _mat_name; bool _report_collision; // if true a collision point with AI Objects is calculated bool _report_impact; // if true an impact point on the terrain is calculated @@ -211,15 +208,10 @@ private: //SGPropertyNode_ptr _p_spd_node; double _fuse_range; - double _distance; - double _dt_count; - double _next_run; - - string _submodel; - string _force_path; - string _contents_path; - const SGMaterial* _material; + std::string _submodel; + std::string _force_path; + std::string _contents_path; void handle_collision(); void handle_expiry(); @@ -232,7 +224,6 @@ private: //void setOffsetPos(SGGeod pos, double heading, double pitch, double roll); //void setOffsetVelocity(double dt, SGGeod pos); - SGVec3d getCartUserPos() const; SGVec3d getCartOffsetPos(SGGeod pos, double heading, double pitch, double roll) const; //double getDistanceLoadToHitch() const; @@ -243,7 +234,6 @@ private: double _ground_offset; double _load_offset; - double _old_height; SGVec3d _oldcartoffsetPos; SGVec3d _oldcartPos;