revert revisions 1.246 to 1.248. This fixes the jitter for chase

view in network replay, and re-introduces jitter in some (rare)
cases of Nasal managed views.

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 2eb7686f36bbe56c5f97ecd847e745553f82568f..c49d214d548061a5ba71dec34a0460cb9cd787b2 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -180,6 +180,9 @@ void fgUpdateTimeDepCalcs() {
     globals->get_model_mgr()->update(delta_time_sec);
     globals->get_aircraft_model()->update(delta_time_sec);
 
+    // update the view angle
+    globals->get_viewmgr()->update(delta_time_sec);
+
     // Update solar system
     globals->get_ephem()->update( globals->get_time_params()->getMjd(),
                                   globals->get_time_params()->getLst(),
@@ -340,6 +343,8 @@ static void fgMainLoop( void ) {
 
     SGTime *t = globals->get_time_params();
 
+    globals->get_event_mgr()->update(delta_time_sec);
+
     SG_LOG( SG_ALL, SG_DEBUG, "Running Main Loop");
     SG_LOG( SG_ALL, SG_DEBUG, "======= ==== ====");
 
@@ -540,12 +545,6 @@ static void fgMainLoop( void ) {
         }
     }
 
-    // run Nasal's settimer() loops right before the view manager
-    globals->get_event_mgr()->update(delta_time_sec);
-
-    // update the view angle as late as possible, but before sound calculations
-    globals->get_viewmgr()->update(delta_time_sec);
-
 #ifdef ENABLE_AUDIO_SUPPORT
     // Right now we make a simplifying assumption that the primary
     // aircraft is the source of all sounds and that all sounds are