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

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 4f4abe566..dae961c61 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -73,6 +73,9 @@
 #include <ATC/ATCdisplay.hxx>
 #include <ATC/ATCmgr.hxx>
 #include <ATC/atislist.hxx>
+#include <ATC/towerlist.hxx>
+#include <ATC/approachlist.hxx>
+#include <ATC/AIMgr.hxx>
 #include <Autopilot/auto_gui.hxx>
 #include <Autopilot/newauto.hxx>
 #include <Cockpit/cockpit.hxx>
@@ -86,12 +89,14 @@
 #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>
 #include <Input/input.hxx>
 // #include <Joystick/joystick.hxx>
 #include <Objects/matlib.hxx>
+#include <Model/acmodel.hxx>
 #include <Navaids/fixlist.hxx>
 #include <Navaids/ilslist.hxx>
 #include <Navaids/mkrbeacons.hxx>
@@ -100,13 +105,13 @@
 #include <Scenery/tilemgr.hxx>
 #include <Sound/fg_fx.hxx>
 #include <Sound/soundmgr.hxx>
-#include <Time/event.hxx>
+#include <Time/FGEventMgr.hxx>
 #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>
@@ -228,14 +233,7 @@ bool fgInitConfig ( int argc, char **argv ) {
     SGPath props_path(globals->get_fg_root());
     props_path.append("preferences.xml");
     SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
-    try {
-      readProperties(props_path.str(), globals->get_props());
-    } catch (const sg_exception &e) {
-      string message = "Error reading global preferences: ";
-      message += e.getFormattedMessage();
-      SG_LOG(SG_INPUT, SG_ALERT, message);
-      exit(2);
-    }
+    readProperties(props_path.str(), globals->get_props());
     SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
 
     // Read the default aircraft config file.
@@ -267,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( "." );
@@ -352,6 +350,29 @@ bool fgSetPosFromAirportID( const string& id ) {
 }
 
 
+
+// Set current tower position lon/lat given an airport id
+bool fgSetTowerPosFromAirportID( const string& id, double hdg ) {
+    FGAirport a;
+    // tower height hard coded for now...
+    float towerheight=50.0f;
+
+    // make a little off the heading for 1 runway airports...
+    float fudge_lon = fabs(sin(hdg)) * .003f;
+    float fudge_lat = .003f - fudge_lon;
+
+    if ( fgFindAirportID( id, &a ) ) {
+	fgSetDouble("/sim/tower/longitude-deg",  a.longitude + fudge_lon);
+	fgSetDouble("/sim/tower/latitude-deg",  a.latitude + fudge_lat);
+        fgSetDouble("/sim/tower/altitude-ft", a.elevation + towerheight);
+	return true;
+    } else {
+	return false;
+    }
+
+}
+
+
 // Set current_options lon/lat given an airport id and heading (degrees)
 bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     FGRunway r;
@@ -472,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");
@@ -556,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, "localhost" );
-	} 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,
@@ -589,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);
 }
 
@@ -682,26 +740,42 @@ 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");
+		
 	global_tile_mgr.update( longitude->getDoubleValue(),
-				latitude->getDoubleValue() );
+				latitude->getDoubleValue(),
+				visibility_meters );
     } else {
     	SG_LOG( SG_GENERAL, SG_ALERT, "Error in Tile Manager initialization!" );
 	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() );
 
 
     ////////////////////////////////////////////////////////////////////
@@ -715,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()",
-			    fgMethodCallback<fgEVENT_MGR>( &global_events,
-						   &fgEVENT_MGR::PrintStats),
-			    fgEVENT::FG_EVENT_READY, 60000 );
-
-
     ////////////////////////////////////////////////////////////////////
     // Initialize the view manager subsystem.
     ////////////////////////////////////////////////////////////////////
@@ -744,19 +805,20 @@ bool fgInitSubsystems( void ) {
     // things for correctly orienting the sky.
     fgUpdateSunPos();
     fgUpdateMoonPos();
-    global_events.Register( "fgUpdateSunPos()", fgUpdateSunPos,
-			    fgEVENT::FG_EVENT_READY, 60000);
-    global_events.Register( "fgUpdateMoonPos()", fgUpdateMoonPos,
-			    fgEVENT::FG_EVENT_READY, 60000);
+    global_events.Register( "fgUpdateSunPos()", &fgUpdateSunPos,
+			    60000);
+    global_events.Register( "fgUpdateMoonPos()", &fgUpdateMoonPos,
+			    60000);
 
     // 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()",
-			    fgMethodCallback<fgLIGHT>( &cur_light_params,
-						       &fgLIGHT::Update),
-			    fgEVENT::FG_EVENT_READY, 30000 );
+			    &cur_light_params, &fgLIGHT::Update,
+			    30000 );
 
 
     ////////////////////////////////////////////////////////////////////
@@ -767,13 +829,14 @@ bool fgInitSubsystems( void ) {
     globals->get_logger()->init();
     globals->get_logger()->bind();
 
+
     ////////////////////////////////////////////////////////////////////
     // Initialize the local time subsystem.
     ////////////////////////////////////////////////////////////////////
 
     // update the current timezone each 30 minutes
-    global_events.Register( "fgUpdateLocalTime()", fgUpdateLocalTime,
-			    fgEVENT::FG_EVENT_READY, 1800000);
+    global_events.Register( "fgUpdateLocalTime()", &fgUpdateLocalTime,
+			    30*60*1000 );
 
 
     ////////////////////////////////////////////////////////////////////
@@ -781,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;
@@ -819,8 +882,8 @@ bool fgInitSubsystems( void ) {
     WeatherDatabase = FGLocalWeatherDatabase::theFGLocalWeatherDatabase;
 
     // register the periodic update of the weather
-    global_events.Register( "weather update", fgUpdateWeatherDatabase,
-                            fgEVENT::FG_EVENT_READY, 30000);
+    global_events.Register( "weather update", &fgUpdateWeatherDatabase,
+                            30000);
 #else
     globals->get_environment_mgr()->init();
     globals->get_environment_mgr()->bind();
@@ -856,13 +919,24 @@ bool fgInitSubsystems( void ) {
     // Initialize ATC list management and query systems
     ////////////////////////////////////////////////////////////////////
 
-    //DCL
     SG_LOG(SG_GENERAL, SG_INFO, "  ATIS");
     current_atislist = new FGATISList;
     SGPath p_atis( globals->get_fg_root() );
     p_atis.append( "ATC/default.atis" );
     current_atislist->init( p_atis );
 
+    SG_LOG(SG_GENERAL, SG_INFO, "  Tower");
+    current_towerlist = new FGTowerList;
+    SGPath p_tower( globals->get_fg_root() );
+    p_tower.append( "ATC/default.tower" );
+    current_towerlist->init( p_tower );
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  Approach");
+    current_approachlist = new FGApproachList;
+    SGPath p_approach( globals->get_fg_root() );
+    p_approach.append( "ATC/default.approach" );
+    current_approachlist->init( p_approach );
+
     ////////////////////////////////////////////////////////////////////
     // Initialise ATC display system
     ////////////////////////////////////////////////////////////////////
@@ -877,7 +951,15 @@ bool fgInitSubsystems( void ) {
 
     SG_LOG(SG_GENERAL, SG_INFO, "  ATC Manager");
     globals->set_ATC_mgr(new FGATCMgr);
-    globals->get_ATC_mgr()->init();     
+    globals->get_ATC_mgr()->init(); 
+    
+    ////////////////////////////////////////////////////////////////////
+    // Initialise the AI Manager 
+    ////////////////////////////////////////////////////////////////////
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  AI Manager");
+    // globals->set_AI_mgr(new FGAIMgr);
+    // globals->get_AI_mgr()->init();     
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the built-in commands.
@@ -927,15 +1009,6 @@ bool fgInitSubsystems( void ) {
     }
 
 
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the joystick subsystem.
-    ////////////////////////////////////////////////////////////////////
-
-    // if ( ! fgJoystickInit() ) {
-    //   SG_LOG( SG_GENERAL, SG_ALERT, "Error in Joystick initialization!" );
-    // }
-
-
     ////////////////////////////////////////////////////////////////////
     // Initialize the autopilot subsystem.
     ////////////////////////////////////////////////////////////////////
@@ -1030,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();
     
@@ -1049,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();
@@ -1063,3 +1130,4 @@ void fgReInitSubsystems( void )
 	fgSetBool("/sim/freeze/master", false);
     }
 }
+