#include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/structure/event_mgr.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/misc/ResourceManager.hxx>
#include <Aircraft/controls.hxx>
#include <Airports/runways.hxx>
#include <Model/acmodel.hxx>
#include <Model/modelmgr.hxx>
#include <MultiPlayer/multiplaymgr.hxx>
-#include <Navaids/awynet.hxx>
#include <Scenery/scenery.hxx>
#include <Scenery/tilemgr.hxx>
#include <Navaids/navlist.hxx>
#include "fg_props.hxx"
#include "fg_io.hxx"
-\f
+\fclass AircraftResourceProvider : public simgear::ResourceProvider
+{
+public:
+ AircraftResourceProvider() :
+ simgear::ResourceProvider(simgear::ResourceManager::PRIORITY_HIGH)
+ {
+ }
+
+ virtual SGPath resolve(const std::string& aResource, SGPath&) const
+ {
+ string_list pieces(sgPathBranchSplit(aResource));
+ if ((pieces.size() < 3) || (pieces.front() != "Aircraft")) {
+ return SGPath(); // not an Aircraft path
+ }
+
+ // test against the aircraft-dir property
+ const char* aircraftDir = fgGetString("/sim/aircraft-dir");
+ string_list aircraftDirPieces(sgPathBranchSplit(aircraftDir));
+ if (aircraftDirPieces.empty() || (aircraftDirPieces.back() != pieces[1])) {
+ return SGPath(); // current aircraft-dir does not match resource aircraft
+ }
+
+ SGPath r(aircraftDir);
+ for (unsigned int i=2; i<pieces.size(); ++i) {
+ r.append(pieces[i]);
+ }
+
+ if (r.exists()) {
+ SG_LOG(SG_IO, SG_INFO, "found path:" << aResource << " via /sim/aircraft-dir: " << r.str());
+ return r;
+ }
+
+ // try each aircaft dir in turn
+ std::string res(aResource, 9); // resource path with 'Aircraft/' removed
+ const string_list& dirs(globals->get_aircraft_paths());
+ string_list::const_iterator it = dirs.begin();
+ for (; it != dirs.end(); ++it) {
+ SGPath p(*it, res);
+ if (p.exists()) {
+ SG_LOG(SG_IO, SG_INFO, "found path:" << aResource << " in aircraft dir: " << r.str());
+ return p;
+ }
+ } // of aircraft path iteration
+
+ return SGPath(); // not found
+ }
+};
+
////////////////////////////////////////////////////////////////////////
// Implementation of FGGlobals.
////////////////////////////////////////////////////////////////////////
dmelist( NULL ),
tacanlist( NULL ),
carrierlist( NULL ),
- channellist( NULL ),
- airwaynet( NULL ),
- multiplayer_mgr( NULL )
+ channellist( NULL )
{
+ simgear::ResourceManager::instance()->addProvider(new AircraftResourceProvider());
}
FGGlobals::~FGGlobals()
{
delete renderer;
+ renderer = NULL;
+
// The AIModels manager performs a number of actions upon
// Shutdown that implicitly assume that other subsystems
// are still operational (Due to the dynamic allocation and
// deallocation of AIModel objects. To ensure we can safely
// shut down all subsystems, make sure we take down the
// AIModels system first.
- subsystem_mgr->get_group(SGSubsystemMgr::GENERAL)->remove_subsystem("ai_model");
- // FGInput (FGInputEvent) and FGDialog calls get_subsystem() in their destructors,
- // which is not safe since some subsystem are already deleted but can be referred.
- // So these subsystems must be deleted prior to deleting subsystem_mgr unless
- // ~SGSubsystemGroup and SGSubsystemMgr::get_subsystem are changed not to refer to
- // deleted subsystems.
- subsystem_mgr->get_group(SGSubsystemMgr::GENERAL)->remove_subsystem("input");
- subsystem_mgr->get_group(SGSubsystemMgr::GENERAL)->remove_subsystem("gui");
+ SGSubsystem* ai = subsystem_mgr->remove("ai_model");
+ if (ai) {
+ ai->unbind();
+ delete ai;
+ }
+
subsystem_mgr->unbind();
delete subsystem_mgr;
- delete event_mgr;
+
delete time_params;
delete mag;
delete matlib;
delete ATC_mgr;
delete controls;
- delete viewmgr;
-// delete commands;
- delete acmodel;
- delete model_mgr;
delete channel_options_list;
delete initial_waypoints;
- delete tile_mgr;
delete scenery;
delete fontcache;
delete tacanlist;
delete carrierlist;
delete channellist;
- delete airwaynet;
- delete multiplayer_mgr;
soundmgr->unbind();
delete soundmgr;
n = n->getChild("fg-root", 0, true);
n->setStringValue(fg_root.c_str());
n->setAttribute(SGPropertyNode::WRITE, false);
+
+ simgear::ResourceManager::instance()->addBasePath(fg_root,
+ simgear::ResourceManager::PRIORITY_DEFAULT);
}
void FGGlobals::set_fg_scenery (const string &scenery)
return;
}
+ unsigned int index = fg_aircraft_dirs.size();
fg_aircraft_dirs.push_back(path);
+
+// make aircraft dirs available to Nasal
+ SGPropertyNode* sim = fgGetNode("/sim", true);
+ sim->removeChild("fg-aircraft", index, false);
+ SGPropertyNode* n = sim->getChild("fg-aircraft", index, true);
+ n->setStringValue(path);
+ n->setAttribute(SGPropertyNode::WRITE, false);
}
void FGGlobals::append_aircraft_paths(const std::string& path)
SGPath FGGlobals::resolve_aircraft_path(const std::string& branch) const
{
- string_list pieces(sgPathBranchSplit(branch));
- if ((pieces.size() < 3) || (pieces.front() != "Aircraft")) {
- SG_LOG(SG_AIRCRAFT, SG_ALERT, "resolve_aircraft_path: bad path:" << branch);
- return SGPath();
- }
-
-// check current aircraft dir first (takes precedence, allows Generics to be
-// over-riden
- const char* aircraftDir = fgGetString("/sim/aircraft-dir");
- string_list aircraftDirPieces(sgPathBranchSplit(aircraftDir));
- if (!aircraftDirPieces.empty() && (aircraftDirPieces.back() == pieces[1])) {
- SGPath r(aircraftDir);
-
- for (unsigned int i=2; i<pieces.size(); ++i) {
- r.append(pieces[i]);
- }
-
- if (r.exists()) {
- std::cout << "using aircraft-dir for:" << r.str() << std::endl;
- return r;
- }
- } // of using aircraft-dir case
-
-// try each fg_aircraft_dirs in turn
- for (unsigned int p=0; p<fg_aircraft_dirs.size(); ++p) {
- SGPath r(fg_aircraft_dirs[p]);
- r.append(branch);
- if (r.exists()) {
- std::cout << "using aircraft directory for:" << r.str() << std::endl;
- return r;
- }
- } // of fg_aircraft_dirs iteration
-
-// finally, try fg_root
- SGPath r(fg_root);
- r.append(branch);
- if (r.exists()) {
- std::cout << "using FG_ROOT for:" << r.str() << std::endl;
- return r;
- }
-
- SG_LOG(SG_AIRCRAFT, SG_ALERT, "resolve_aircraft_path: failed to resolve:" << branch);
- return SGPath();
+ return simgear::ResourceManager::instance()->findPath(branch);
}
SGPath FGGlobals::resolve_maybe_aircraft_path(const std::string& branch) const
{
- if (branch.find("Aircraft/") == 0) {
- return resolve_aircraft_path(branch);
- } else {
- SGPath r(fg_root);
- r.append(branch);
- return r;
- }
+ return simgear::ResourceManager::instance()->findPath(branch);
}
FGRenderer *
projects / flightgear.git / blobdiff