X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIManager.cxx;h=315920ab5ce15cb58a8b3a565fcb438d4562cc82;hb=388a0a5b6af2b91f2ed36488177813d693ed374e;hp=e0ef64813fa975a3f98bce4c99d4f486184faee3;hpb=4fa75196ce7a5eee85d2a4e607f9bef3a9c96d4a;p=flightgear.git diff --git a/src/AIModel/AIManager.cxx b/src/AIModel/AIManager.cxx index e0ef64813..315920ab5 100644 --- a/src/AIModel/AIManager.cxx +++ b/src/AIModel/AIManager.cxx @@ -18,6 +18,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +#include + +#include +#include +#include + #include
#include @@ -33,9 +39,9 @@ #include "AIStatic.hxx" #include "AIMultiplayer.hxx" #include "AITanker.hxx" - -#include - +#include "AIWingman.hxx" +#include "AIGroundVehicle.hxx" +#include "AIEscort.hxx" FGAIManager::FGAIManager() { _dt = 0.0; @@ -63,7 +69,7 @@ FGAIManager::init() { if (!enabled) return; - wind_from_down_node = fgGetNode("/environment/wind-from-down-fps", true); + thermal_lift_node = fgGetNode("/environment/thermal-lift-fps", true); wind_from_east_node = fgGetNode("/environment/wind-from-east-fps",true); wind_from_north_node = fgGetNode("/environment/wind-from-north-fps",true); @@ -73,6 +79,7 @@ FGAIManager::init() { user_heading_node = fgGetNode("/orientation/heading-deg", true); user_pitch_node = fgGetNode("/orientation/pitch-deg", true); user_yaw_node = fgGetNode("/orientation/side-slip-deg", true); + user_roll_node = fgGetNode("/orientation/roll-deg", true); user_speed_node = fgGetNode("/velocities/uBody-fps", true); } @@ -94,7 +101,7 @@ FGAIManager::postinit() { continue; } - SG_LOG(SG_GENERAL, SG_INFO, "loading scenario '" << name << '\''); + SG_LOG(SG_GENERAL, SG_ALERT, "loading scenario '" << name << '\''); processScenario(name); scenarios[name] = true; } @@ -143,7 +150,7 @@ FGAIManager::update(double dt) { tmgr->release((*ai_list_itr)->getID()); --mNumAiModels; --(mNumAiTypeModels[(*ai_list_itr)->getType()]); - FGAIBase *base = *ai_list_itr; + FGAIBase *base = (*ai_list_itr).get(); SGPropertyNode *props = base->_getProps(); props->setBoolValue("valid", false); @@ -155,14 +162,12 @@ FGAIManager::update(double dt) { props->setIntValue("id", -1); props->setBoolValue("radar/in-range", false); props->setIntValue("refuel/tanker", false); - props->setStringValue("sim/multiplay/chat", ""); - props->setStringValue("sim/multiplay/transmission-freq-hz", ""); ai_list_itr = ai_list.erase(ai_list_itr); } else { fetchUserState(); if ((*ai_list_itr)->isa(FGAIBase::otThermal)) { - FGAIBase *base = *ai_list_itr; + FGAIBase *base = (*ai_list_itr).get(); processThermal((FGAIThermal*)base); } else { (*ai_list_itr)->update(_dt); @@ -171,11 +176,11 @@ FGAIManager::update(double dt) { } } - wind_from_down_node->setDoubleValue( strength ); // for thermals + thermal_lift_node->setDoubleValue( strength ); // for thermals } void -FGAIManager::attach(SGSharedPtr model) +FGAIManager::attach(FGAIBase *model) { //unsigned idx = mNumAiTypeModels[model->getType()]; const char* typeString = model->getTypeString(); @@ -240,6 +245,7 @@ FGAIManager::fetchUserState( void ) { user_pitch = user_pitch_node->getDoubleValue(); user_yaw = user_yaw_node->getDoubleValue(); user_speed = user_speed_node->getDoubleValue() * 0.592484; + user_roll = user_roll_node->getDoubleValue(); wind_from_east = wind_from_east_node->getDoubleValue(); wind_from_north = wind_from_north_node->getDoubleValue(); } @@ -256,6 +262,8 @@ FGAIManager::processThermal( FGAIThermal* thermal ) { } + + void FGAIManager::processScenario( const string &filename ) { @@ -276,11 +284,17 @@ FGAIManager::processScenario( const string &filename ) { continue; std::string type = scEntry->getStringValue("type", "aircraft"); - if (type == "tanker") { // refueling scenarios - FGAITanker* tanker = new FGAITanker; + if (type == "tanker") { // refueling scenarios + FGAITanker* tanker = new FGAITanker; tanker->readFromScenario(scEntry); attach(tanker); - } else if (type == "aircraft") { + + } else if (type == "wingman") { + FGAIWingman* wingman = new FGAIWingman; + wingman->readFromScenario(scEntry); + attach(wingman); + + } else if (type == "aircraft") { FGAIAircraft* aircraft = new FGAIAircraft; aircraft->readFromScenario(scEntry); attach(aircraft); @@ -295,6 +309,16 @@ FGAIManager::processScenario( const string &filename ) { carrier->readFromScenario(scEntry); attach(carrier); + } else if (type == "groundvehicle") { + FGAIGroundVehicle* groundvehicle = new FGAIGroundVehicle; + groundvehicle->readFromScenario(scEntry); + attach(groundvehicle); + + } else if (type == "escort") { + FGAIEscort* escort = new FGAIEscort; + escort->readFromScenario(scEntry); + attach(escort); + } else if (type == "thunderstorm") { FGAIStorm* storm = new FGAIStorm; storm->readFromScenario(scEntry); @@ -314,9 +338,10 @@ FGAIManager::processScenario( const string &filename ) { FGAIStatic* aistatic = new FGAIStatic; aistatic->readFromScenario(scEntry); attach(aistatic); - } + } + } SGPropertyNode_ptr @@ -328,7 +353,7 @@ FGAIManager::loadScenarioFile(const std::string& filename) SGPropertyNode_ptr root = new SGPropertyNode; readProperties(path.str(), root); return root; - } catch (const sg_exception &e) { + } catch (const sg_exception &) { SG_LOG(SG_GENERAL, SG_DEBUG, "Incorrect path specified for AI " "scenario: \"" << path.str() << "\""); return 0; @@ -378,9 +403,8 @@ const FGAIBase * FGAIManager::calcCollision(double alt, double lat, double lon, double fuse_range) { // we specify tgt extent (ft) according to the AIObject type - double tgt_ht[] = {0, 50 ,100, 250, 0, 100, 0, 0, 50, 50}; - double tgt_length[] = {0, 100, 200, 750, 0, 50, 0, 0, 200, 100}; - + double tgt_ht[] = {0, 50, 100, 250, 0, 100, 0, 0, 50, 50, 20, 100, 50}; + double tgt_length[] = {0, 100, 200, 750, 0, 50, 0, 0, 200, 100, 40, 200, 100}; ai_list_iterator ai_list_itr = ai_list.begin(); ai_list_iterator end = ai_list.end(); @@ -390,14 +414,14 @@ FGAIManager::calcCollision(double alt, double lat, double lon, double fuse_range tgt_ht[type] += fuse_range; if (fabs(tgt_alt - alt) > tgt_ht[type] || type == FGAIBase::otBallistic - || type == FGAIBase::otStorm || type == FGAIBase::otThermal) { - SG_LOG(SG_GENERAL, SG_DEBUG, "AIManager: skipping " - << fabs(tgt_alt - alt) - << " " - << type - ); - ++ai_list_itr; - continue; + || type == FGAIBase::otStorm || type == FGAIBase::otThermal ) { + //SG_LOG(SG_GENERAL, SG_DEBUG, "AIManager: skipping " + // << fabs(tgt_alt - alt) + // << " " + // << type + // ); + ++ai_list_itr; + continue; } double tgt_lat = (*ai_list_itr)->_getLatitude(); @@ -406,14 +430,14 @@ FGAIManager::calcCollision(double alt, double lat, double lon, double fuse_range double range = calcRange(lat, lon, tgt_lat, tgt_lon); - SG_LOG(SG_GENERAL, SG_DEBUG, "AIManager: AI list size " - << ai_list.size() - << " type " << type - << " ID " << id - << " range " << range - //<< " bearing " << bearing - << " alt " << tgt_alt - ); + //SG_LOG(SG_GENERAL, SG_DEBUG, "AIManager: AI list size " + // << ai_list.size() + // << " type " << type + // << " ID " << id + // << " range " << range + // //<< " bearing " << bearing + // << " alt " << tgt_alt + // ); tgt_length[type] += fuse_range; @@ -424,7 +448,7 @@ FGAIManager::calcCollision(double alt, double lat, double lon, double fuse_range << " range " << range << " alt " << tgt_alt ); - return *ai_list_itr; + return (*ai_list_itr).get(); } ++ai_list_itr; }