#include <simgear/misc/ResourceManager.hxx>
#include <simgear/props/propertyObject.hxx>
#include <simgear/props/props_io.hxx>
+#include <simgear/scene/model/modellib.hxx>
#include <Aircraft/controls.hxx>
#include <Airports/runways.hxx>
}
if (r.exists()) {
- SG_LOG(SG_IO, SG_DEBUG, "found path:" << aResource << " via /sim/aircraft-dir: " << r.str());
return r;
}
}
for (; it != dirs.end(); ++it) {
SGPath p(*it, res);
if (p.exists()) {
- SG_LOG(SG_IO, SG_DEBUG, "found path:" << aResource << " in aircraft dir: " << *it);
return p;
}
} // of aircraft path iteration
// deallocation of AIModel objects. To ensure we can safely
// shut down all subsystems, make sure we take down the
// AIModels system first.
- SGSubsystem* ai = subsystem_mgr->remove("ai-model");
+ SGSubsystem* ai = globals->get_subsystem("ai-model");
if (ai) {
ai->unbind();
- delete ai;
+ subsystem_mgr->remove("ai-model");
}
- SGSubsystem* sound = subsystem_mgr->remove("sound");
+ subsystem_mgr->remove("aircraft-model");
+ subsystem_mgr->remove("tile-manager");
+ subsystem_mgr->remove("model-manager");
+
subsystem_mgr->shutdown();
subsystem_mgr->unbind();
delete subsystem_mgr;
+ subsystem_mgr = NULL; // important so ::get_subsystem returns NULL
delete renderer;
renderer = NULL;
delete fontcache;
delete channellist;
- delete sound;
+ simgear::PropertyObjectBase::setDefaultRoot(NULL);
+ simgear::SGModelLib::resetPropertyRoot();
+
delete locale;
locale = NULL;
+
+ delete props;
}
// set the fg_root path
fg_home = tmp.realpath();
}
+PathList FGGlobals::get_data_paths() const
+{
+ PathList r(additional_data_paths);
+ r.push_back(SGPath(fg_root));
+ return r;
+}
+
+PathList FGGlobals::get_data_paths(const std::string& suffix) const
+{
+ PathList r;
+ BOOST_FOREACH(SGPath p, get_data_paths()) {
+ p.append(suffix);
+ if (p.exists()) {
+ r.push_back(p);
+ }
+ }
+
+ return r;
+}
+
+void FGGlobals::append_data_path(const SGPath& path)
+{
+ if (!path.exists()) {
+ SG_LOG(SG_GENERAL, SG_WARN, "adding non-existant data path:" << path);
+ }
+
+ additional_data_paths.push_back(path);
+}
+
+SGPath FGGlobals::find_data_dir(const std::string& pathSuffix) const
+{
+ BOOST_FOREACH(SGPath p, additional_data_paths) {
+ p.append(pathSuffix);
+ if (p.exists()) {
+ return p;
+ }
+ }
+
+ SGPath rootPath(fg_root);
+ rootPath.append(pathSuffix);
+ if (rootPath.exists()) {
+ return rootPath;
+ }
+
+ SG_LOG(SG_GENERAL, SG_WARN, "dir not found in any data path:" << pathSuffix);
+ return SGPath();
+}
+
void FGGlobals::append_fg_scenery (const std::string &paths)
{
// fg_scenery.clear();
SGSubsystem *
FGGlobals::get_subsystem (const char * name)
{
+ if (!subsystem_mgr) {
+ return NULL;
+ }
+
return subsystem_mgr->get_subsystem(name);
}