Optimise NavCache airport query

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

diff --git a/src/AIModel/AIBallistic.hxx b/src/AIModel/AIBallistic.hxx
index fb1b4f28d4b411ebbd161b3f5ce17ace1fab78dd..e9938171266a1ad3c1fb9ea9b7e662b9312f853c 100644 (file)
--- 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:
@@ -45,11 +42,10 @@ public:
 
     bool init(bool search_in_AI_path=false);
     virtual void bind();
-    virtual void unbind();
-
-    void update(double dt);
+    virtual void reinit();
+    virtual void update(double dt);
 
-    FGAIBallistic *ballistic;
+    virtual const char* getTypeString(void) const { return "ballistic"; }
 
     void Run(double dt);
 
@@ -73,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);
@@ -114,7 +110,8 @@ public:
 //    bool getFormate() const;
     bool getSlavedLoad() const;
 
-    virtual const char* getTypeString(void) const { return "ballistic"; }
+    FGAIBallistic *ballistic;
+
     static const double slugs_to_kgs; //conversion factor
     static const double slugs_to_lbs; //conversion factor
 
@@ -170,12 +167,9 @@ public:
 
 private:
 
-    virtual void reinit() { init(); }
-
     bool   _aero_stabilised; // if true, object will align with trajectory
     double _drag_area;       // equivalent drag area in ft2
     double _life_timer;      // seconds
-    double _gravity;         // fps^2
     double _buoyancy;        // fps^2
     bool   _wind;            // if true, local wind will be applied to object
     double _Cd;              // drag coefficient
@@ -191,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
@@ -214,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();
@@ -235,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;
@@ -246,7 +234,6 @@ private:
 
     double _ground_offset;
     double _load_offset;
-    double _old_height;
 
     SGVec3d _oldcartoffsetPos;
     SGVec3d _oldcartPos;