X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIManager.cxx;h=4190981124242bea13257c082babf70a59c18b60;hb=38226af24ec01e8f0a20d7fd73ef838a69f6ef25;hp=6d9a3cf5ac7f1771cc73d5a461422ab699271255;hpb=ba8ed137cfd05f3112592ee2c87be08d4a2123c7;p=flightgear.git diff --git a/src/AIModel/AIManager.cxx b/src/AIModel/AIManager.cxx index 6d9a3cf5a..419098112 100644 --- a/src/AIModel/AIManager.cxx +++ b/src/AIModel/AIManager.cxx @@ -2,7 +2,7 @@ // - a global management type for AI objects // // Written by David Culp, started October 2003. -// - davidculp2@comcast.net +// - davidculp2@comcast.net // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as @@ -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,35 +69,49 @@ 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); user_latitude_node = fgGetNode("/position/latitude-deg", true); user_longitude_node = fgGetNode("/position/longitude-deg", true); user_altitude_node = fgGetNode("/position/altitude-ft", true); + user_altitude_agl_node = fgGetNode("/position/altitude-agl-ft", true); 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); } void FGAIManager::postinit() { // postinit, so that it can access the Nasal subsystem - 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.empty()) - processScenario( scenario_filename ); + map scenarios; + for (int i = 0 ; i < root->nChildren() ; i++) { + SGPropertyNode *n = root->getChild(i); + if (strcmp(n->getName(), "scenario")) + continue; + + string name = n->getStringValue(); + if (name.empty()) + continue; + + if (scenarios.find(name) != scenarios.end()) { + SG_LOG(SG_GENERAL, SG_DEBUG, "won't load scenario '" << name << "' twice"); + continue; } + + SG_LOG(SG_GENERAL, SG_ALERT, "loading scenario '" << name << '\''); + processScenario(name); + scenarios[name] = true; } } void FGAIManager::reinit() { update(0.0); + ai_list_iterator ai_list_itr = ai_list.begin(); while(ai_list_itr != ai_list.end()) { @@ -132,7 +152,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); @@ -149,7 +169,7 @@ FGAIManager::update(double dt) { } 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); @@ -158,11 +178,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(); @@ -220,6 +240,7 @@ FGAIManager::getNumAiObjects(void) const void FGAIManager::fetchUserState( void ) { + user_latitude = user_latitude_node->getDoubleValue(); user_longitude = user_longitude_node->getDoubleValue(); user_altitude = user_altitude_node->getDoubleValue(); @@ -227,8 +248,11 @@ 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(); + wind_from_north = wind_from_north_node->getDoubleValue(); + user_altitude_agl = user_altitude_agl_node->getDoubleValue(); + } // only keep the results from the nearest thermal @@ -243,6 +267,8 @@ FGAIManager::processThermal( FGAIThermal* thermal ) { } + + void FGAIManager::processScenario( const string &filename ) { @@ -263,11 +289,17 @@ FGAIManager::processScenario( const string &filename ) { continue; std::string type = scEntry->getStringValue("type", "aircraft"); - if (type == "tanker") { // refueling scenarios - FGAITanker* aircraft = new FGAITanker; - aircraft->readFromScenario(scEntry); - attach(aircraft); - } else if (type == "aircraft") { + if (type == "tanker") { // refueling scenarios + FGAITanker* tanker = new FGAITanker; + tanker->readFromScenario(scEntry); + attach(tanker); + + } 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); @@ -282,6 +314,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); @@ -301,9 +343,10 @@ FGAIManager::processScenario( const string &filename ) { FGAIStatic* aistatic = new FGAIStatic; aistatic->readFromScenario(scEntry); attach(aistatic); - } + } + } SGPropertyNode_ptr @@ -315,7 +358,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; @@ -365,9 +408,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(); @@ -377,14 +419,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(); @@ -393,14 +435,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; @@ -411,7 +453,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; }