X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIManager.hxx;h=8f582801afee5880e9060b7992b3ff7e6ac78929;hb=8112ff5842d24ac12dbeeaaa02b981d24ebbf339;hp=2153111c7444fb37547578233291aceb3e778119;hpb=479d4d7484f6aabd4f4e5bb5ece9c6499272ed51;p=flightgear.git

diff --git a/src/AIModel/AIManager.hxx b/src/AIModel/AIManager.hxx
index 2153111c7..8f582801a 100644
--- a/src/AIModel/AIManager.hxx
+++ b/src/AIModel/AIManager.hxx
@@ -26,7 +26,6 @@
 #include <list>
 
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/structure/ssgSharedPtr.hxx>
 #include <simgear/structure/SGSharedPtr.hxx>
 
 #include <Main/fg_props.hxx>
@@ -37,30 +36,14 @@
 #include <Traffic/SchedFlight.hxx>
 #include <Traffic/Schedule.hxx>
 
-SG_USING_STD(list);
-SG_USING_STD(vector);
-
-class FGModelID
-{
-private:
-  ssgSharedPtr<ssgBranch> model;
-  string path;
-public:
-  FGModelID(const string& pth, ssgBranch * mdl) { path =pth; model=mdl;};
-  ssgBranch * const getModelId() const { return model;};
-  const string & getPath() const { return path;};
-};
-
-typedef vector<FGModelID> ModelVec;
-typedef vector<FGModelID>::const_iterator ModelVecIterator;
+using std::list;
 
 class FGAIThermal;
 
-
 class FGAIManager : public SGSubsystem
 {
 
-private:
+public:
 
     // A list of pointers to AI objects
     typedef list <SGSharedPtr<FGAIBase> > ai_list_type;
@@ -68,22 +51,25 @@ private:
     typedef ai_list_type::const_iterator ai_list_const_iterator;
 
     ai_list_type ai_list;
-  ModelVec loadedModels;
 
-public:
+    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; }
@@ -94,14 +80,12 @@ 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; }
 
     int getNumAiObjects(void) const;
 
     void processScenario( const string &filename );
 
-  ssgBranch * getModel(const string& path) const;
-  void setModel(const string& path, ssgBranch *model);
-
   static SGPropertyNode_ptr loadScenarioFile(const std::string& filename);
 
   static bool getStartPosition(const string& id, const string& pid,
@@ -113,19 +97,20 @@ private:
     int mNumAiTypeModels[FGAIBase::MAX_OBJECTS];
     int mNumAiModels;
 
-    SGPropertyNode* root;
-    SGPropertyNode* wind_from_down_node;
-    SGPropertyNode* user_latitude_node;
-    SGPropertyNode* user_longitude_node;
-    SGPropertyNode* user_altitude_node;
-    SGPropertyNode* user_heading_node;
-    SGPropertyNode* user_pitch_node;
-    SGPropertyNode* user_yaw_node;
-    SGPropertyNode* user_speed_node;
-    SGPropertyNode* wind_from_east_node ;
-    SGPropertyNode* wind_from_north_node ;
-
-    string scenario_filename;
+    double calcRange(double lat, double lon, double lat2, double lon2)const;
+
+    SGPropertyNode_ptr root;
+    SGPropertyNode_ptr thermal_lift_node;
+    SGPropertyNode_ptr user_latitude_node;
+    SGPropertyNode_ptr user_longitude_node;
+    SGPropertyNode_ptr user_altitude_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;
 
     double user_latitude;
     double user_longitude;
@@ -133,10 +118,12 @@ private:
     double user_heading;
     double user_pitch;
     double user_yaw;
+    double user_roll;
     double user_speed;
     double wind_from_east;
     double wind_from_north;
     double _dt;
+
     void fetchUserState( void );
 
     // used by thermals