fly/flightgear
1
0
Fork 0
Code Activity

Emergency fix for AI model loading - non existance of the piper model as in the latest base package crashes the program - add exception handler during load. Needs to be replaced with better AI aircraft loading logic at some point

Browse source
This commit is contained in:
daveluff 2005-01-21 15:50:29 +00:00
parent 8191d6b00e
commit e2a170c7d4
2 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/ATC/AIMgr.cxx
View file

@ -53,11 +53,12 @@ FGAIMgr::FGAIMgr() {
// TODO - use the proper user callsign when it becomes user settable.
removalList.clear();
activated.clear();
_havePiperModel = true;
}
FGAIMgr::~FGAIMgr() {
_defaultModel->deRef();
_piperModel->deRef();
if(_havePiperModel) _piperModel->deRef();
}
void FGAIMgr::init() {
@ -75,20 +76,39 @@ void FGAIMgr::init() {
// Load up models at the start to avoid pausing later
// Hack alert - Hardwired paths!!
string planepath = "Aircraft/c172/Models/c172-dpm.ac";
_defaultModel = sgLoad3DModel( globals->get_fg_root(),
planepath.c_str(),
globals->get_props(),
globals->get_sim_time_sec() );
bool _loadedDefaultOK = true;
try {
_defaultModel = sgLoad3DModel( globals->get_fg_root(),
planepath.c_str(),
globals->get_props(),
globals->get_sim_time_sec() );
} catch(sg_exception& e) {
_loadedDefaultOK = false;
}
if(!_loadedDefaultOK ) {
// Just load the same 3D model as the default user plane - that's *bound* to exist!
// TODO - implement robust determination of availability of GA AI aircraft models
planepath = "Aircraft/c172p/Models/c172p.ac";
_defaultModel = sgLoad3DModel( globals->get_fg_root(),
planepath.c_str(),
globals->get_props(),
globals->get_sim_time_sec() );
}
planepath = "Aircraft/pa28-161/Models/pa28-161.ac";
_piperModel = sgLoad3DModel( globals->get_fg_root(),
planepath.c_str(),
globals->get_props(),
globals->get_sim_time_sec() );
try {
_piperModel = sgLoad3DModel( globals->get_fg_root(),
planepath.c_str(),
globals->get_props(),
globals->get_sim_time_sec() );
} catch(sg_exception& e) {
_havePiperModel = false;
}
// We need to keep one ref of the models open to stop ssg deleting them behind our back!
_defaultModel->ref();
_piperModel->ref();
if(_havePiperModel) _piperModel->ref();
// go through the $FG_ROOT/ATC directory and find all *.taxi files
SGPath path(globals->get_fg_root());
@ -448,7 +468,7 @@ void FGAIMgr::GenerateSimpleAirportTraffic(string ident, double min_dist) {
else cessna = true;
string s = GenerateShortForm(GenerateUniqueCallsign(), (cessna ? "Cessna-" : "Piper-"));
FGAIGAVFRTraffic* t = new FGAIGAVFRTraffic();
t->SetModel(cessna ? _defaultModel : _piperModel);
t->SetModel(cessna ? _defaultModel : (_havePiperModel ? _piperModel : _defaultModel));
//cout << "Generating VFR traffic " << s << " inbound to " << ident << " " << ad << " meters out from " << dir << " degrees\n";
Point3D tpos = dclUpdatePosition(aptpos, dir, 6.0, ad);
if(tpos.elev() > (aptpos.elev() + 3000.0)) tpos.setelev(aptpos.elev() + 3000.0); // FEET yuk :-(

4
src/ATC/AIMgr.hxx
View file

@ -131,7 +131,9 @@ private:
string GenerateUniqueCallsign();
string GenerateShortForm(string callsign, string plane_str = "Cessna-", bool local = false);
// TODO - implement a proper robust system for registering and loading AI GA aircraft models
bool _havePiperModel;
};
#endif // _FG_AIMGR_HXX