X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIFlightPlan.cxx;h=f8f7c57636f3ec39f3de1265df69c719021480ef;hb=bcea720db3e29a62626b361f2149a7147e149f3b;hp=09d1eb746548aab78c99373fb443caa093da37f2;hpb=d47342a5a4b91ada165ae732ab2ada8334926c41;p=flightgear.git diff --git a/src/AIModel/AIFlightPlan.cxx b/src/AIModel/AIFlightPlan.cxx index 09d1eb746..f8f7c5763 100644 --- a/src/AIModel/AIFlightPlan.cxx +++ b/src/AIModel/AIFlightPlan.cxx @@ -24,7 +24,6 @@ #include #include -#include #include #include #include @@ -71,32 +70,36 @@ bool FGAIWaypoint::contains(string target) { FGAIFlightPlan::FGAIFlightPlan() { - sid = 0; - repeat = false; - distance_to_go = 0; - lead_distance = 0; - start_time = 0; - arrivalTime = 0; - leg = 10; - gateId = 0; + sid = 0; + repeat = false; + distance_to_go = 0; + lead_distance = 0; + start_time = 0; + arrivalTime = 0; + leg = 10; + gateId = 0; lastNodeVisited = 0; - taxiRoute = 0; - wpt_iterator = waypoints.begin(); - isValid = true; + taxiRoute = 0; + wpt_iterator = waypoints.begin(); + isValid = true; } FGAIFlightPlan::FGAIFlightPlan(const string& filename) { - int i; - sid = 0; - start_time = 0; - leg = 10; - gateId = 0; - taxiRoute = 0; + sid = 0; + repeat = false; + distance_to_go = 0; + lead_distance = 0; + start_time = 0; + arrivalTime = 0; + leg = 10; + gateId = 0; + lastNodeVisited = 0; + taxiRoute = 0; + SGPath path( globals->get_fg_root() ); path.append( ("/AI/FlightPlans/" + filename).c_str() ); SGPropertyNode root; - repeat = false; try { readProperties(path.str(), &root); @@ -108,7 +111,7 @@ FGAIFlightPlan::FGAIFlightPlan(const string& filename) } SGPropertyNode * node = root.getNode("flightplan"); - for (i = 0; i < node->nChildren(); i++) { + for (int i = 0; i < node->nChildren(); i++) { //cout << "Reading waypoint " << i << endl; FGAIWaypoint* wpt = new FGAIWaypoint; SGPropertyNode * wpt_node = node->getChild(i); @@ -144,45 +147,51 @@ FGAIFlightPlan::FGAIFlightPlan(const string& filename) // traffic manager. FGAIFlightPlan::FGAIFlightPlan(FGAIAircraft *ac, const std::string& p, - double course, - time_t start, - FGAirport *dep, - FGAirport *arr, - bool firstLeg, - double radius, + double course, + time_t start, + FGAirport *dep, + FGAirport *arr, + bool firstLeg, + double radius, double alt, double lat, double lon, double speed, - const string& fltType, - const string& acType, - const string& airline) + const string& fltType, + const string& acType, + const string& airline) { - sid = 0; - repeat = false; - leg = 10; - gateId=0; - taxiRoute = 0; - start_time = start; - bool useInitialWayPoint = true; - bool useCurrentWayPoint = false; + sid = 0; + repeat = false; + distance_to_go = 0; + lead_distance = 0; + start_time = start; + arrivalTime = 0; + leg = 10; + gateId = 0; + lastNodeVisited = 0; + taxiRoute = 0; + SGPath path( globals->get_fg_root() ); path.append( "/AI/FlightPlans" ); path.append( p ); SGPropertyNode root; isValid = true; + // This is a bit of a hack: // Normally the value of course will be used to evaluate whether // or not a waypoint will be used for midair initialization of // an AI aircraft. However, if a course value of 999 will be passed // when an update request is received, which will by definition always be // on the ground and should include all waypoints. - if (course == 999) - { - useInitialWayPoint = false; - useCurrentWayPoint = true; - } +// bool useInitialWayPoint = true; +// bool useCurrentWayPoint = false; +// if (course == 999) +// { +// useInitialWayPoint = false; +// useCurrentWayPoint = true; +// } if (path.exists()) { @@ -243,98 +252,8 @@ FGAIFlightPlan::FGAIFlightPlan(FGAIAircraft *ac, isValid = create(ac, dep,arr, leg, alt, speed, lat, lon, firstLeg, radius, fltType, acType, airline, dist); wpt_iterator = waypoints.begin(); - //cerr << "after create: " << (*wpt_iterator)->name << endl; - //leg++; - // Now that we have dynamically created a flight plan, - // we need to add some code that pops any waypoints already past. - //return; } - /* - waypoint* init_waypoint = new waypoint; - init_waypoint->name = string("initial position"); - init_waypoint->latitude = entity->latitude; - init_waypoint->longitude = entity->longitude; - init_waypoint->altitude = entity->altitude; - init_waypoint->speed = entity->speed; - init_waypoint->crossat = - 10000; - init_waypoint->gear_down = false; - init_waypoint->flaps_down = false; - init_waypoint->finished = false; - - wpt_vector_iterator i = waypoints.begin(); - while (i != waypoints.end()) - { - //cerr << "Checking status of each waypoint: " << (*i)->name << endl; - SGWayPoint first(init_waypoint->longitude, - init_waypoint->latitude, - init_waypoint->altitude); - SGWayPoint curr ((*i)->longitude, - (*i)->latitude, - (*i)->altitude); - double crse, crsDiff; - double dist; - curr.CourseAndDistance(first, &crse, &dist); - - dist *= SG_METER_TO_NM; - - // We're only interested in the absolute value of crsDiff - // wich should fall in the 0-180 deg range. - crsDiff = fabs(crse-course); - if (crsDiff > 180) - crsDiff = 360-crsDiff; - // These are the three conditions that we consider including - // in our flight plan: - // 1) current waypoint is less then 100 miles away OR - // 2) curren waypoint is ahead of us, at any distance - - if ((dist > 20.0) && (crsDiff > 90.0) && ((*i)->name != string ("EOF"))) - { - //useWpt = false; - // Once we start including waypoints, we have to continue, even though - // one of the following way point would suffice. - // so once is the useWpt flag is set to true, we cannot reset it to false. - //cerr << "Discarding waypoint: " << (*i)->name - // << ": Course difference = " << crsDiff - // << "Course = " << course - // << "crse = " << crse << endl; - } - else - useCurrentWayPoint = true; - - if (useCurrentWayPoint) - { - if ((dist > 100.0) && (useInitialWayPoint)) - { - //pushBackWaypoint(init_waypoint);; - waypoints.insert(i, init_waypoint); - //cerr << "Using waypoint : " << init_waypoint->name << endl; - } - //if (useInitialWayPoint) - // { - // (*i)->speed = dist; // A hack - // } - //pushBackWaypoint( wpt ); - //cerr << "Using waypoint : " << (*i)->name - // << ": course diff : " << crsDiff - // << "Course = " << course - // << "crse = " << crse << endl - // << "distance : " << dist << endl; - useInitialWayPoint = false; - i++; - } - else - { - //delete wpt; - delete *(i); - i = waypoints.erase(i); - } - - } - */ - //for (i = waypoints.begin(); i != waypoints.end(); i++) - // cerr << "Using waypoint : " << (*i)->name << endl; - //wpt_iterator = waypoints.begin(); - //cout << waypoints.size() << " waypoints read." << endl; + } @@ -359,6 +278,8 @@ FGAIWaypoint* const FGAIFlightPlan::getPreviousWaypoint( void ) const FGAIWaypoint* const FGAIFlightPlan::getCurrentWaypoint( void ) const { + if (wpt_iterator == waypoints.end()) + return 0; return *wpt_iterator; }