]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/main.cxx
Refactor SGSky handling and ownership - sink into Renderer, remove global variable...
[flightgear.git] / src / Main / main.cxx
index 2a2db134465ea880fe13e35acf6c6b48d16db535..3532bcb5ea4fdac6a5900238c49989b8f95eda87 100644 (file)
 #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>
@@ -67,7 +67,6 @@
 #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>
@@ -104,21 +103,8 @@ extern int _bootstrap_OSInit;
 
 // 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);
 
@@ -132,10 +118,9 @@ static void fgMainLoop( void ) {
         = fgGetNode("/sim/timing-statistics/min-time-ms", true);
 
     frame_signal->fireValueChanged();
-    SGCloudLayer::enable_bump_mapping = fgGetBool("/sim/rendering/bump-mapping");
     
-    SG_LOG( SG_ALL, SG_DEBUG, "Running Main Loop");
-    SG_LOG( SG_ALL, SG_DEBUG, "======= ==== ====");
+    SG_LOG( SG_GENERAL, SG_DEBUG, "Running Main Loop");
+    SG_LOG( SG_GENERAL, SG_DEBUG, "======= ==== ====");
     
     
   // update "time"
@@ -146,16 +131,9 @@ static void fgMainLoop( void ) {
     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
@@ -215,7 +193,7 @@ static void fgMainLoop( void ) {
         {
             fgSplashProgress("loading scenery");
             // be nice to loader threads while waiting for initial scenery, reduce to 2fps
-            simgear::sleepForMSec(500);
+            SGTimeStamp::sleepForMSec(500);
         }
     }
 
@@ -242,7 +220,7 @@ static void fgMainLoop( void ) {
 
     simgear::AtomicChangeListener::fireChangeListeners();
 
-    SG_LOG( SG_ALL, SG_DEBUG, "" );
+    SG_LOG( SG_GENERAL, SG_DEBUG, "" );
 }
 
 void fgInitSoundManager()
@@ -411,63 +389,27 @@ static void fgIdleFunction ( void ) {
 
     } 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 ) {
@@ -510,6 +452,8 @@ static void fgIdleFunction ( void ) {
         // runway selection as for AI traffic. However, this code belongs to
         // somewhere(?) else - if I only new where...
         if( true == fgGetBool( "/environment/metar/valid" ) ) {
+            SG_LOG(SG_ENVIRONMENT, SG_INFO,
+                "Using METAR for runway selection: '" << fgGetString("/environment/metar/data") << "'" );
             // the realwx_ctrl fetches metar in the foreground on init,
             // If it was able to fetch a metar or one was given on the commandline,
             // the valid flag is set here, otherwise it is false
@@ -525,6 +469,9 @@ static void fgIdleFunction ( void ) {
                 extern bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg );
                 fgSetPosFromAirportIDandHdg( apt, hdg );
             }
+        } else {
+            SG_LOG(SG_ENVIRONMENT, SG_INFO,
+                "No METAR available to pick active runway" );
         }
 
         fgSplashProgress("initializing graphics engine");
@@ -551,11 +498,6 @@ static void fgIdleFunction ( void ) {
     }
 }
 
-static void fgWinResizeFunction(int width, int height)
-{
-    globals->get_renderer()->resize(width, height);
-}
-
 static void upper_case_property(const char *name)
 {
     using namespace simgear;
@@ -588,7 +530,7 @@ int fgMainInit( int argc, char **argv ) {
 #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
@@ -610,44 +552,19 @@ int fgMainInit( int argc, char **argv ) {
     upper_case_property("/sim/tower/airport-id");
     upper_case_property("/autopilot/route-manager/input");
 
-    // Scan the config file(s) and command line options to see if
-    // fg_root was specified (ignore all other options for now)
-    fgInitFGRoot(argc, argv);
-
-    // Check for the correct base package version
-    static char required_version[] = "2.5.0";
-    string base_version = fgBasePackageVersion();
-    if ( !(base_version == required_version) ) {
-        // tell the operator how to use this application
-
-        SG_LOG( SG_GENERAL, SG_ALERT, "" ); // To popup the console on windows
-        cerr << endl << "Base package check failed:" << endl \
-             << "  Version " << base_version << " found at: " \
-             << globals->get_fg_root() << endl \
-             << "  Version " << required_version << " is required." << endl \
-             << "Please upgrade/downgrade base package." << endl;
-#ifdef _MSC_VER
-        cerr << "Hit a key to continue..." << endl;
-        cin.get();
-#endif
-        exit(-1);
-    }
-
     // Load the configuration parameters.  (Command line options
     // override config file options.  Config file options override
     // defaults.)
     if ( !fgInitConfig(argc, argv) ) {
-        SG_LOG( SG_GENERAL, SG_ALERT, "Config option parsing failed ..." );
-        exit(-1);
+      SG_LOG( SG_GENERAL, SG_ALERT, "Config option parsing failed ..." );
+      exit(-1);
     }
 
     // Initialize the Window/Graphics environment.
     fgOSInit(&argc, argv);
     _bootstrap_OSInit++;
 
-    fgRegisterWindowResizeHandler( &fgWinResizeFunction );
     fgRegisterIdleHandler( &fgIdleFunction );
-    fgRegisterDrawHandler( &FGRenderer::update );
 
     // Initialize sockets (WinSock needs this)
     simgear::Socket::initSockets();