Move some code from the header file to the source file.

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

diff --git a/src/AIModel/AIManager.hxx b/src/AIModel/AIManager.hxx
index d208ace8c0f53cbbbe997e387f0fdc15f203f074..5c951912e645e824a4395428c45bec5512cb6cc5 100644 (file)
--- a/src/AIModel/AIManager.hxx
+++ b/src/AIModel/AIManager.hxx
@@ -27,6 +27,7 @@
 
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/structure/SGSharedPtr.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/fg_props.hxx>
 
@@ -36,7 +37,7 @@
 #include <Traffic/SchedFlight.hxx>
 #include <Traffic/Schedule.hxx>
 
-SG_USING_STD(list);
+using std::list;
 
 class FGAIThermal;
 
@@ -52,7 +53,7 @@ public:
 
     ai_list_type ai_list;
 
-    inline const list <SGSharedPtr<FGAIBase> >& get_ai_list() const {
+    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;
     }
@@ -66,7 +67,8 @@ public:
     void bind();
     void unbind();
     void update(double dt);
-    void attach(SGSharedPtr<FGAIBase> model);
+    void updateLOD(SGPropertyNode* node);
+    void attach(FGAIBase *model);
 
     void destroyObject( int ID );
     const FGAIBase *calcCollision(double alt, double lat, double lon, double fuse_range);
@@ -81,15 +83,16 @@ public:
     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:
 
@@ -100,10 +103,11 @@ private:
     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;
@@ -115,11 +119,13 @@ private:
     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;
@@ -131,6 +137,8 @@ private:
     double strength;
     void processThermal( FGAIThermal* thermal ); 
 
+    SGPropertyChangeCallback<FGAIManager> cb_ai_bare;
+    SGPropertyChangeCallback<FGAIManager> cb_ai_detailed;
 };
 
 #endif  // _FG_AIMANAGER_HXX