X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_init.cxx;h=dae961c619a0fde92b6cc2a2c45f6ec87e694747;hb=a4e81f4ff075e6a3c0c2ea1b5a29c0bcdfdbc671;hp=be061a1d25824daa2d185a91263e405cf92e1706;hpb=42a5ee93d79c5adb76c3a3a94d056fdbcaf7e913;p=flightgear.git

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index be061a1d2..dae961c61 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -89,6 +89,7 @@
 #include <FDM/JSBSim/JSBSim.hxx>
 #include <FDM/LaRCsim.hxx>
 #include <FDM/MagicCarpet.hxx>
+#include <FDM/UFO.hxx>
 #include <FDM/NullFDM.hxx>
 #include <FDM/YASim/YASim.hxx>
 #include <Include/general.hxx>
@@ -105,13 +106,12 @@
 #include <Sound/fg_fx.hxx>
 #include <Sound/soundmgr.hxx>
 #include <Time/FGEventMgr.hxx>
-#include <boost/bind.hpp>
 #include <Time/light.hxx>
 #include <Time/sunpos.hxx>
 #include <Time/moonpos.hxx>
 #include <Time/tmp.hxx>
 
-#ifndef FG_NEW_ENVIRONMENT
+#ifdef FG_WEATHERCM
 #  include <WeatherCM/FGLocalWeatherDatabase.h>
 #else
 #  include <Environment/environment_mgr.hxx>
@@ -265,8 +265,8 @@ bool fgInitConfig ( int argc, char **argv ) {
     config.append( "system.fgfsrc" );
     fgParseOptions(config.str());
 
-    char name[256];
 #if defined( unix ) || defined( __CYGWIN__ )
+    char name[256];
     // Check for $fg_root/system.fgfsrc.hostname
     gethostname( name, 256 );
     config.concat( "." );
@@ -493,6 +493,7 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     return true;
 }
 
+
 void fgSetPosFromGlideSlope(void) {
     double gs = fgGetDouble("/velocities/glideslope");
     double od = fgGetDouble("/sim/startup/offset-distance");
@@ -577,23 +578,56 @@ void fgInitFDM() {
     const string &model = fgGetString("/sim/flight-model");
 
     try {
-	if (model == "larcsim") {
+	if ( model == "larcsim" ) {
 	    cur_fdm_state = new FGLaRCsim( dt );
-	} else if (model == "jsb") {
+	} else if ( model == "jsb" ) {
 	    cur_fdm_state = new FGJSBsim( dt );
-	} else if (model == "ada") {
+	} else if ( model == "ada" ) {
 	    cur_fdm_state = new FGADA( dt );
-	} else if (model == "balloon") {
+	} else if ( model == "balloon" ) {
 	    cur_fdm_state = new FGBalloonSim( dt );
-	} else if (model == "magic") {
+	} else if ( model == "magic" ) {
 	    cur_fdm_state = new FGMagicCarpet( dt );
-	} else if (model == "external") {
+	} else if ( model == "ufo" ) {
+	    cur_fdm_state = new FGUFO( dt );
+	} else if ( model == "external" ) {
 	    cur_fdm_state = new FGExternal( dt );
-	} else if (model == "network") {
-	    cur_fdm_state = new FGExternalNet( dt, 5501, 5502, 5503, "10.0.2.4" );
-	} else if (model == "null") {
+	} else if ( model.find("network") == 0 ) {
+            string host = "localhost";
+            int port1 = 5501;
+            int port2 = 5502;
+            int port3 = 5503;
+            string net_options = model.substr(8);
+            string::size_type begin, end;
+            begin = 0;
+            // host
+            end = net_options.find( ",", begin );
+            if ( end != string::npos ) {
+                host = net_options.substr(begin, end - begin);
+                begin = end + 1;
+            }
+            // port1
+            end = net_options.find( ",", begin );
+            if ( end != string::npos ) {
+                port1 = atoi( net_options.substr(begin, end - begin).c_str() );
+                begin = end + 1;
+            }
+            // port2
+            end = net_options.find( ",", begin );
+            if ( end != string::npos ) {
+                port2 = atoi( net_options.substr(begin, end - begin).c_str() );
+                begin = end + 1;
+            }
+            // port3
+            end = net_options.find( ",", begin );
+            if ( end != string::npos ) {
+                port3 = atoi( net_options.substr(begin, end - begin).c_str() );
+                begin = end + 1;
+            }
+	    cur_fdm_state = new FGExternalNet( dt, host, port1, port2, port3 );
+	} else if ( model == "null" ) {
 	    cur_fdm_state = new FGNullFDM( dt );
-	} else if (model == "yasim") {
+	} else if ( model == "yasim" ) {
 	    cur_fdm_state = new YASim( dt );
 	} else {
 	    SG_LOG(SG_GENERAL, SG_ALERT,
@@ -610,6 +644,9 @@ void fgInitFDM() {
 
 // Initialize view parameters
 void fgInitView() {
+  // force update of model so that viewer can get some data...
+  globals->get_aircraft_model()->update(0);
+  // run update for current view so that data is current...
   globals->get_viewmgr()->update(0);
 }
 
@@ -703,14 +740,22 @@ bool fgInitSubsystems( void ) {
 	exit(-1);
     }
 
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the event manager subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    global_events.init();
+
+    // Output event stats every 60 seconds
+    global_events.Register( "FGEventMgr::print_stats()",
+			    &global_events, &FGEventMgr::print_stats,
+			    60000 );
+
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the scenery management subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    scenery.init();
-    scenery.bind();
-
     if ( global_tile_mgr.init() ) {
 	// Load the local scenery data
 	double visibility_meters = fgGetDouble("/environment/visibility-m");
@@ -723,9 +768,14 @@ bool fgInitSubsystems( void ) {
 	exit(-1);
     }
 
+    // cause refresh of viewer scenery timestamps every 15 seconds...
+    global_events.Register( "FGTileMgr::refresh_view_timestamps()",
+			    &global_tile_mgr, &FGTileMgr::refresh_view_timestamps,
+			    15000 );
+
     SG_LOG( SG_GENERAL, SG_DEBUG,
     	    "Current terrain elevation after tile mgr init " <<
-	    scenery.get_cur_elev() );
+	    globals->get_scenery()->get_cur_elev() );
 
 
     ////////////////////////////////////////////////////////////////////
@@ -739,19 +789,6 @@ bool fgInitSubsystems( void ) {
     fgAircraftInit();   // In the future this might not be the case.
 
 
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the event manager subsystem.
-    ////////////////////////////////////////////////////////////////////
-
-    global_events.init();
-
-    // Output event stats every 60 seconds
-    global_events.Register( "fgEVENT_MGR::PrintStats()",
-			    boost::bind( &FGEventMgr::print_stats,
-                                         &global_events ),
-			    60000 );
-
-
     ////////////////////////////////////////////////////////////////////
     // Initialize the view manager subsystem.
     ////////////////////////////////////////////////////////////////////
@@ -776,9 +813,11 @@ bool fgInitSubsystems( void ) {
     // Initialize Lighting interpolation tables
     l->Init();
 
+    // force one lighting update to make it right to start with...
+    l->Update();
     // update the lighting parameters (based on sun angle)
     global_events.Register( "fgLight::Update()",
-			    boost::bind( &fgLIGHT::Update, &cur_light_params ),
+			    &cur_light_params, &fgLIGHT::Update,
 			    30000 );
 
 
@@ -805,7 +844,7 @@ bool fgInitSubsystems( void ) {
     ////////////////////////////////////////////////////////////////////
 
     // Initialize the weather modeling subsystem
-#ifndef FG_NEW_ENVIRONMENT
+#ifdef FG_WEATHERCM
     // Initialize the WeatherDatabase
     SG_LOG(SG_GENERAL, SG_INFO, "Creating LocalWeatherDatabase");
     sgVec3 position;
@@ -919,8 +958,8 @@ bool fgInitSubsystems( void ) {
     ////////////////////////////////////////////////////////////////////
 
     SG_LOG(SG_GENERAL, SG_INFO, "  AI Manager");
-    globals->set_AI_mgr(new FGAIMgr);
-    globals->get_AI_mgr()->init();     
+    // globals->set_AI_mgr(new FGAIMgr);
+    // globals->get_AI_mgr()->init();     
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the built-in commands.
@@ -1064,18 +1103,9 @@ void fgReInitSubsystems( void )
     }
     
     // Initialize the Scenery Management subsystem
-    scenery.init();
-
-#if 0
-    if( global_tile_mgr.init() ) {
-	Load the local scenery data
-	global_tile_mgr.update( longitude->getDoubleValue(),
-				latitude->getDoubleValue() );
-    } else {
-    	SG_LOG( SG_GENERAL, SG_ALERT, "Error in Tile Manager initialization!" );
-        exit(-1);
-    }
-#endif
+    // FIXME, what really needs to get initialized here, at the time
+    // this was commented out, scenery.init() was a noop
+    // scenery.init();
 
     fgInitFDM();
     
@@ -1083,6 +1113,9 @@ void fgReInitSubsystems( void )
     // model or control parameters are set
     fgAircraftInit();   // In the future this might not be the case.
 
+    // copy viewer settings into current-view path
+    globals->get_viewmgr()->copyToCurrent();
+
     fgInitView();
 
     globals->get_controls()->reset_all();
@@ -1098,4 +1131,3 @@ void fgReInitSubsystems( void )
     }
 }
 
-