#include <simgear/props/AtomicChangeListener.hxx>
#include <simgear/props/props.hxx>
#include <simgear/timing/sg_time.hxx>
+#include <simgear/timing/timestamp.hxx>
#include <simgear/magvar/magvar.hxx>
#include <simgear/math/sg_random.h>
#include <simgear/io/raw_socket.hxx>
#include <simgear/scene/tsync/terrasync.hxx>
-#include <simgear/misc/sg_sleep.hxx>
#include <Time/light.hxx>
#include <Aircraft/replay.hxx>
#include <ATCDCL/ATCmgr.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>
// What should we do when we have nothing else to do? Let's get ready
// for the next move and update the display?
-static void fgMainLoop( void ) {
-
- static SGConstPropertyNode_ptr longitude
- = fgGetNode("/position/longitude-deg");
- static SGConstPropertyNode_ptr latitude
- = fgGetNode("/position/latitude-deg");
- static SGConstPropertyNode_ptr altitude
- = fgGetNode("/position/altitude-ft");
- static SGConstPropertyNode_ptr vn_fps
- = fgGetNode("/velocities/speed-north-fps");
- static SGConstPropertyNode_ptr ve_fps
- = fgGetNode("/velocities/speed-east-fps");
- static SGConstPropertyNode_ptr vd_fps
- = fgGetNode("/velocities/speed-down-fps");
-
+static void fgMainLoop( void )
+{
static SGPropertyNode_ptr frame_signal
= fgGetNode("/sim/signals/frame", true);
timeMgr->computeTimeDeltas(sim_dt, real_dt);
// update magvar model
- globals->get_mag()->update( longitude->getDoubleValue()
- * SGD_DEGREES_TO_RADIANS,
- latitude->getDoubleValue()
- * SGD_DEGREES_TO_RADIANS,
- altitude->getDoubleValue() * SG_FEET_TO_METER,
+ globals->get_mag()->update( globals->get_aircraft_position(),
globals->get_time_params()->getJD() );
- // Run ATC subsystem
- globals->get_ATC_mgr()->update(sim_dt);
-
globals->get_subsystem_mgr()->update(sim_dt);
// Update the sound manager last so it can use the CPU while the GPU
{
fgSplashProgress("loading scenery");
// be nice to loader threads while waiting for initial scenery, reduce to 2fps
- simgear::sleepForMSec(500);
+ SGTimeStamp::sleepForMSec(500);
}
}
} else if ( idle_state == 6 ) {
idle_state++;
- // Initialize the sky
-
- Ephemeris* eph = new Ephemeris;
- globals->add_subsystem("ephemeris", eph);
- eph->init(); // FIXME - remove this once SGSky code below is also a subsystem
- eph->bind();
-
- // TODO: move to environment mgr
- thesky = new SGSky;
- SGPath texture_path(globals->get_fg_root());
- texture_path.append("Textures");
- texture_path.append("Sky");
- for (int i = 0; i < FGEnvironmentMgr::MAX_CLOUD_LAYERS; i++) {
- SGCloudLayer * layer = new SGCloudLayer(texture_path.str());
- thesky->add_cloud_layer(layer);
- }
-
- SGPath sky_tex_path( globals->get_fg_root() );
- sky_tex_path.append( "Textures" );
- sky_tex_path.append( "Sky" );
- thesky->texture_path( sky_tex_path.str() );
-
- // The sun and moon diameters are scaled down numbers of the
- // actual diameters. This was needed to fit both the sun and the
- // moon within the distance to the far clip plane.
- // Moon diameter: 3,476 kilometers
- // Sun diameter: 1,390,000 kilometers
- thesky->build( 80000.0, 80000.0,
- 463.3, 361.8,
- *globals->get_ephem(),
- fgGetNode("/environment", true));
-
+
// Initialize MagVar model
SGMagVar *magvar = new SGMagVar();
globals->set_mag( magvar );
-
-
- // kludge to initialize mag compass
- // (should only be done for in-flight
- // startup)
+
+
+ // kludge to initialize mag compass
+ // (should only be done for in-flight
+ // startup)
// update magvar model
globals->get_mag()->update( fgGetDouble("/position/longitude-deg")
- * SGD_DEGREES_TO_RADIANS,
- fgGetDouble("/position/latitude-deg")
- * SGD_DEGREES_TO_RADIANS,
- fgGetDouble("/position/altitude-ft")
- * SG_FEET_TO_METER,
- globals->get_time_params()->getJD() );
+ * SGD_DEGREES_TO_RADIANS,
+ fgGetDouble("/position/latitude-deg")
+ * SGD_DEGREES_TO_RADIANS,
+ fgGetDouble("/position/altitude-ft")
+ * SG_FEET_TO_METER,
+ globals->get_time_params()->getJD() );
double var = globals->get_mag()->get_magvar() * SGD_RADIANS_TO_DEGREES;
fgSetDouble("/instrumentation/heading-indicator/offset-deg", -var);
fgSetDouble("/instrumentation/heading-indicator-fg/offset-deg", -var);
-
- // airport = new ssgBranch;
- // airport->setName( "Airport Lighting" );
- // lighting->addKid( airport );
-
fgSplashProgress("initializing subsystems");
} else if ( idle_state == 7 ) {
#endif
SG_LOG( SG_GENERAL, SG_INFO, "FlightGear: Version "
<< version );
- SG_LOG( SG_GENERAL, SG_INFO, "Built with " << SG_COMPILER_STR << endl );
+ SG_LOG( SG_GENERAL, SG_INFO, "Built with " << SG_COMPILER_STR << std::endl );
// Allocate global data structures. This needs to happen before
// we parse command line options