]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/main.cxx
Fix line endings
[flightgear.git] / src / Main / main.cxx
index cc1ed5e3fd2e4324f545de0306f4ac5314b6bad5..4adc55995c47a9e4efd0e586866355155dc6ead7 100644 (file)
@@ -55,6 +55,7 @@
 #include <simgear/scene/sky/sky.hxx>
 #include <Time/light.hxx>
 #include <Include/general.hxx>
+#include <Aircraft/replay.hxx>
 #include <Cockpit/cockpit.hxx>
 #include <Cockpit/hud.hxx>
 #include <Model/panelnode.hxx>
 #include <Sound/beacon.hxx>
 #include <Sound/morse.hxx>
 #include <FDM/flight.hxx>
-#include <FDM/UIUCModel/uiuc_aircraftdir.h>
 // #include <FDM/ADA.hxx>
 #include <ATC/ATCdisplay.hxx>
 #include <ATC/ATCmgr.hxx>
 #include <ATC/AIMgr.hxx>
-#include <Replay/replay.hxx>
 #include <Time/tmp.hxx>
 #include <Time/fg_timer.hxx>
 #include <Environment/environment_mgr.hxx>
 #include <GUI/new_gui.hxx>
-
-#ifdef FG_MPLAYER_AS
-#include <MultiPlayer/multiplaytxmgr.hxx>
-#include <MultiPlayer/multiplayrxmgr.hxx>
-#endif
-
-
+#include <MultiPlayer/multiplaymgr.hxx>
 
 #include "fg_commands.hxx"
 #include "fg_io.hxx"
@@ -139,15 +132,21 @@ void fgUpdateTimeDepCalcs() {
     // cout << "cur_fdm_state->get_inited() = " << cur_fdm_state->get_inited() 
     //      << " cur_elev = " << scenery.get_cur_elev() << endl;
 
-    if ( !cur_fdm_state->get_inited() &&
-         globals->get_scenery()->get_cur_elev() > -9990 )
-    {
-        SG_LOG(SG_FLIGHT,SG_INFO, "Finally initializing fdm");  
+    if (!cur_fdm_state->get_inited()) {
+      // Check for scenery around the aircraft.
+      double lon = fgGetDouble("/sim/presets/longitude-deg");
+      double lat = fgGetDouble("/sim/presets/latitude-deg");
+      // We require just to have 50 meter scenery availabe around
+      // the aircraft.
+      double range = 50.0;
+      if (globals->get_tile_mgr()->scenery_available(lat, lon, range)) {
+        SG_LOG(SG_FLIGHT,SG_INFO, "Finally initializing fdm");
         cur_fdm_state->init();
         if ( cur_fdm_state->get_bound() ) {
             cur_fdm_state->unbind();
         }
         cur_fdm_state->bind();
+      }
     }
 
     // conceptually, the following block could be done for each fdm
@@ -216,6 +215,8 @@ static void fgMainLoop( void ) {
         = fgGetNode("/sim/freeze/clock", true);
     static const SGPropertyNode *cur_time_override
         = fgGetNode("/sim/time/cur-time-override", true);
+    static const SGPropertyNode *max_simtime_per_frame
+        = fgGetNode("/sim/max-simtime-per-frame", true);
 
     SGCloudLayer::enable_bump_mapping = fgGetBool("/sim/rendering/bump-mapping");
 
@@ -288,6 +289,20 @@ static void fgMainLoop( void ) {
 
     real_delta_time_sec
         = double(current_time_stamp - last_time_stamp) / 1000000.0;
+
+    // Limit the time we need to spend in simulation loops
+    // That means, if the /sim/max-simtime-per-frame value is strictly positive
+    // you can limit the maximum amount of time you will do simulations for
+    // one frame to display. The cpu time spent in simulations code is roughtly
+    // at least O(real_delta_time_sec). If this is (due to running debug
+    // builds or valgrind or something different blowing up execution times)
+    // larger than the real time you will no more get any response
+    // from flightgear. This limits that effect. Just set to property from
+    // your .fgfsrc or commandline ...
+    double dtMax = max_simtime_per_frame->getDoubleValue();
+    if (0 < dtMax && dtMax < real_delta_time_sec)
+      real_delta_time_sec = dtMax;
+
     // round the real time down to a multiple of 1/model-hz.
     // this way all systems are updated the _same_ amount of dt.
     {
@@ -300,7 +315,7 @@ static void fgMainLoop( void ) {
     }
 
 
-    if ( clock_freeze->getBoolValue() ) {
+    if (clock_freeze->getBoolValue() || !scenery_loaded) {
         delta_time_sec = 0;
     } else {
         delta_time_sec = real_delta_time_sec;
@@ -434,19 +449,20 @@ static void fgMainLoop( void ) {
     ++frames;
 #endif
 
+    // Update any multiplayer's network queues, the AIMultiplayer
+    // implementation is an AI model and depends on that
+    globals->get_multiplayer_mgr()->Update();
+
     // Run ATC subsystem
-    if (fgGetBool("/sim/ATC/enabled"))
+    if (fgGetBool("/sim/atc/enabled"))
         globals->get_ATC_mgr()->update(delta_time_sec);
 
     // Run the AI subsystem
+    // FIXME: run that also if we have multiplying enabled since the
+    // multiplayer information is interpreted by an AI model
     if (fgGetBool("/sim/ai-traffic/enabled"))
         globals->get_AI_mgr()->update(delta_time_sec);
 
-#ifdef FG_MPLAYER_AS
-    // Update any multiplayer models
-    globals->get_multiplayer_rx_mgr()->Update();
-#endif
-
     // Run flight model
 
     // Calculate model iterations needed for next frame
@@ -469,9 +485,7 @@ static void fgMainLoop( void ) {
     if ( global_multi_loop > 0) {
         // first run the flight model each frame until it is intialized
         // then continue running each frame only after initial scenery load is complete.
-        if (!cur_fdm_state->get_inited() || scenery_loaded) {
-            fgUpdateTimeDepCalcs();
-        }
+        fgUpdateTimeDepCalcs();
     } else {
         SG_LOG( SG_ALL, SG_DEBUG, 
             "Elapsed time is zero ... we're zinging" );
@@ -522,55 +536,37 @@ static void fgMainLoop( void ) {
       globals->get_scenery()->set_next_center( cntr );
     }
 
-    // get the location data for the primary FDM (now hardcoded to ac model)...
-    SGLocation *acmodel_loc = NULL;
-    acmodel_loc = (SGLocation *)globals->
-        get_aircraft_model()->get3DModel()->getSGLocation();
-
-    // update tile manager for FDM...
-    // ...only if location is different than the current-view location
-    // (to avoid duplicating effort)
-    if( !fgGetBool("/sim/current-view/config/from-model") ) {
-        if( acmodel_loc != NULL ) {
-            globals->get_tile_mgr()->prep_ssg_nodes( acmodel_loc,
-                                                     visibility_meters );
-            globals->get_tile_mgr()->
-                update( acmodel_loc, visibility_meters,
-                        acmodel_loc->
-                        get_absolute_view_pos(globals->
-                                              get_scenery()->get_center()) );
-            globals->get_scenery()->set_center( cntr );
-
-            // save results of update in SGLocation for fdm...
-            if ( globals->get_scenery()->get_cur_elev() > -9990 ) {
-                acmodel_loc->
-                    set_cur_elev_m( globals->get_scenery()->get_cur_elev() );
-                fgSetDouble("/position/ground-elev-m",
-                            globals->get_scenery()->get_cur_elev());
-            }
-            acmodel_loc->
-                set_tile_center( globals->get_scenery()->get_next_center() );
-        }
-    }
-
     globals->get_tile_mgr()->prep_ssg_nodes( current_view->getSGLocation(),
                                              visibility_meters );
     // update tile manager for view...
-    // IMPORTANT!!! the tilemgr update for view location _must_ be
-    // done last after the FDM's until all of Flight Gear code
-    // references the viewer's location for elevation instead of the
-    // "scenery's" current elevation.
     SGLocation *view_location = globals->get_current_view()->getSGLocation();
-    globals->get_tile_mgr()->update( view_location, visibility_meters,
-                                     current_view->get_absolute_view_pos() );
+    globals->get_tile_mgr()->update( view_location, visibility_meters );
     globals->get_scenery()->set_center( cntr );
-    // save results of update in SGLocation for fdm...
-    if ( globals->get_scenery()->get_cur_elev() > -9990 ) {
-        current_view->getSGLocation()->
-            set_cur_elev_m( globals->get_scenery()->get_cur_elev() );
+    {
+      double lon = view_location->getLongitude_deg();
+      double lat = view_location->getLatitude_deg();
+      double alt = view_location->getAltitudeASL_ft() * SG_FEET_TO_METER;
+
+      // check if we can reuse the groundcache for that purpose.
+      double ref_time, pt[3], r;
+      bool valid = cur_fdm_state->is_valid_m(&ref_time, pt, &r);
+      if (valid &&
+          cntr.distance3Dsquared(Point3D(pt[0], pt[1], pt[2])) < r*r) {
+        // Reuse the cache ...
+        double lev
+          = cur_fdm_state->get_groundlevel_m(lat*SGD_DEGREES_TO_RADIANS,
+                                             lon*SGD_DEGREES_TO_RADIANS,
+                                             alt + 2.0);
+        view_location->set_cur_elev_m( lev );
+      } else {
+        // Do full intersection test.
+        double lev;
+        if (globals->get_scenery()->get_elevation_m(lat, lon, alt+2, lev))
+          view_location->set_cur_elev_m( lev );
+        else
+          view_location->set_cur_elev_m( -9999.0 );
+      }
     }
-    current_view->getSGLocation()->
-        set_tile_center( globals->get_scenery()->get_next_center() );
 
 #ifdef ENABLE_AUDIO_SUPPORT
     // Right now we make a simplifying assumption that the primary
@@ -579,11 +575,19 @@ static void fgMainLoop( void ) {
 
     static sgVec3 last_pos_offset;
 
+    // get the location data for the primary FDM (now hardcoded to ac model)...
+    SGLocation *acmodel_loc = NULL;
+    acmodel_loc = (SGLocation *)globals->
+        get_aircraft_model()->get3DModel()->getSGLocation();
+
     // set positional offset for sources
-    sgVec3 source_pos_offset;
-    sgSubVec3( source_pos_offset,
-               view_location->get_view_pos(), acmodel_loc->get_view_pos() );
+    sgdVec3 dsource_pos_offset;
+    sgdSubVec3( dsource_pos_offset,
+                view_location->get_absolute_view_pos(),
+                acmodel_loc->get_absolute_view_pos() );
     // cout << "pos all = " << source_pos_offset[0] << " " << source_pos_offset[1] << " " << source_pos_offset[2] << endl;
+    sgVec3 source_pos_offset;
+    sgSetVec3(source_pos_offset, dsource_pos_offset);
     globals->get_soundmgr()->set_source_pos_all( source_pos_offset );
 
     // set the velocity
@@ -602,22 +606,6 @@ static void fgMainLoop( void ) {
     globals->get_soundmgr()->set_listener_pos( listener_pos );
 #endif
 
-    // If fdm location is same as viewer's then we didn't do the
-    // update for fdm location above so we need to save the viewer
-    // results in the fdm SGLocation as well...
-    if( fgGetBool("/sim/current-view/config/from-model") ) {
-        if( acmodel_loc != 0 ) {
-            if ( globals->get_scenery()->get_cur_elev() > -9990 ) {
-                acmodel_loc->set_cur_elev_m( globals->get_scenery()->
-                                             get_cur_elev() );
-                fgSetDouble("/position/ground-elev-m",
-                            globals->get_scenery()->get_cur_elev());
-            }
-            acmodel_loc->set_tile_center( globals->get_scenery()->
-                                          get_next_center() );
-        }
-    }
-
     // END Tile Manager udpates
 
     if (!scenery_loaded && globals->get_tile_mgr()->all_queues_empty() && cur_fdm_state->get_inited()) {
@@ -710,7 +698,7 @@ static void fgIdleFunction ( void ) {
             } else
                 glPointParameterIsSupported = false;
         }
-        fgSplashProgress("reading navigation data");
+        fgSplashProgress("reading airport & navigation data");
 
 
     } else if ( idle_state == 3 ) {
@@ -965,7 +953,7 @@ bool fgMainInit( int argc, char **argv ) {
     fgInitFGRoot(argc, argv);
 
     // Check for the correct base package version
-    static char required_version[] = "0.9.8";
+    static char required_version[] = "0.9.9";
     string base_version = fgBasePackageVersion();
     if ( !(base_version == required_version) ) {
         // tell the operator how to use this application
@@ -984,9 +972,6 @@ bool fgMainInit( int argc, char **argv ) {
 
     sgUseDisplayList = fgGetBool( "/sim/rendering/use-display-list", true );
 
-    // Initialize the Aircraft directory to "" (UIUC)
-    aircraft_dir = "";
-
     // Load the configuration parameters.  (Command line options
     // overrides config file options.  Config file options override
     // defaults.)
@@ -1022,11 +1007,12 @@ bool fgMainInit( int argc, char **argv ) {
     fgOSOpenWindow( fgGetInt("/sim/startup/xsize"),
                     fgGetInt("/sim/startup/ysize"),
                     fgGetInt("/sim/rendering/bits-per-pixel"),
-                    fgGetBool("/sim/rendering/clouds3d"),
+                    fgGetBool("/sim/rendering/clouds3d-enable"),
                     get_stencil_buffer,
                     fgGetBool("/sim/startup/fullscreen") );
 
     // Initialize the splash screen right away
+    fntInit();
     fgSplashInit(fgGetString("/sim/startup/splash-texture"));
 
     // pass control off to the master event handler