X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIGroundVehicle.cxx;h=4708bd30f693c9110f817981796635b017649fbc;hb=6b1391e404b11e0d9a5bfcd11c1307e2e9531616;hp=1303b60e05a00f05358de345fe22ee24adae6047;hpb=f08012d14f6c5093ac7d849f523279233f51d90f;p=flightgear.git diff --git a/src/AIModel/AIGroundVehicle.cxx b/src/AIModel/AIGroundVehicle.cxx index 1303b60e0..4708bd30f 100644 --- a/src/AIModel/AIGroundVehicle.cxx +++ b/src/AIModel/AIGroundVehicle.cxx @@ -26,7 +26,6 @@ #include
#include -#include #include #include "AIGroundVehicle.hxx" @@ -40,11 +39,11 @@ _speed_kt(0), _range_ft(0), _relbrg (0), _parent_speed(0), -_dt_count(0), -_next_run(0), _parent_x_offset(0), _parent_y_offset(0), _parent_z_offset(0), +_dt_count(0), +_next_run(0), _break_count(0) { @@ -167,7 +166,7 @@ bool FGAIGroundVehicle::init(bool search_in_AI_path) { } void FGAIGroundVehicle::update(double dt) { - // SG_LOG(SG_GENERAL, SG_ALERT, "updating GroundVehicle: " << _name ); + // SG_LOG(SG_AI, SG_ALERT, "updating GroundVehicle: " << _name ); FGAIShip::update(dt); RunGroundVehicle(dt); @@ -232,39 +231,6 @@ void FGAIGroundVehicle::setTowAngle(double ta, double dt, double coeff){ SG_CLAMP_RANGE(_tow_angle, -limit, limit); } -bool FGAIGroundVehicle::getGroundElev(SGGeod inpos) { - - double height_m ; - - if (globals->get_scenery()->get_elevation_m(SGGeod::fromGeodM(inpos, 3000), height_m, &_material,0)){ - _ht_agl_ft = inpos.getElevationFt() - height_m * SG_METER_TO_FEET; - - if (_material) { - const vector& names = _material->get_names(); - - _solid = _material->get_solid(); - - if (!names.empty()) - props->setStringValue("material/name", names[0].c_str()); - else - props->setStringValue("material/name", ""); - - //cout << "material " << names[0].c_str() - // << " _elevation_m " << _elevation_m - // << " solid " << _solid - // << " load " << _load_resistance - // << " frictionFactor " << _frictionFactor - // << endl; - - } - - return true; - } else { - return false; - } - -} - bool FGAIGroundVehicle::getPitch() { if (!_tunnel){ @@ -285,7 +251,7 @@ bool FGAIGroundVehicle::getPitch() { double rear_elev_m = 0; double elev_front = 0; double elev_rear = 0; - double max_alt = 10000; + //double max_alt = 10000; if (globals->get_scenery()->get_elevation_m(SGGeod::fromGeodM(geodFront, 3000), elev_front, &_material, 0)){ @@ -314,7 +280,7 @@ bool FGAIGroundVehicle::getPitch() { } else { - if (prev->altitude == 0 || curr->altitude == 0) return false; + if (prev->getAltitude() == 0 || curr->getAltitude() == 0) return false; static double distance; static double d_alt; @@ -323,20 +289,20 @@ bool FGAIGroundVehicle::getPitch() { if (_new_waypoint){ //cout << "new waypoint, calculating pitch " << endl; - curr_alt = curr->altitude; - prev_alt = prev->altitude; + curr_alt = curr->getAltitude(); + prev_alt = prev->getAltitude(); //cout << "prev_alt" <altitude; - distance = SGGeodesy::distanceM(SGGeod::fromDeg(prev->longitude, prev->latitude), - SGGeod::fromDeg(curr->longitude, curr->latitude)); + distance = SGGeodesy::distanceM(SGGeod::fromDeg(prev->getLongitude(), prev->getLatitude()), + SGGeod::fromDeg(curr->getLongitude(), curr->getLatitude())); _pitch = atan2(d_alt, distance * SG_METER_TO_FEET) * SG_RADIANS_TO_DEGREES; //cout << "new waypoint, calculating pitch " << _pitch << // " " << _pitch_offset << " " << _elevation <longitude, curr->latitude)); + SGGeod::fromDeg(curr->getLongitude(), curr->getLatitude())); /*cout << "tunnel " << _tunnel << " distance prev & curr " << prev->name << " " << curr->name << " " << distance * SG_METER_TO_FEET @@ -351,62 +317,9 @@ bool FGAIGroundVehicle::getPitch() { } - //getGroundElev(pos); - return true; } -//void FGAIGroundVehicle::setParentNode() { -// -// if(_parent == "") -// return; -// -// const SGPropertyNode_ptr ai = fgGetNode("/ai/models", true); -// -// for (int i = ai->nChildren() - 1; i >= -1; i--) { -// SGPropertyNode_ptr model; -// -// if (i < 0) { // last iteration: selected model -// model = _selected_ac; -// } else { -// model = ai->getChild(i); -// string path = ai->getPath(); -// const string name = model->getStringValue("name"); -// -// if (!model->nChildren()){ -// continue; -// } -// if (name == _parent) { -// _selected_ac = model; // save selected model for last iteration -// break; -// } -// -// } -// if (!model) -// continue; -// -// }// end for loop -// -// if (_selected_ac != 0){ -// const string name = _selected_ac->getStringValue("name"); -// //_parent_x_offset = _selected_ac->getDoubleValue("hitch/x-offset-ft"); -// //_parent_y_offset = _selected_ac->getDoubleValue("hitch/y-offset-ft"); -// //_parent_z_offset = _selected_ac->getDoubleValue("hitch/z-offset-ft"); -// //_hitch_x_offset_m = _selected_ac->getDoubleValue("hitch/x-offset-ft") -// // * SG_FEET_TO_METER; -// //_hitch_y_offset_m = _selected_ac->getDoubleValue("hitch/y-offset-ft") -// // * SG_FEET_TO_METER; -// //_hitch_z_offset_m = _selected_ac->getDoubleValue("hitch/z-offset-ft") -// // * SG_FEET_TO_METER; -// //setParent(); -// } else { -// SG_LOG(SG_GENERAL, SG_ALERT, "AIGroundVeh1cle: " << _name -// << " parent not found: dying "); -// setDie(true); -// } -// -//} - void FGAIGroundVehicle::setParent(){ double lat = _selected_ac->getDoubleValue("position/latitude-deg"); @@ -444,12 +357,6 @@ void FGAIGroundVehicle::calcRangeBearing(double lat, double lon, double lat2, do range = distance * SG_METER_TO_NM; } -double FGAIGroundVehicle::calcRelBearingDeg(double bearing, double heading) -{ - double angle = bearing - heading; - SG_NORMALIZE_RANGE(angle, -180.0, 180.0); - return angle; -} SGVec3d FGAIGroundVehicle::getCartHitchPosAt(const SGVec3d& _off) const { double hdg = _selected_ac->getDoubleValue("orientation/true-heading-deg"); @@ -478,13 +385,13 @@ void FGAIGroundVehicle::AdvanceFP(){ double count = 0; string parent_next_name =_selected_ac->getStringValue("waypoint/name-next"); - while(fp->getNextWaypoint() != 0 && fp->getNextWaypoint()->name != "END" && count < 5){ - SG_LOG(SG_GENERAL, SG_DEBUG, "AIGroundVeh1cle: " << _name + while(fp->getNextWaypoint() != 0 && fp->getNextWaypoint()->getName() != "END" && count < 5){ + SG_LOG(SG_AI, SG_DEBUG, "AIGroundVeh1cle: " << _name <<" advancing waypoint to: " << parent_next_name); - if (fp->getNextWaypoint()->name == parent_next_name){ - SG_LOG(SG_GENERAL, SG_DEBUG, "AIGroundVeh1cle: " << _name - << " not setting waypoint already at: " << fp->getNextWaypoint()->name); + if (fp->getNextWaypoint()->getName() == parent_next_name){ + SG_LOG(SG_AI, SG_DEBUG, "AIGroundVeh1cle: " << _name + << " not setting waypoint already at: " << fp->getNextWaypoint()->getName()); return; } @@ -493,9 +400,9 @@ void FGAIGroundVehicle::AdvanceFP(){ curr = fp->getCurrentWaypoint(); next = fp->getNextWaypoint(); - if (fp->getNextWaypoint()->name == parent_next_name){ - SG_LOG(SG_GENERAL, SG_DEBUG, "AIGroundVeh1cle: " << _name - << " waypoint set to: " << fp->getNextWaypoint()->name); + if (fp->getNextWaypoint()->getName() == parent_next_name){ + SG_LOG(SG_AI, SG_DEBUG, "AIGroundVeh1cle: " << _name + << " waypoint set to: " << fp->getNextWaypoint()->getName()); return; } @@ -503,15 +410,15 @@ void FGAIGroundVehicle::AdvanceFP(){ }// end while loop - while(fp->getPreviousWaypoint() != 0 && fp->getPreviousWaypoint()->name != "END" + while(fp->getPreviousWaypoint() != 0 && fp->getPreviousWaypoint()->getName() != "END" && count > -10){ - SG_LOG(SG_GENERAL, SG_DEBUG, "AIGroundVeh1cle: " << _name + SG_LOG(SG_AI, SG_DEBUG, "AIGroundVeh1cle: " << _name << " retreating waypoint to: " << parent_next_name - << " at: " << fp->getNextWaypoint()->name); + << " at: " << fp->getNextWaypoint()->getName()); - if (fp->getNextWaypoint()->name == parent_next_name){ - SG_LOG(SG_GENERAL, SG_DEBUG, "AIGroundVeh1cle: " << _name - << " not setting waypoint already at:" << fp->getNextWaypoint()->name ); + if (fp->getNextWaypoint()->getName() == parent_next_name){ + SG_LOG(SG_AI, SG_DEBUG, "AIGroundVeh1cle: " << _name + << " not setting waypoint already at:" << fp->getNextWaypoint()->getName() ); return; } @@ -520,9 +427,9 @@ void FGAIGroundVehicle::AdvanceFP(){ curr = fp->getCurrentWaypoint(); next = fp->getNextWaypoint(); - if (fp->getNextWaypoint()->name == parent_next_name){ - SG_LOG(SG_GENERAL, SG_DEBUG, "AIGroundVeh1cle: " << _name - << " waypoint set to: " << fp->getNextWaypoint()->name); + if (fp->getNextWaypoint()->getName() == parent_next_name){ + SG_LOG(SG_AI, SG_DEBUG, "AIGroundVeh1cle: " << _name + << " waypoint set to: " << fp->getNextWaypoint()->getName()); return; } @@ -533,7 +440,7 @@ void FGAIGroundVehicle::AdvanceFP(){ void FGAIGroundVehicle::setTowSpeed(){ - double diff = _range_ft - _x_offset; + //double diff = _range_ft - _x_offset; double x = 0; if (_range_ft > _x_offset * 3) x = 50; @@ -581,7 +488,7 @@ void FGAIGroundVehicle::RunGroundVehicle(double dt){ } if(_parent == ""){ - AccelTo(prev->speed); + AccelTo(prev->getSpeed()); _dt_count = 0; return; } @@ -590,10 +497,10 @@ void FGAIGroundVehicle::RunGroundVehicle(double dt){ string parent_next_name = _selected_ac->getStringValue("waypoint/name-next"); bool parent_waiting = _selected_ac->getBoolValue("waypoint/waiting"); - bool parent_restart = _selected_ac->getBoolValue("controls/restart"); + //bool parent_restart = _selected_ac->getBoolValue("controls/restart"); - if (parent_next_name == "END" && fp->getNextWaypoint()->name != "END" ){ - SG_LOG(SG_GENERAL, SG_DEBUG, "AIGroundVeh1cle: " << _name + if (parent_next_name == "END" && fp->getNextWaypoint()->getName() != "END" ){ + SG_LOG(SG_AI, SG_DEBUG, "AIGroundVeh1cle: " << _name << " setting END: getting new waypoints "); AdvanceFP(); setWPNames(); @@ -601,21 +508,21 @@ void FGAIGroundVehicle::RunGroundVehicle(double dt){ if(_restart) _missed_count = 200; /*} else if (parent_next_name == "WAIT" && fp->getNextWaypoint()->name != "WAIT" ){*/ } else if (parent_waiting && !_waiting){ - SG_LOG(SG_GENERAL, SG_DEBUG, "AIGroundVeh1cle: " << _name + SG_LOG(SG_AI, SG_DEBUG, "AIGroundVeh1cle: " << _name << " setting WAIT/WAITUNTIL: getting new waypoints "); AdvanceFP(); setWPNames(); _waiting = true; - } else if (parent_next_name != "WAIT" && fp->getNextWaypoint()->name == "WAIT"){ - SG_LOG(SG_GENERAL, SG_DEBUG, "AIGroundVeh1cle: " << _name + } else if (parent_next_name != "WAIT" && fp->getNextWaypoint()->getName() == "WAIT"){ + SG_LOG(SG_AI, SG_DEBUG, "AIGroundVeh1cle: " << _name << " wait done: getting new waypoints "); _waiting = false; _wait_count = 0; fp->IncrementWaypoint(false); next = fp->getNextWaypoint(); - if (next->name == "WAITUNTIL" || next->name == "WAIT" - || next->name == "END"){ + if (next->getName() == "WAITUNTIL" || next->getName() == "WAIT" + || next->getName() == "END"){ } else { prev = curr; fp->IncrementWaypoint(false); @@ -626,7 +533,7 @@ void FGAIGroundVehicle::RunGroundVehicle(double dt){ setWPNames(); } else if (_range_ft > (_x_offset +_parent_x_offset)* 4 ){ - SG_LOG(SG_GENERAL, SG_ALERT, "AIGroundVeh1cle: " << _name + SG_LOG(SG_AI, SG_ALERT, "AIGroundVeh1cle: " << _name << " rescue: reforming train " << _range_ft );