# include <config.h>
#endif
+#include <boost/foreach.hpp>
+#include <algorithm>
+
#include <simgear/structure/commands.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/misc/sg_dir.hxx>
#include <simgear/structure/event_mgr.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/misc/ResourceManager.hxx>
+#include <simgear/props/propertyObject.hxx>
+#include <simgear/props/props_io.hxx>
+#include <simgear/scene/model/placement.hxx>
#include <Aircraft/controls.hxx>
#include <Airports/runways.hxx>
#include <ATCDCL/ATCmgr.hxx>
#include <Autopilot/route_mgr.hxx>
#include <Cockpit/panel.hxx>
-#include <GUI/new_gui.hxx>
+#include <GUI/FGFontCache.hxx>
#include <Model/acmodel.hxx>
#include <Model/modelmgr.hxx>
#include <MultiPlayer/multiplaymgr.hxx>
#include "fg_props.hxx"
#include "fg_io.hxx"
-\fclass AircraftResourceProvider : public simgear::ResourceProvider
+class AircraftResourceProvider : public simgear::ResourceProvider
{
public:
AircraftResourceProvider() :
// 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;
+ if (!aircraftDirPieces.empty() && (aircraftDirPieces.back() == pieces[1])) {
+ // current aircraft-dir matches 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_DEBUG, "found path:" << aResource << " via /sim/aircraft-dir: " << r.str());
+ return r;
+ }
}
- // try each aircaft dir in turn
+ // try each aircraft 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());
+ SG_LOG(SG_IO, SG_DEBUG, "found path:" << aResource << " in aircraft dir: " << *it);
return p;
}
} // of aircraft path iteration
renderer( new FGRenderer ),
subsystem_mgr( new SGSubsystemMgr ),
event_mgr( new SGEventMgr ),
- soundmgr( new SGSoundMgr ),
sim_time_sec( 0.0 ),
fg_root( "" ),
- warp( 0 ),
- warp_delta( 0 ),
time_params( NULL ),
ephem( NULL ),
mag( NULL ),
dmelist( NULL ),
tacanlist( NULL ),
carrierlist( NULL ),
- channellist( NULL )
+ channellist( NULL )
{
simgear::ResourceManager::instance()->addProvider(new AircraftResourceProvider());
+ simgear::PropertyObjectBase::setDefaultRoot(props);
}
// Destructor
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.
- SGSubsystem* ai = subsystem_mgr->remove("ai_model");
- delete ai;
+ SGSubsystem* ai = subsystem_mgr->remove("ai-model");
+ if (ai) {
+ ai->unbind();
+ delete ai;
+ }
+ subsystem_mgr->shutdown();
subsystem_mgr->unbind();
delete subsystem_mgr;
+ delete renderer;
+ renderer = NULL;
+
delete time_params;
delete mag;
delete matlib;
delete current_panel;
delete ATC_mgr;
- delete controls;
+
+ if (controls)
+ {
+ controls->unbind();
+ delete controls;
+ }
delete channel_options_list;
delete initial_waypoints;
delete tacanlist;
delete carrierlist;
delete channellist;
-
- soundmgr->unbind();
- delete soundmgr;
}
SGPath tmp( fg_root );
tmp.append( "data" );
tmp.append( "version" );
- if ( ulFileExists( tmp.c_str() ) ) {
+ if ( tmp.exists() ) {
fgGetNode("BAD_FG_ROOT", true)->setStringValue(fg_root);
fg_root += "/data";
fgGetNode("GOOD_FG_ROOT", true)->setStringValue(fg_root);
simgear::ResourceManager::PRIORITY_DEFAULT);
}
-void FGGlobals::set_fg_scenery (const string &scenery)
+void FGGlobals::append_fg_scenery (const string &paths)
{
- SGPath s;
- if (scenery.empty()) {
- s.set( fg_root );
- s.append( "Scenery" );
- } else
- s.set( scenery );
-
- string_list path_list = sgPathSplit( s.str() );
- fg_scenery.clear();
-
- for (unsigned i = 0; i < path_list.size(); i++) {
- SGPath path(path_list[i]);
+// fg_scenery.clear();
+ SGPropertyNode* sim = fgGetNode("/sim", true);
+
+ // find first unused fg-scenery property in /sim
+ int propIndex = 0;
+ while (sim->getChild("fg-scenery", propIndex) != NULL) {
+ ++propIndex;
+ }
+
+ BOOST_FOREACH(const SGPath& path, sgPathSplit( paths )) {
if (!path.exists()) {
SG_LOG(SG_GENERAL, SG_WARN, "scenery path not found:" << path.str());
continue;
}
+ // check for duplicates
+ string_list::const_iterator ex = std::find(fg_scenery.begin(), fg_scenery.end(), path.str());
+ if (ex != fg_scenery.end()) {
+ SG_LOG(SG_GENERAL, SG_INFO, "skipping duplicate add of scenery path:" << path.str());
+ continue;
+ }
+
simgear::Dir dir(path);
SGPath terrainDir(dir.file("Terrain"));
SGPath objectsDir(dir.file("Objects"));
// FG_SCENERY=A:B becomes list ["A/Terrain", "A/Objects", "",
// "B/Terrain", "B/Objects", ""]
fg_scenery.push_back("");
+
+ // make scenery dirs available to Nasal
+ SGPropertyNode* n = sim->getChild("fg-scenery", propIndex++, true);
+ n->setStringValue(path.str());
+ n->setAttribute(SGPropertyNode::WRITE, false);
} // of path list iteration
}
SGSoundMgr *
FGGlobals::get_soundmgr () const
{
- return soundmgr;
+ if (subsystem_mgr)
+ return (SGSoundMgr*) subsystem_mgr->get_subsystem("sound");
+
+ return NULL;
}
SGEventMgr *
return event_mgr;
}
+const SGGeod &
+FGGlobals::get_aircraft_position() const
+{
+ if( acmodel != NULL ) {
+ SGModelPlacement * mp = acmodel->get3DModel();
+ if( mp != NULL )
+ return mp->getPosition();
+ }
+ throw sg_exception("Can't get aircraft position", "FGGlobals::get_aircraft_position()" );
+}
+
+SGVec3d
+FGGlobals::get_aircraft_positon_cart() const
+{
+ return SGVec3d::fromGeod(get_aircraft_position());
+}
+
// Save the current state as the initial state.
void
{
initial_state = new SGPropertyNode();
- if (!copyProperties(props, initial_state))
+ // copy properties which are READ/WRITEable - but not USERARCHIVEd or PRESERVEd
+ int checked = SGPropertyNode::READ+SGPropertyNode::WRITE+
+ SGPropertyNode::USERARCHIVE+SGPropertyNode::PRESERVE;
+ int expected = SGPropertyNode::READ+SGPropertyNode::WRITE;
+ if (!copyProperties(props, initial_state, expected, checked))
SG_LOG(SG_GENERAL, SG_ALERT, "Error saving initial state");
// delete various properties from the initial state, since we want to
// preserve their values even if doing a restore
-
+ // => Properties should now use the PRESERVE flag to protect their values
+ // on sim-reset. Remove some specific properties for backward compatibility.
SGPropertyNode* sim = initial_state->getChild("sim");
- sim->removeChild("presets");
- SGPropertyNode* simStartup = sim->getChild("startup");
- simStartup->removeChild("xsize");
- simStartup->removeChild("ysize");
-
SGPropertyNode* cameraGroupNode = sim->getNode("rendering/camera-group");
if (cameraGroupNode) {
cameraGroupNode->removeChild("camera");
"No initial state available to restore!!!");
return;
}
-
- if ( copyProperties(initial_state, props) ) {
+ // copy properties which are READ/WRITEable - but not USERARCHIVEd or PRESERVEd
+ int checked = SGPropertyNode::READ+SGPropertyNode::WRITE+
+ SGPropertyNode::USERARCHIVE+SGPropertyNode::PRESERVE;
+ int expected = SGPropertyNode::READ+SGPropertyNode::WRITE;
+ if ( copyProperties(initial_state, props, expected, checked)) {
SG_LOG( SG_GENERAL, SG_INFO, "Initial state restored successfully" );
} else {
SG_LOG( SG_GENERAL, SG_INFO,
return viewmgr->get_current_view();
}
+long int FGGlobals::get_warp() const
+{
+ return fgGetInt("/sim/time/warp");
+}
+
+void FGGlobals::set_warp( long int w )
+{
+ fgSetInt("/sim/time/warp", w);
+}
+
+long int FGGlobals::get_warp_delta() const
+{
+ return fgGetInt("/sim/time/warp-delta");
+}
+
+void FGGlobals::set_warp_delta( long int d )
+{
+ fgSetInt("/sim/time/warp-delta", d);
+}
+
// end of globals.cxx
projects / flightgear.git / blobdiff