Durk Talsma:

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

diff --git a/src/AIModel/AIManager.hxx b/src/AIModel/AIManager.hxx
index 4dfe74932d16018dd5bb505521caa4e0289f4279..86eaab9a1b9fe5971bb75d8e4e564b00e4bd351a 100644 (file)
--- a/src/AIModel/AIManager.hxx
+++ b/src/AIModel/AIManager.hxx
@@ -1,4 +1,4 @@
-// AIManager.hxx - experimental! - David Culp - based on:
+// AIManager.hxx - David Culp - based on:
 // AIMgr.hxx - definition of FGAIMgr 
 // - a global management class for FlightGear generated AI traffic
 //
@@ -69,7 +69,6 @@ private:
     // Everything put in this list should be created dynamically
     // on the heap and ***DELETED WHEN REMOVED!!!!!***
     ai_list_type ai_list;
-    ai_list_iterator ai_list_itr;
   ModelVec loadedModels;
 
 public:
@@ -78,6 +77,7 @@ public:
     ~FGAIManager();
 
     void init();
+    void reinit();
     void bind();
     void unbind();
     void update(double dt);
@@ -88,8 +88,9 @@ public:
     void* createStorm( FGAIModelEntity *entity );
     void* createShip( FGAIModelEntity *entity );
     void* createCarrier( FGAIModelEntity *entity );
+    void* createStatic( FGAIModelEntity *entity );
 
-    void destroyObject( void* ID );
+    void destroyObject( int ID );
 
     inline double get_user_latitude() { return user_latitude; }
     inline double get_user_longitude() { return user_longitude; }
@@ -98,16 +99,21 @@ public:
     inline double get_user_pitch() { return user_pitch; }
     inline double get_user_yaw() { return user_yaw; }
     inline double get_user_speed() {return user_speed; }
+    inline double get_wind_from_east() {return wind_from_east; }
+    inline double get_wind_from_north() {return wind_from_north; }
 
     inline int getNum( FGAIBase::object_type ot ) {
       return (0 < ot && ot < FGAIBase::MAX_OBJECTS) ? numObjects[ot] : numObjects[0];
     }
 
-    void processScenario( string &filename );
+    void processScenario( const string &filename );
 
   ssgBranch * getModel(const string& path);
   void setModel(const string& path, ssgBranch *model);
 
+  static bool getStartPosition(const string& id, const string& pid,
+                               Point3D& geodPos, double& hdng, sgdVec3 uvw);
+
 private:
 
     bool initDone;
@@ -115,6 +121,16 @@ private:
     int numObjects[FGAIBase::MAX_OBJECTS];
     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 user_latitude;
@@ -124,6 +140,8 @@ private:
     double user_pitch;
     double user_yaw;
     double user_speed;
+    double wind_from_east;
+    double wind_from_north;
     double _dt;
     int dt_count;
     void fetchUserState( void );