fly/flightgear
1
0
Fork 0
Code Activity

ATC/Traffic doesn’t crash reset.

Browse source 
- remove some global headers from AI headers, to avoid pollution
- change how ATC owns the ‘player’ FGAIAircraft so reset works
- ensure AIAircraft controllers are cleared on unbind for reset
This commit is contained in:
James Turner 2015-12-11 12:11:46 -06:00
parent 1544641405
commit 8877b442f8
28 changed files with 150 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/AIModel/AIAircraft.cxx
View file

@ -29,6 +29,7 @@
#include <Airports/dynamics.hxx>
#include <Airports/airport.hxx>
#include <Main/util.hxx>
#include <Traffic/Schedule.hxx>
#include <simgear/structure/exception.hxx>
@ -39,7 +40,9 @@
// defined in AIShip.cxx
extern double fgIsFinite(double x);
#include "AIManager.hxx"
#include "AIAircraft.hxx"
#include "AIFlightPlan.hxx"
#include "performancedata.hxx"
#include "performancedb.hxx"
#include <signal.h>
@ -133,6 +136,12 @@ void FGAIAircraft::update(double dt) {
Transform();
}
void FGAIAircraft::unbind()
{
FGAIBase::unbind();
clearATCController();
}
void FGAIAircraft::setPerformance(const std::string& acType, const std::string& acclass)
{
static PerformanceDB perfdb; //TODO make it a global service
@ -408,6 +417,13 @@ double FGAIAircraft::calcVerticalSpeed(double vert_ft, double dist_m, double spe
return vs;
}
void FGAIAircraft::clearATCController()
{
controller = 0;
prevController = 0;
towerController = 0;
}
void FGAIAircraft::assertSpeed(double speed)
{
if ((speed < -50) || (speed > 1000)) {

14
src/AIModel/AIAircraft.hxx
View file

@ -21,16 +21,16 @@
#ifndef _FG_AIAircraft_HXX
#define _FG_AIAircraft_HXX
#include "AIManager.hxx"
#include "AIBase.hxx"
#include <Traffic/SchedFlight.hxx>
#include <Traffic/Schedule.hxx>
#include <ATC/trafficcontrol.hxx>
#include <string>
class PerformanceData;
class FGAISchedule;
class FGAIFlightPlan;
class FGATCController;
class FGATCInstruction;
class FGAIWaypoint;
class FGAIAircraft : public FGAIBase {
@ -43,6 +43,7 @@ public:
// virtual bool init(bool search_in_AI_path=false);
virtual void bind();
virtual void update(double dt);
virtual void unbind();
void setPerformance(const std::string& acType, const std::string& perfString);
// void setPerformance(PerformanceData *ps);
@ -108,12 +109,13 @@ public:
FGATCController * getATCController() { return controller; };
void clearATCController();
protected:
void Run(double dt);
private:
FGAISchedule *trafficRef;
FGATCController *controller,
FGATCController *controller,
*prevController,
*towerController; // Only needed to make a pre-announcement

1
src/AIModel/AIBallistic.cxx
View file

@ -33,6 +33,7 @@
#include <Main/util.hxx>
#include <Environment/gravity.hxx>
#include <Main/fg_props.hxx>
using namespace simgear;
using std::string;

4
src/AIModel/AIBase.cxx
View file

@ -42,11 +42,13 @@
#include <simgear/props/props.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
#include <Scenery/scenery.hxx>
#include <Scripting/NasalSys.hxx>
#include <Scripting/NasalModelData.hxx>
#include <Sound/fg_fx.hxx>
#include "AIFlightPlan.hxx"
#include "AIBase.hxx"
#include "AIManager.hxx"
@ -219,7 +221,7 @@ FGAIBase::removeModel()
return;
FGScenery* pSceneryManager = globals->get_scenery();
if (pSceneryManager)
if (pSceneryManager && pSceneryManager->get_models_branch())
{
osg::ref_ptr<osg::Object> temp = _model.get();
pSceneryManager->get_models_branch()->removeChild(aip.getSceneGraph());

4
src/AIModel/AIBase.hxx
View file

@ -33,8 +33,6 @@
#include <simgear/math/sg_geodesy.hxx>
#include <Main/fg_props.hxx>
namespace osg { class PagedLOD; }
namespace simgear {
@ -325,6 +323,8 @@ public:
std::string & getCallSign();
};
typedef SGSharedPtr<FGAIBase> FGAIBasePtr;
inline void FGAIBase::setManager(FGAIManager* mgr, SGPropertyNode* p) {
manager = mgr;
props = p;

2
src/AIModel/AICarrier.cxx
View file

@ -30,6 +30,8 @@
#include <cmath>
#include <Main/util.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
#include "AICarrier.hxx"

1
src/AIModel/AIEscort.cxx
View file

@ -32,6 +32,7 @@
#include <cmath>
#include <Main/util.hxx>
#include <Main/globals.hxx>
#include <Viewer/viewer.hxx>
#include <Scenery/scenery.hxx>

2
src/AIModel/AIFlightPlan.cxx
View file

@ -41,6 +41,8 @@
#include <Environment/environment_mgr.hxx>
#include <Environment/environment.hxx>
#include <Traffic/Schedule.hxx>
#include "AIFlightPlan.hxx"
#include "AIAircraft.hxx"

2
src/AIModel/AIFlightPlanCreate.cxx
View file

@ -38,10 +38,12 @@
#include "AIAircraft.hxx"
#include "performancedata.hxx"
#include <Main/fg_props.hxx>
#include <Environment/environment_mgr.hxx>
#include <Environment/environment.hxx>
#include <FDM/LaRCsim/basic_aero.h>
#include <Navaids/navrecord.hxx>
#include <Traffic/Schedule.hxx>
using std::string;

2
src/AIModel/AIFlightPlanCreateCruise.cxx
View file

@ -33,6 +33,8 @@
#include <Environment/environment_mgr.hxx>
#include <Environment/environment.hxx>
#include <Traffic/Schedule.hxx>
#include "AIFlightPlan.hxx"
#include "AIAircraft.hxx"
#include "performancedata.hxx"

1
src/AIModel/AIGroundVehicle.cxx
View file

@ -27,6 +27,7 @@
#include <Viewer/viewer.hxx>
#include <Scenery/scenery.hxx>
#include <Airports/dynamics.hxx>
#include <Main/globals.hxx>
#include "AIGroundVehicle.hxx"

1
src/AIModel/AIManager.cxx
View file

@ -32,6 +32,7 @@
#include <boost/foreach.hpp>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
#include <Airports/airport.hxx>
#include <Scripting/NasalSys.hxx>

12
src/AIModel/AIManager.hxx
View file

@ -28,16 +28,8 @@
#include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/structure/SGSharedPtr.hxx>
#include <simgear/props/props_io.hxx>
#include <Main/fg_props.hxx>
#include <AIModel/AIBase.hxx>
#include <AIModel/AIFlightPlan.hxx>
#include <Traffic/SchedFlight.hxx>
#include <Traffic/Schedule.hxx>
class FGAIBase;
class FGAIThermal;
typedef SGSharedPtr<FGAIBase> FGAIBasePtr;
@ -84,6 +76,8 @@ public:
* corresponding AIObject implementation, or NULL.
*/
FGAIBasePtr getObjectFromProperty(const SGPropertyNode* aProp) const;
static const char* subsystemName() { return "ai-model"; }
private:
// FGSubmodelMgr is a friend for access to the AI_list
friend class FGSubmodelMgr;

3
src/AIModel/AIMultiplayer.cxx
View file

@ -28,6 +28,9 @@
#include <string>
#include <stdio.h>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
#include "AIMultiplayer.hxx"
using std::string;

1
src/AIModel/AIShip.cxx
View file

@ -37,6 +37,7 @@
#include <simgear/scene/util/SGNodeMasks.hxx>
#include <Scenery/scenery.hxx>
#include <Main/globals.hxx>
#include "AIShip.hxx"

1
src/AIModel/AIWingman.cxx
View file

@ -23,6 +23,7 @@
#include <simgear/sg_inlines.h>
#include <Main/fg_props.hxx>
#include "AIWingman.hxx"

2
src/ATC/GroundController.cxx
View file

@ -48,6 +48,8 @@
#include <Airports/runways.hxx>
#include <Airports/groundnetwork.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
#include <AIModel/AIAircraft.hxx>
#include <AIModel/performancedata.hxx>
#include <AIModel/AIFlightPlan.hxx>

62
src/ATC/atc_mgr.cxx
View file

@ -30,6 +30,13 @@
#include <Airports/airportdynamicsmanager.hxx>
#include <Airports/airport.hxx>
#include <Scenery/scenery.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
#include <AIModel/AIAircraft.hxx>
#include <Traffic/Schedule.hxx>
#include <Traffic/SchedFlight.hxx>
#include <AIModel/AIFlightPlan.hxx>
#include "atc_mgr.hxx"
@ -74,12 +81,12 @@ void FGATCManager::init() {
double speed = fgGetDouble("/velocities/groundspeed-kt");
double aircraftRadius = 40; // note that this is currently hardcoded to a one-size-fits all JumboJet value. Should change later;
ai_ac.setCallSign ( callsign );
ai_ac.setLongitude( longitude );
ai_ac.setLatitude ( latitude );
ai_ac.setAltitude ( altitude );
ai_ac.setPerformance("", "jet_transport");
ai_ac = new FGAIAircraft;
ai_ac->setCallSign ( callsign );
ai_ac->setLongitude( longitude );
ai_ac->setLatitude ( latitude );
ai_ac->setAltitude ( altitude );
ai_ac->setPerformance("", "jet_transport");
// NEXT UP: Create a traffic Schedule and fill that with appropriate information. This we can use to flight planning.
// Note that these are currently only defaults.
@ -95,7 +102,7 @@ void FGATCManager::init() {
trafficRef->assign(flight);
FGAIFlightPlan *fp = 0;
ai_ac.setTrafficRef(trafficRef);
ai_ac->setTrafficRef(trafficRef);
string flightPlanName = airport + "-" + airport + ".xml";
//double cruiseAlt = 100; // Doesn't really matter right now.
@ -127,7 +134,7 @@ void FGATCManager::init() {
string aircraftType; // Unused.
string airline; // Currently used for gate selection, but a fallback mechanism will apply when not specified.
fp->setGate(pk);
if (!(fp->createPushBack(&ai_ac,
if (!(fp->createPushBack(ai_ac,
false,
dcs->parent(),
aircraftRadius,
@ -152,8 +159,8 @@ void FGATCManager::init() {
leg = 3;
string fltType = "ga";
fp->setRunway(runway);
fp->createTakeOff(&ai_ac, false, dcs->parent(), 0, fltType);
ai_ac.setTakeOffStatus(2);
fp->createTakeOff(ai_ac, false, dcs->parent(), 0, fltType);
ai_ac->setTakeOffStatus(2);
} else {
// We're on the ground somewhere. Handle this case later.
}
@ -170,12 +177,12 @@ void FGATCManager::init() {
if (fp) {
fp->restart();
fp->setLeg(leg);
ai_ac.SetFlightPlan(fp);
ai_ac->SetFlightPlan(fp);
}
if (controller) {
controller->announcePosition(ai_ac.getID(), fp, fp->getCurrentWaypoint()->getRouteIndex(),
ai_ac._getLatitude(), ai_ac._getLongitude(), heading, speed, altitude,
aircraftRadius, leg, &ai_ac);
controller->announcePosition(ai_ac->getID(), fp, fp->getCurrentWaypoint()->getRouteIndex(),
ai_ac->_getLatitude(), ai_ac->_getLongitude(), heading, speed, altitude,
aircraftRadius, leg, ai_ac);
//dialog.init();
@ -183,7 +190,14 @@ void FGATCManager::init() {
//cerr << "Adding groundnetWork to the scenegraph::init" << endl;
//globals->get_scenery()->get_scene_graph()->addChild(node);
}
initSucceeded = true;
initSucceeded = true;
}
void FGATCManager::shutdown()
{
delete ai_ac;
ai_ac = NULL;
activeStations.clear();
}
void FGATCManager::addController(FGATCController *controller) {
@ -205,7 +219,7 @@ void FGATCManager::update ( double time ) {
FGAIFlightPlan *fp = ai_ac.GetFlightPlan();
FGAIFlightPlan *fp = ai_ac->GetFlightPlan();
/* test code : find out how the routing develops */
if (fp) {
@ -259,20 +273,20 @@ void FGATCManager::update ( double time ) {
cerr << "Bearing to nearest waypoint : " << course1 << " " << dist1 << ". (course " << course2 << ")." << endl;
*/
ai_ac.setLatitude(latitude);
ai_ac.setLongitude(longitude);
ai_ac.setAltitude(altitude);
ai_ac.setHeading(heading);
ai_ac.setSpeed(speed);
ai_ac.update(time);
controller = ai_ac.getATCController();
ai_ac->setLatitude(latitude);
ai_ac->setLongitude(longitude);
ai_ac->setAltitude(altitude);
ai_ac->setHeading(heading);
ai_ac->setSpeed(speed);
ai_ac->update(time);
controller = ai_ac->getATCController();
FGATCDialogNew::instance()->update(time);
if (controller) {
//cerr << "name of previous waypoint : " << fp->getPreviousWaypoint()->getName() << endl;
//cerr << "Running FGATCManager::update()" << endl;
//cerr << "Currently under control of " << controller->getName() << endl;
controller->updateAircraftInformation(ai_ac.getID(),
controller->updateAircraftInformation(ai_ac->getID(),
latitude,
longitude,
heading,

10
src/ATC/atc_mgr.hxx
View file

@ -29,16 +29,14 @@
#ifndef _ATC_MGR_HXX_
#define _ATC_MGR_HXX_
//#include <simgear/structure/SGReferenced.hxx>
//#include <simgear/structure/SGSharedPtr.hxx>
#include <simgear/structure/subsystem_mgr.hxx>
#include <ATC/trafficcontrol.hxx>
#include <ATC/atcdialog.hxx>
#include <AIModel/AIAircraft.hxx>
//class FGATCController;
class FGAIAircraft;
typedef std::vector<FGATCController*> AtcVec;
@ -48,7 +46,7 @@ class FGATCManager : public SGSubsystem
{
private:
AtcVec activeStations;
FGAIAircraft ai_ac;
FGAIAircraft* ai_ac;
FGATCController *controller, *prevController; // The ATC controller that is responsible for the user's aircraft.
bool networkVisible;
bool initSucceeded;
@ -58,6 +56,8 @@ public:
FGATCManager();
~FGATCManager();
void init();
virtual void shutdown();
void addController(FGATCController *controller);
void removeController(FGATCController* controller);
void update(double time);

3
src/GUI/MapWidget.cxx
View file

@ -27,6 +27,7 @@
#include <Navaids/routePath.hxx>
#include <Aircraft/FlightHistory.hxx>
#include <AIModel/AIAircraft.hxx>
#include <AIModel/AIManager.hxx>
#include <AIModel/AIFlightPlan.hxx>
const char* RULER_LEGEND_KEY = "ruler-legend";
@ -1977,7 +1978,7 @@ MapWidget::DrawAIObject::DrawAIObject(SGPropertyNode* m, const SGGeod& g) :
// try to access the flight-plan of the aircraft. There are several layers
// of potential NULL-ness here, so we have to be defensive at each stage.
std::string originICAO, destinationICAO;
FGAIManager* aiManager = static_cast<FGAIManager*>(globals->get_subsystem("ai-model"));
FGAIManager* aiManager = globals->get_subsystem<FGAIManager>();
FGAIBasePtr aircraft = aiManager ? aiManager->getObjectFromProperty(model) : NULL;
if (aircraft) {
FGAIAircraft* p = static_cast<FGAIAircraft*>(aircraft.get());

2
src/Main/fg_init.cxx
View file

@ -1024,7 +1024,7 @@ void fgStartNewReset()
string_list::const_iterator it;
for (it = names.begin(); it != names.end(); ++it) {
if ((*it == "time") || (*it == "terrasync") || (*it == "events")
|| (*it == "lighting"))
|| (*it == "lighting") || (*it == FGTileMgr::subsystemName()) || (*it == FGScenery::subsystemName()))
{
continue;
}

3
src/Network/RemoteXMLRequest.hxx
View file

@ -20,8 +20,11 @@
#ifndef REMOTEXMLREQUEST_HXXH
#define REMOTEXMLREQUEST_HXXH
#include <simgear/structure/exception.hxx>
#include <simgear/io/HTTPMemoryRequest.hxx>
#include <simgear/props/props_io.hxx>
class RemoteXMLRequest:
public simgear::HTTP::MemoryRequest
{

24
src/Scenery/tilemgr.cxx
View file

@ -126,14 +126,7 @@ FGTileMgr::FGTileMgr():
FGTileMgr::~FGTileMgr()
{
delete _listener;
// remove all nodes we might have left behind
osg::Group* group = globals->get_scenery()->get_terrain_branch();
group->removeChildren(0, group->getNumChildren());
// clear OSG cache
osgDB::Registry::instance()->clearObjectCache();
}
}
// Initialize the Tile Manager subsystem
@ -142,6 +135,21 @@ void FGTileMgr::init()
reinit();
}
void FGTileMgr::shutdown()
{
delete _listener;
_listener = NULL;
FGScenery* scenery = globals->get_scenery();
if (scenery && scenery->get_terrain_branch()) {
osg::Group* group = scenery->get_terrain_branch();
group->removeChildren(0, group->getNumChildren());
}
// clear OSG cache
osgDB::Registry::instance()->clearObjectCache();
state = Start; // need to init again
}
void FGTileMgr::reinit()
{
SG_LOG( SG_TERRAIN, SG_INFO, "Initializing Tile Manager subsystem." );

2
src/Scenery/tilemgr.hxx
View file

@ -101,6 +101,8 @@ public:
// Initialize the Tile Manager
virtual void init();
virtual void reinit();
virtual void shutdown();
virtual void update(double dt);
const SGBucket& get_current_bucket () const { return current_bucket; }

1
src/Traffic/SchedFlight.cxx
View file

@ -58,7 +58,6 @@
#include <AIModel/AIFlightPlan.hxx>
#include <AIModel/AIManager.hxx>
#include <Airports/airport.hxx>
#include <Main/fg_init.hxx> // That's pretty ugly, but I need fgFindAirportID

22
src/Traffic/Schedule.cxx
View file

@ -49,8 +49,8 @@
#include <AIModel/AIManager.hxx>
#include <AIModel/AIAircraft.hxx>
#include <Airports/airport.hxx>
#include <Main/fg_init.hxx> // That's pretty ugly, but I need fgFindAirportID
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
#include "SchedFlight.hxx"
#include "TrafficMgr.hxx"
@ -403,10 +403,12 @@ void FGAISchedule::setHeading()
courseToDest = SGGeodesy::courseDeg((*flights.begin())->getDepartureAirport()->geod(), (*flights.begin())->getArrivalAirport()->geod());
}
void FGAISchedule::assign(FGScheduledFlight *ref) { flights.push_back(ref); }
bool FGAISchedule::scheduleFlights(time_t now)
{
//string startingPort;
const string& userPort = fgGetString("/sim/presets/airport-id");
//string startingPort;
const string& userPort = fgGetString("/sim/presets/airport-id");
SG_LOG(SG_AI, SG_BULK, "Scheduling Flights for : " << modelPath << " " << registration << " " << homePort);
FGScheduledFlight *flight = NULL;
SGTimeStamp start;
@ -503,6 +505,18 @@ bool FGAISchedule::next()
return true;
}
time_t FGAISchedule::getDepartureTime() { return (*flights.begin())->getDepartureTime (); }
FGAirport *FGAISchedule::getDepartureAirport() { return (*flights.begin())->getDepartureAirport(); }
FGAirport *FGAISchedule::getArrivalAirport() { return (*flights.begin())->getArrivalAirport (); }
int FGAISchedule::getCruiseAlt() { return (*flights.begin())->getCruiseAlt (); }
const std::string &FGAISchedule::getCallSign() { return (*flights.begin())->getCallSign (); }
const std::string &FGAISchedule::getFlightRules() { return (*flights.begin())->getFlightRules (); }
FGScheduledFlight* FGAISchedule::findAvailableFlight (const string &currentDestination,
const string &req,
time_t min, time_t max)

17
src/Traffic/Schedule.hxx
View file

@ -34,6 +34,9 @@
// forward decls
class FGAIAircraft;
class FGScheduledFlight;
typedef std::vector<FGScheduledFlight*> FGScheduledFlightVec;
class FGAISchedule
{
@ -106,18 +109,18 @@ class FGAISchedule
bool next(); // forces the schedule to move on to the next flight.
// TODO: rework these four functions
time_t getDepartureTime () { return (*flights.begin())->getDepartureTime (); };
FGAirport * getDepartureAirport () { return (*flights.begin())->getDepartureAirport(); };
FGAirport * getArrivalAirport () { return (*flights.begin())->getArrivalAirport (); };
int getCruiseAlt () { return (*flights.begin())->getCruiseAlt (); };
time_t getDepartureTime ();
FGAirport * getDepartureAirport ();
FGAirport * getArrivalAirport ();
int getCruiseAlt ();
double getRadius () { return radius; };
double getGroundOffset () { return groundOffset;};
const std::string& getFlightType () { return flightType;};
const std::string& getAirline () { return airline; };
const std::string& getAircraft () { return acType; };
const std::string& getCallSign () { return (*flights.begin())->getCallSign (); };
const std::string& getCallSign ();
const std::string& getRegistration () { return registration;};
const std::string& getFlightRules () { return (*flights.begin())->getFlightRules (); };
const std::string& getFlightRules ();
bool getHeavy () { return heavy; };
double getCourse () { return courseToDest; };
unsigned int getRunCount () { return runCount; };
@ -128,7 +131,7 @@ class FGAISchedule
void setScore ();
double getScore () { return score; };
void setHeading ();
void assign (FGScheduledFlight *ref) { flights.push_back(ref); };
void assign (FGScheduledFlight *ref);
void setFlightType (const std::string& val) { flightType = val; };
FGScheduledFlight*findAvailableFlight (const std::string& currentDestination, const std::string &req, time_t min=0, time_t max=0);
// used to sort in descending order of score: I've probably found a better way to

6
src/Traffic/TrafficMgr.cxx
View file

@ -69,6 +69,8 @@
#include <AIModel/AIBase.hxx>
#include <Airports/airport.hxx>
#include <Main/fg_init.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
#include "TrafficMgr.hxx"
@ -391,7 +393,7 @@ private:
mutable SGMutex _lock;
bool _isFinished;
bool _cancelThread;
PathList _trafficDirPaths;
simgear::PathList _trafficDirPaths;
// parser state
@ -524,7 +526,7 @@ void FGTrafficManager::init()
doingInit = true;
if (string(fgGetString("/sim/traffic-manager/datafile")).empty()) {
PathList dirs = globals->get_data_paths("AI/Traffic");
simgear::PathList dirs = globals->get_data_paths("AI/Traffic");
// temporary flag to restrict loading while traffic data is found
// through terrasync /and/ fgdata. Ultimatley we *do* want to be able to