#include <simgear/structure/event_mgr.hxx>
#include <simgear/props/AtomicChangeListener.hxx>
#include <simgear/props/props.hxx>
-//#include <simgear/timing/sg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
+#include <simgear/magvar/magvar.hxx>
#include <simgear/math/sg_random.h>
#include <simgear/io/raw_socket.hxx>
+#include <simgear/misc/sg_sleep.hxx>
#include <Time/light.hxx>
#include <Aircraft/replay.hxx>
#include <Time/TimeManager.hxx>
#include <Environment/environment_mgr.hxx>
#include <Environment/ephemeris.hxx>
+#include <GUI/gui.h>
#include <GUI/new_gui.hxx>
#include <MultiPlayer/multiplaymgr.hxx>
static SGPropertyNode_ptr frame_signal
= fgGetNode("/sim/signals/frame", true);
+ static SGPropertyNode_ptr _statisticsFlag
+ = fgGetNode("/sim/timing-statistics/enabled", true);
+ static SGPropertyNode_ptr _statisticsInterval
+ = fgGetNode("/sim/timing-statistics/interval-s", true);
+ static SGPropertyNode_ptr _statiticsMinJitter
+ = fgGetNode("/sim/timing-statistics/min-jitter-ms", true);
+ static SGPropertyNode_ptr _statiticsMinTime
+ = fgGetNode("/sim/timing-statistics/min-time-ms", true);
+
frame_signal->fireValueChanged();
SGCloudLayer::enable_bump_mapping = fgGetBool("/sim/rendering/bump-mapping");
altitude->getDoubleValue() * SG_FEET_TO_METER,
globals->get_time_params()->getJD() );
-#if ENABLE_ATCDCL
// Run ATC subsystem
- if (fgGetBool("/sim/atc/enabled"))
- globals->get_ATC_mgr()->update(sim_dt);
-#endif
+ globals->get_ATC_mgr()->update(sim_dt);
globals->get_subsystem_mgr()->update(sim_dt);
}
#endif
- // END Tile Manager udpates
+ // END Tile Manager updates
bool scenery_loaded = fgGetBool("sim/sceneryloaded");
- if (!scenery_loaded && globals->get_tile_mgr()->isSceneryLoaded()
- && fgGetBool("sim/fdm-initialized")) {
- fgSetBool("sim/sceneryloaded",true);
- if (fgGetBool("/sim/sound/working")) {
- globals->get_soundmgr()->activate();
+ if (!scenery_loaded)
+ {
+ if (globals->get_tile_mgr()->isSceneryLoaded()
+ && fgGetBool("sim/fdm-initialized")) {
+ fgSetBool("sim/sceneryloaded",true);
+ if (fgGetBool("/sim/sound/working")) {
+ globals->get_soundmgr()->activate();
+ }
+ globals->get_props()->tie("/sim/sound/devices/name",
+ SGRawValueFunctions<const char *>(0, fgSetNewSoundDevice), false);
+ }
+ else
+ {
+ // be nice to loader threads while waiting for initial scenery, reduce to 2fps
+ simgear::sleepForMSec(500);
+ }
+ }
+
+ // print timing statistics
+ static bool _lastStatisticsFlag = false;
+ if (_lastStatisticsFlag != _statisticsFlag->getBoolValue())
+ {
+ // flag has changed, update subsystem manager
+ _lastStatisticsFlag = _statisticsFlag->getBoolValue();
+ globals->get_subsystem_mgr()->collectDebugTiming(_lastStatisticsFlag);
+ }
+ if (_lastStatisticsFlag)
+ {
+ static double elapsed = 0;
+ elapsed += real_dt;
+ if (elapsed >= _statisticsInterval->getDoubleValue())
+ {
+ // print and reset timing statistics
+ globals->get_subsystem_mgr()->printTimingStatistics(_statiticsMinTime->getDoubleValue(),
+ _statiticsMinJitter->getDoubleValue());
+ elapsed = 0;
}
- globals->get_props()->tie("/sim/sound/devices/name",
- SGRawValueFunctions<const char *>(0, fgSetNewSoundDevice), false);
}
+
simgear::AtomicChangeListener::fireChangeListeners();
SG_LOG( SG_ALL, SG_DEBUG, "" );
// Initialize the material manager
////////////////////////////////////////////////////////////////////
globals->set_matlib( new SGMaterialLib );
- simgear::SGModelLib::init(globals->get_fg_root());
- simgear::SGModelLib::setPropRoot(globals->get_props());
+ simgear::SGModelLib::init(globals->get_fg_root(), globals->get_props());
simgear::SGModelLib::setPanelFunc(load_panel);
////////////////////////////////////////////////////////////////////
string apt = fgGetString( "/sim/startup/options/airport" );
string rwy = fgGetString( "/sim/startup/options/runway" );
double strthdg = fgGetDouble( "/sim/startup/options/heading-deg", 9999.0 );
+ string parkpos = fgGetString( "/sim/presets/parkpos" );
bool onground = fgGetBool( "/sim/presets/onground", false );
// don't check for wind-speed < 1kt, this belongs to the runway-selection code
// the other logic is taken from former startup.nas
- if( hdg < 360.0 && apt.length() > 0 && strthdg > 360.0 && rwy.length() == 0 && onground ) {
+ if( hdg < 360.0 && apt.length() > 0 && strthdg > 360.0 && rwy.length() == 0 && onground && parkpos.length() == 0 ) {
extern bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg );
fgSetPosFromAirportIDandHdg( apt, hdg );
}