David Culp:

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

diff --git a/src/AIModel/AIManager.cxx b/src/AIModel/AIManager.cxx
index 3fe490b86d4fc60c161e6177ee377e13d23cfd59..88d4c04aae8f5c3b18c89ba7edf648fd5bfbfb4d 100644 (file)
--- a/src/AIModel/AIManager.cxx
+++ b/src/AIModel/AIManager.cxx
@@ -75,6 +75,9 @@ void FGAIManager::init() {
       return;
 
   wind_from_down_node = fgGetNode("/environment/wind-from-down-fps", true);
+  wind_from_east_node  = fgGetNode("/environment/wind-from-east-fps",true);
+  wind_from_north_node = fgGetNode("/environment/wind-from-north-fps",true);
+
   user_latitude_node  = fgGetNode("/position/latitude-deg", true);
   user_longitude_node = fgGetNode("/position/longitude-deg", true);
   user_altitude_node  = fgGetNode("/position/altitude-ft", true);
@@ -82,14 +85,23 @@ void FGAIManager::init() {
   user_pitch_node     = fgGetNode("/orientation/pitch-deg", true);
   user_yaw_node       = fgGetNode("/orientation/side-slip-deg", true);
   user_speed_node     = fgGetNode("/velocities/uBody-fps", true);
- 
-  scenario_filename = root->getNode("scenario", true)->getStringValue();
-  if (scenario_filename != "") processScenario( scenario_filename );
 
+  for(int i = 0 ; i < root->nChildren() ; i++) {
+    SGPropertyNode *aiEntry = root->getChild( i );
+       if( !strcmp( aiEntry->getName(), "scenario" ) ) {
+      scenario_filename = aiEntry->getStringValue();
+      if (scenario_filename != "") processScenario( scenario_filename );
+       }
+  }
   initDone = true;
 }
 
 
+void FGAIManager::reinit() {
+   update(0.0);
+}
+
+
 void FGAIManager::bind() {
    root = globals->get_props()->getNode("ai/models", true);
    root->tie("count", SGRawValuePointer<int>(&numObjects[0]));
@@ -164,8 +176,8 @@ FGAIManager::createAircraft( FGAIModelEntity *entity,   FGAISchedule *ref) {
         } else {
           ai_plane->SetPerformance(&FGAIAircraft::settings[FGAIAircraft::JET_TRANSPORT]);
         }
-       ai_plane->setAcType(entity->acType);
-       ai_plane->setCompany(entity->company);
+        ai_plane->setAcType(entity->acType);
+        ai_plane->setCompany(entity->company);
         ai_plane->setHeading(entity->heading);
         ai_plane->setSpeed(entity->speed);
         ai_plane->setPath(entity->path.c_str());
@@ -200,7 +212,7 @@ FGAIManager::createShip( FGAIModelEntity *entity ) {
         ai_ship->setAltitude(entity->altitude);
         ai_ship->setLongitude(entity->longitude);
         ai_ship->setLatitude(entity->latitude);
-        ai_ship->setBank(entity->rudder);
+        ai_ship->setRudder(entity->rudder);
         ai_ship->setName(entity->name);
 
         if ( entity->fp ) {
@@ -227,7 +239,7 @@ FGAIManager::createCarrier( FGAIModelEntity *entity ) {
         ai_carrier->setAltitude(entity->altitude);
         ai_carrier->setLongitude(entity->longitude);
         ai_carrier->setLatitude(entity->latitude);
-        ai_carrier->setBank(entity->rudder);
+        ai_carrier->setRudder(entity->rudder);
         ai_carrier->setSolidObjects(entity->solid_objects);
         ai_carrier->setWireObjects(entity->wire_objects);
         ai_carrier->setCatapultObjects(entity->catapult_objects);
@@ -236,6 +248,14 @@ FGAIManager::createCarrier( FGAIModelEntity *entity ) {
         ai_carrier->setSign(entity->pennant_number);
         ai_carrier->setName(entity->name);
         ai_carrier->setFlolsOffset(entity->flols_offset);
+        ai_carrier->setWind_from_east(entity->wind_from_east);
+        ai_carrier->setWind_from_north(entity->wind_from_north);
+        ai_carrier->setTACANChannelID(entity->TACAN_channel_ID);
+        ai_carrier->setMaxLat(entity->max_lat);
+        ai_carrier->setMinLat(entity->min_lat);
+        ai_carrier->setMaxLong(entity->max_long);
+        ai_carrier->setMinLong(entity->min_long);
+        
 
         if ( entity->fp ) {
            ai_carrier->setFlightPlan(entity->fp);
@@ -287,7 +307,7 @@ FGAIManager::createStorm( FGAIModelEntity *entity ) {
         ai_storm->setAltitude(entity->altitude); 
         ai_storm->setDiameter(entity->diameter / 6076.11549); 
         ai_storm->setHeight(entity->height_msl); 
-        ai_storm->setStrengthNorm(entity->strength); 
+        ai_storm->setStrengthNorm(entity->turb_strength); 
         ai_storm->setLongitude(entity->longitude);
         ai_storm->setLatitude(entity->latitude);
         ai_storm->init();
@@ -332,7 +352,7 @@ FGAIManager::createStatic( FGAIModelEntity *entity ) {
         return ai_static;
 }
 
-void FGAIManager::destroyObject( void* ID ) {
+void FGAIManager::destroyObject( int ID ) {
         ai_list_iterator ai_list_itr = ai_list.begin();
         while(ai_list_itr != ai_list.end()) {
             if ((*ai_list_itr)->getID() == ID) {
@@ -357,6 +377,10 @@ void FGAIManager::fetchUserState( void ) {
      user_pitch     = user_pitch_node->getDoubleValue();
      user_yaw       = user_yaw_node->getDoubleValue();
      user_speed     = user_speed_node->getDoubleValue() * 0.592484;
+     wind_from_east = wind_from_east_node->getDoubleValue();
+     wind_from_north = wind_from_north_node->getDoubleValue();
+     
+     
 }
 
 
@@ -373,7 +397,7 @@ void FGAIManager::processThermal( FGAIThermal* thermal ) {
 void FGAIManager::processScenario( const string &filename ) {
   FGAIScenario* s = new FGAIScenario( filename );
   for (int i=0;i<s->nEntries();i++) {
-    FGAIModelEntity* en = s->getNextEntry();
+   FGAIModelEntity* const en = s->getNextEntry();
 
     if (en) {
       if ( en->m_type == "aircraft") {
@@ -406,7 +430,7 @@ void FGAIManager::processScenario( const string &filename ) {
 // This code keeps track of models that have already been loaded
 // Eventually we'd prbably need to find a way to keep track of models
 // that are unloaded again
-ssgBranch * FGAIManager::getModel(const string& path)
+ssgBranch * FGAIManager::getModel(const string& path) const
 {
   ModelVecIterator i = loadedModels.begin();
   while (i != loadedModels.end())
@@ -420,6 +444,8 @@ ssgBranch * FGAIManager::getModel(const string& path)
 
 void FGAIManager::setModel(const string& path, ssgBranch *model)
 {
+  if (model)
+    model->ref();
   loadedModels.push_back(FGModelID(path,model));
 }
 
@@ -432,32 +458,39 @@ bool FGAIManager::getStartPosition(const string& id, const string& pid,
       return 0;
 
   bool found = false;
-  string filename = root->getNode("scenario", true)->getStringValue();
-  FGAIScenario* s = new FGAIScenario( filename );
-  for (int i=0; i<s->nEntries(); i++) {
-    FGAIModelEntity* en = s->getNextEntry();
-    if (en && en->m_type == "carrier" &&
-        (en->pennant_number == id || en->name == id)) {
-      FGAICarrier* ai_carrier = new FGAICarrier(0);
-      ai_carrier->setHeading(en->heading);
-      ai_carrier->setSpeed(en->speed);
-      ai_carrier->setAltitude(en->altitude);
-      ai_carrier->setLongitude(en->longitude);
-      ai_carrier->setLatitude(en->latitude);
-      ai_carrier->setBank(en->rudder);
-      ai_carrier->setParkingPositions(en->ppositions);
-
-      if (ai_carrier->getParkPosition(pid, geodPos, heading, uvw)) {
-        delete ai_carrier;
-        found = true;
-        break;
-      }
+  for(int i = 0 ; (!found) && i < root->nChildren() ; i++) {
+    SGPropertyNode *aiEntry = root->getChild( i );
+       if( !strcmp( aiEntry->getName(), "scenario" ) ) {
+        string filename = aiEntry->getStringValue();
+        FGAIScenario* s = new FGAIScenario( filename );
+        for (int i=0; i<s->nEntries(); i++) {
+            FGAIModelEntity* en = s->getNextEntry();
+            if (en && en->m_type == "carrier" &&
+                (en->pennant_number == id || en->name == id)) {
+            FGAICarrier* ai_carrier = new FGAICarrier(0);
+            ai_carrier->setHeading(en->heading);
+            ai_carrier->setSpeed(en->speed);
+            ai_carrier->setAltitude(en->altitude);
+            ai_carrier->setLongitude(en->longitude);
+            ai_carrier->setLatitude(en->latitude);
+            ai_carrier->setBank(en->rudder);
+            ai_carrier->setParkingPositions(en->ppositions);
+      ai_carrier->setWind_from_east(en->wind_from_east);
+      ai_carrier->setWind_from_north(en->wind_from_north);
+      //ai_carrier->setTACANFreq(en->TACAN_freq);
+
+            if (ai_carrier->getParkPosition(pid, geodPos, heading, uvw)) {
+                delete ai_carrier;
+                found = true;
+                break;
+            }
 
-      delete ai_carrier;
+            delete ai_carrier;
+        }
+      }
+      delete s;
     }
   }
-  delete s;
-
   return found;
 }