X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIManager.hxx;h=d08bf17f0a4eebb5dc2f003345edd0f6e771000d;hb=ff985e43df33be1698b994f6e0ee1f6e573ba390;hp=17959776984fcd46293ddf719640d43a56204e5a;hpb=bec023b43c8d3863a288227cf8432f884000f719;p=flightgear.git

diff --git a/src/AIModel/AIManager.hxx b/src/AIModel/AIManager.hxx
index 179597769..d08bf17f0 100644
--- a/src/AIModel/AIManager.hxx
+++ b/src/AIModel/AIManager.hxx
@@ -36,7 +36,7 @@
 #include <Traffic/SchedFlight.hxx>
 #include <Traffic/Schedule.hxx>
 
-SG_USING_STD(list);
+using std::list;
 
 class FGAIThermal;
 
@@ -52,20 +52,24 @@ public:
 
     ai_list_type ai_list;
 
-    inline const list <SGSharedPtr<FGAIBase> >& get_ai_list() const { return ai_list; }
+    inline const ai_list_type& get_ai_list() const {
+        SG_LOG(SG_GENERAL, SG_DEBUG, "AI Manager: AI model return list size " << ai_list.size());
+        return ai_list;
+    }
 
     FGAIManager();
     ~FGAIManager();
 
     void init();
+    void postinit();
     void reinit();
     void bind();
     void unbind();
     void update(double dt);
-
-    void attach(SGSharedPtr<FGAIBase> model);
+    void attach(FGAIBase *model);
 
     void destroyObject( int ID );
+    const FGAIBase *calcCollision(double alt, double lat, double lon, double fuse_range);
 
     inline double get_user_latitude() const { return user_latitude; }
     inline double get_user_longitude() const { return user_longitude; }
@@ -76,15 +80,17 @@ public:
     inline double get_user_speed() const {return user_speed; }
     inline double get_wind_from_east() const {return wind_from_east; }
     inline double get_wind_from_north() const {return wind_from_north; }
+    inline double get_user_roll() const { return user_roll; }
+    inline double get_user_agl() const { return user_altitude_agl; }
 
     int getNumAiObjects(void) const;
 
     void processScenario( const string &filename );
 
-  static SGPropertyNode_ptr loadScenarioFile(const std::string& filename);
+    static SGPropertyNode_ptr loadScenarioFile(const std::string& filename);
 
-  static bool getStartPosition(const string& id, const string& pid,
-                               SGGeod& geodPos, double& hdng, SGVec3d& uvw);
+    static bool getStartPosition(const string& id, const string& pid,
+        SGGeod& geodPos, double& hdng, SGVec3d& uvw);
 
 private:
 
@@ -92,30 +98,36 @@ private:
     int mNumAiTypeModels[FGAIBase::MAX_OBJECTS];
     int mNumAiModels;
 
+    double calcRange(double lat, double lon, double lat2, double lon2)const;
+
     SGPropertyNode_ptr root;
-    SGPropertyNode_ptr wind_from_down_node;
+    SGPropertyNode_ptr thermal_lift_node;
     SGPropertyNode_ptr user_latitude_node;
     SGPropertyNode_ptr user_longitude_node;
     SGPropertyNode_ptr user_altitude_node;
+    SGPropertyNode_ptr user_altitude_agl_node;
     SGPropertyNode_ptr user_heading_node;
     SGPropertyNode_ptr user_pitch_node;
     SGPropertyNode_ptr user_yaw_node;
+    SGPropertyNode_ptr user_roll_node;
     SGPropertyNode_ptr user_speed_node;
-    SGPropertyNode_ptr wind_from_east_node ;
-    SGPropertyNode_ptr wind_from_north_node ;
-
-    string scenario_filename;
+    SGPropertyNode_ptr wind_from_east_node;
+    SGPropertyNode_ptr wind_from_north_node;
 
     double user_latitude;
     double user_longitude;
     double user_altitude;
+    double user_altitude_agl;
     double user_heading;
     double user_pitch;
     double user_yaw;
+    double user_roll;
     double user_speed;
+    double user_agl;
     double wind_from_east;
     double wind_from_north;
     double _dt;
+
     void fetchUserState( void );
 
     // used by thermals