#include <simgear/math/polar3d.hxx>
#include <simgear/math/sg_geodesy.hxx>
#include <simgear/misc/sg_path.hxx>
+#include <simgear/scene/material/matlib.hxx>
#ifdef FG_USE_CLOUDS_3D
# include <simgear/sky/clouds3d/SkySceneLoader.hpp>
# include <simgear/sky/clouds3d/SkyUtil.hpp>
#include <Airports/simple.hxx>
#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>
#include <Cockpit/radiostack.hxx>
-#include <Cockpit/steam.hxx>
#include <Cockpit/panel.hxx>
#include <Cockpit/panel_io.hxx>
#include <FDM/ADA.hxx>
#include <FDM/Balloon.h>
#include <FDM/ExternalNet/ExternalNet.hxx>
+#include <FDM/ExternalPipe/ExternalPipe.hxx>
#include <FDM/JSBSim/JSBSim.hxx>
-#include <FDM/LaRCsim.hxx>
+#include <FDM/LaRCsim/LaRCsim.hxx>
#include <FDM/MagicCarpet.hxx>
#include <FDM/UFO.hxx>
#include <FDM/NullFDM.hxx>
#include <Include/general.hxx>
#include <Input/input.hxx>
#include <Instrumentation/instrument_mgr.hxx>
-// #include <Joystick/joystick.hxx>
-#include <Objects/matlib.hxx>
#include <Model/acmodel.hxx>
#include <Navaids/fixlist.hxx>
#include <Navaids/ilslist.hxx>
#include <Navaids/navlist.hxx>
#include <Scenery/scenery.hxx>
#include <Scenery/tilemgr.hxx>
+#if defined(HAVE_PLIB_PSL)
+#include <Scripting/scriptmgr.hxx>
+#endif
#include <Sound/fg_fx.hxx>
-#include <Sound/soundmgr.hxx>
#include <Systems/system_mgr.hxx>
#include <Time/FGEventMgr.hxx>
#include <Time/light.hxx>
#include <Time/moonpos.hxx>
#include <Time/tmp.hxx>
+#ifdef FG_MPLAYER_AS
+#include <MultiPlayer/multiplaytxmgr.hxx>
+#include <MultiPlayer/multiplayrxmgr.hxx>
+#endif
+
#ifdef FG_WEATHERCM
# include <WeatherCM/FGLocalWeatherDatabase.h>
#else
SG_USING_STD(string);
+
+class Sound;
+
extern const char *default_root;
#ifdef FG_USE_CLOUDS_3D
SGPropertyNode *locale = fgInitLocale(language);
if (!locale) {
- cerr << "No internationalization settings specified in preferences.xml"
- << endl;
+ SG_LOG(SG_GENERAL, SG_ALERT,
+ "No internationalization settings specified in preferences.xml" );
return false;
}
// Set current_options lon/lat given an airport id and heading (degrees)
static bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
FGRunway r;
- FGRunway found_r;
- double found_dir = 0.0;
if ( id.length() ) {
// set initial position from runway and heading
FGRunways runways( path.c_str() );
SG_LOG( SG_GENERAL, SG_INFO,
- "Attempting to set starting position from runway code "
+ "Attempting to set starting position from airport code "
<< id << " heading " << tgt_hdg );
-
- if ( ! runways.search( id, &r ) ) {
+
+ if ( ! runways.search( id, (int)tgt_hdg, &r ) ) {
SG_LOG( SG_GENERAL, SG_ALERT,
- "Failed to find " << id << " in database." );
+ "Failed to find a good runway for " << id << '\n' );
return false;
- }
-
- double diff;
- double min_diff = 360.0;
-
- while ( r.id == id ) {
- // forward direction
- diff = tgt_hdg - r.heading;
- while ( diff < -180.0 ) { diff += 360.0; }
- while ( diff > 180.0 ) { diff -= 360.0; }
- diff = fabs(diff);
- SG_LOG( SG_GENERAL, SG_INFO,
- "Runway " << r.rwy_no << " heading = " << r.heading <<
- " diff = " << diff );
- if ( diff < min_diff ) {
- min_diff = diff;
- found_r = r;
- found_dir = 0;
- }
-
- // reverse direction
- diff = tgt_hdg - r.heading - 180.0;
- while ( diff < -180.0 ) { diff += 360.0; }
- while ( diff > 180.0 ) { diff -= 360.0; }
- diff = fabs(diff);
- SG_LOG( SG_GENERAL, SG_INFO,
- "Runway -" << r.rwy_no << " heading = " <<
- r.heading + 180.0 <<
- " diff = " << diff );
- if ( diff < min_diff ) {
- min_diff = diff;
- found_r = r;
- found_dir = 180.0;
- }
-
- runways.next( &r );
- }
-
- SG_LOG( SG_GENERAL, SG_INFO, "closest runway = " << found_r.rwy_no
- << " + " << found_dir );
-
+ }
} else {
return false;
}
- double heading = found_r.heading + found_dir;
- while ( heading >= 360.0 ) { heading -= 360.0; }
-
double lat2, lon2, az2;
- double azimuth = found_r.heading + found_dir + 180.0;
+ double heading = r.heading;
+ double azimuth = heading + 180.0;
while ( azimuth >= 360.0 ) { azimuth -= 360.0; }
SG_LOG( SG_GENERAL, SG_INFO,
- "runway = " << found_r.lon << ", " << found_r.lat
- << " length = " << found_r.length * SG_FEET_TO_METER * 0.5
+ "runway = " << r.lon << ", " << r.lat
+ << " length = " << r.length * SG_FEET_TO_METER
<< " heading = " << azimuth );
-
- geo_direct_wgs_84 ( 0, found_r.lat, found_r.lon,
- azimuth, found_r.length * SG_FEET_TO_METER * 0.5 - 5.0,
+
+ geo_direct_wgs_84 ( 0, r.lat, r.lon, azimuth,
+ r.length * SG_FEET_TO_METER * 0.5 - 5.0,
&lat2, &lon2, &az2 );
if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON ) {
<< lon2 << ", "
<< lat2 << ") new heading is "
<< heading );
-
+
return true;
}
-// Set current_options lon/lat given an airport id and heading (degrees)
+// Set current_options lon/lat given an airport id and runway number
static bool fgSetPosFromAirportIDandRwy( const string& id, const string& rwy ) {
FGRunway r;
- FGRunway found_r;
- double heading = 0.0;
- string runway;
- bool match = false;
-
- // standardize input number
- string tmp = rwy.substr(1, 1);
- if ( tmp == "L" || tmp == "R" || tmp == "C" ) {
- runway = "0";
- runway += rwy;
- } else {
- runway = rwy;
- }
if ( id.length() ) {
- // set initial position from runway and heading
+ // set initial position from airport and runway number
SGPath path( globals->get_fg_root() );
path.append( "Airports" );
SG_LOG( SG_GENERAL, SG_INFO,
"Attempting to set starting position for "
- << id << ":" << runway );
+ << id << ":" << rwy );
- if ( ! runways.search( id, &r ) ) {
+ if ( ! runways.search( id, rwy, &r ) ) {
SG_LOG( SG_GENERAL, SG_ALERT,
- "Failed to find " << id << " in database." );
+ "Failed to find runway " << rwy <<
+ " at airport " << id );
return false;
}
-
- while ( r.id == id ) {
- // forward direction
- if ( r.rwy_no == runway ) {
- found_r = r;
- heading = r.heading;
- match = true;
- SG_LOG( SG_GENERAL, SG_INFO,
- "Runway " << r.rwy_no << " heading = " << heading );
- }
-
- // calculate reciprocal runway number
- string snum = r.rwy_no;
- int len = snum.length();
- string letter = "";
- string rev_letter = "";
- int i;
- for ( i = 0; i < len; ++i ) {
- string tmp = snum.substr(i, 1);
- if ( tmp == "L" ) {
- letter = "L";
- rev_letter = "R";
- } else if ( tmp == "R" ) {
- letter = "R";
- rev_letter = "L";
- } else if ( tmp == "C" ) {
- letter == "C";
- rev_letter = "C";
- }
- }
- for ( i = 0; i < len; ++i ) {
- string tmp = snum.substr(i, 1);
- if ( tmp == "L" || tmp == "R" || tmp == "C" || tmp == " " ) {
- snum = snum.substr(0, i);
- }
- }
- SG_LOG(SG_GENERAL, SG_DEBUG, "Runway num = '" << snum << "'");
- int num = atoi( snum.c_str() ) + 18;
- while ( num > 36 ) { num -= 36; }
- while ( num <= 0 ) { num += 36; }
-
- char recip_no[10];
- snprintf( recip_no, 10, "%02d%s", num, rev_letter.c_str() );
-
- // reverse direction
- if ( (string)recip_no == runway ) {
- found_r = r;
- heading = r.heading + 180;
- while ( heading > 360.0 ) { heading -= 360; }
- match = true;
- SG_LOG( SG_GENERAL, SG_INFO,
- "Runway " << r.rwy_no << " heading = " << heading );
- }
-
- runways.next( &r );
- }
} else {
return false;
}
- if ( match ) {
- double lat2, lon2, az2;
- double azimuth = heading + 180.0;
- while ( azimuth >= 360.0 ) { azimuth -= 360.0; }
-
- SG_LOG( SG_GENERAL, SG_INFO,
- "runway = " << found_r.lon << ", " << found_r.lat
- << " length = " << found_r.length * SG_FEET_TO_METER * 0.5
- << " heading = " << azimuth );
+ double lat2, lon2, az2;
+ double heading = r.heading;
+ double azimuth = heading + 180.0;
+ while ( azimuth >= 360.0 ) { azimuth -= 360.0; }
- geo_direct_wgs_84 ( 0, found_r.lat, found_r.lon,
- azimuth,
- found_r.length * SG_FEET_TO_METER * 0.5 - 5.0,
- &lat2, &lon2, &az2 );
-
- if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON )
- {
- double olat, olon;
- double odist = fgGetDouble("/sim/presets/offset-distance");
- odist *= SG_NM_TO_METER;
- double oaz = azimuth;
- if ( fabs(fgGetDouble("/sim/presets/offset-azimuth")) > SG_EPSILON )
- {
- oaz = fgGetDouble("/sim/presets/offset-azimuth") + 180;
- }
- while ( oaz >= 360.0 ) { oaz -= 360.0; }
- geo_direct_wgs_84 ( 0, lat2, lon2, oaz, odist, &olat, &olon, &az2 );
- lat2=olat;
- lon2=olon;
- }
-
- // presets
- fgSetDouble("/sim/presets/longitude-deg", lon2 );
- fgSetDouble("/sim/presets/latitude-deg", lat2 );
- fgSetDouble("/sim/presets/heading-deg", heading );
-
- // other code depends on the actual values being set ...
- fgSetDouble("/position/longitude-deg", lon2 );
- fgSetDouble("/position/latitude-deg", lat2 );
- fgSetDouble("/orientation/heading-deg", heading );
-
- SG_LOG( SG_GENERAL, SG_INFO,
- "Position for " << id << " is ("
- << lon2 << ", "
- << lat2 << ") new heading is "
- << heading );
-
- return true;
- } else {
- return false;
+ SG_LOG( SG_GENERAL, SG_INFO,
+ "runway = " << r.lon << ", " << r.lat
+ << " length = " << r.length * SG_FEET_TO_METER
+ << " heading = " << azimuth );
+
+ geo_direct_wgs_84 ( 0, r.lat, r.lon,
+ azimuth,
+ r.length * SG_FEET_TO_METER * 0.5 - 5.0,
+ &lat2, &lon2, &az2 );
+
+ if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON )
+ {
+ double olat, olon;
+ double odist = fgGetDouble("/sim/presets/offset-distance");
+ odist *= SG_NM_TO_METER;
+ double oaz = azimuth;
+ if ( fabs(fgGetDouble("/sim/presets/offset-azimuth")) > SG_EPSILON )
+ {
+ oaz = fgGetDouble("/sim/presets/offset-azimuth") + 180;
+ }
+ while ( oaz >= 360.0 ) { oaz -= 360.0; }
+ geo_direct_wgs_84 ( 0, lat2, lon2, oaz, odist, &olat, &olon, &az2 );
+ lat2=olat;
+ lon2=olon;
}
+
+ // presets
+ fgSetDouble("/sim/presets/longitude-deg", lon2 );
+ fgSetDouble("/sim/presets/latitude-deg", lat2 );
+ fgSetDouble("/sim/presets/heading-deg", heading );
+
+ // other code depends on the actual values being set ...
+ fgSetDouble("/position/longitude-deg", lon2 );
+ fgSetDouble("/position/latitude-deg", lat2 );
+ fgSetDouble("/orientation/heading-deg", heading );
+
+ SG_LOG( SG_GENERAL, SG_INFO,
+ "Position for " << id << " is ("
+ << lon2 << ", "
+ << lat2 << ") new heading is "
+ << heading );
+
+ return true;
}
// Set current_options lon/lat given an airport id and heading (degrees)
static bool fgSetPosFromNAV( const string& id, const double& freq ) {
- FGNav nav;
+ FGNav *nav = current_navlist->findByIdentAndFreq( id.c_str(), freq );
// set initial position from runway and heading
- if ( current_navlist->findByIdentAndFreq( id.c_str(), freq, &nav ) ) {
+ if ( nav != NULL ) {
SG_LOG( SG_GENERAL, SG_INFO, "Attempting to set starting position for "
<< id << ":" << freq );
- double lon = nav.get_lon();
- double lat = nav.get_lat();
+ double lon = nav->get_lon();
+ double lat = nav->get_lat();
if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON )
{
}
+/**
+ * Initialize vor/ndb/ils/fix list management and query systems
+ */
+bool
+fgInitNav ()
+{
+ SG_LOG(SG_GENERAL, SG_INFO, "Loading Navaids");
+
+ SG_LOG(SG_GENERAL, SG_INFO, " VOR/NDB");
+ current_navlist = new FGNavList;
+ SGPath p_nav( globals->get_fg_root() );
+ p_nav.append( "Navaids/default.nav" );
+ current_navlist->init( p_nav );
+
+ SG_LOG(SG_GENERAL, SG_INFO, " ILS and Marker Beacons");
+ current_beacons = new FGMarkerBeacons;
+ current_beacons->init();
+ current_ilslist = new FGILSList;
+ SGPath p_ils( globals->get_fg_root() );
+ p_ils.append( "Navaids/default.ils" );
+ current_ilslist->init( p_ils );
+
+ SG_LOG(SG_GENERAL, SG_INFO, " Fixes");
+ current_fixlist = new FGFixList;
+ SGPath p_fix( globals->get_fg_root() );
+ p_fix.append( "Navaids/default.fix" );
+ current_fixlist->init( p_fix );
+
+ return true;
+}
+
+
// Set the initial position based on presets (or defaults)
bool fgInitPosition() {
bool set_pos = false;
// If glideslope is specified, then calculate offset-distance or
// altitude relative to glide slope if either of those was not
// specified.
- fgSetDistOrAltFromGlideSlope();
+ if ( fgGetDouble("/sim/presets/glideslope-deg") > 0.1 ) {
+ fgSetDistOrAltFromGlideSlope();
+ }
+
+ // Select ground or air start depending on if an altitude is
+ // specified (this choice can be refined later based on other
+ // input.)
+ if ( fgGetDouble("/sim/presets/altitude-ft") > -9990.0 ) {
+ fgSetBool("/sim/presets/onground", false);
+ } else {
+ fgSetBool("/sim/presets/onground", true);
+ }
// If we have an explicit, in-range lon/lat, don't change it, just use it.
// If not, check for an airport-id and use that.
}
if ( !set_pos && !apt.empty() ) {
// An airport is requested (find runway closest to hdg)
- if ( fgSetPosFromAirportIDandHdg( apt, hdg ) ) {
- // set position (a little off the heading for single
- // runway airports)
- fgSetTowerPosFromAirportID( apt, hdg );
+ bool ok = false;
+ if (fgGetDouble("/sim/presets/altitude-ft") <= 0 &&
+ fgGetDouble("/sim/presets/offset-distance") == 0)
+ ok = fgSetPosFromAirportIDandHdg( apt, hdg );
+ else
+ ok = fgSetPosFromAirportID( apt );
+
+ if (ok) {
+ // set position (a little off the heading for single
+ // runway airports)
+ fgSetTowerPosFromAirportID( apt, hdg );
set_pos = true;
}
if ( !set_pos && !vor.empty() ) {
// a VOR is requested
if ( fgSetPosFromNAV( vor, vor_freq ) ) {
- if ( fgGetDouble("/sim/presets/altitude-ft") > -9990.0 ) {
- fgSetBool("/sim/presets/onground", false);
- } else {
- fgSetBool("/sim/presets/onground", true);
- }
set_pos = true;
}
}
if ( !set_pos && !ndb.empty() ) {
// an NDB is requested
if ( fgSetPosFromNAV( ndb, ndb_freq ) ) {
- if ( fgGetDouble("/sim/presets/altitude-ft") > -9990.0 ) {
- fgSetBool("/sim/presets/onground", false);
- } else {
- fgSetBool("/sim/presets/onground", true);
- }
set_pos = true;
}
}
if ( !set_pos && !fix.empty() ) {
// a Fix is requested
if ( fgSetPosFromFix( fix ) ) {
- if ( fgGetDouble("/sim/presets/altitude-ft") > -9990.0 ) {
- fgSetBool("/sim/presets/onground", false);
- } else {
- fgSetBool("/sim/presets/onground", true);
- }
set_pos = true;
}
}
begin = end + 1;
}
cur_fdm_state = new FGExternalNet( dt, host, port1, port2, port3 );
+ } else if ( model.find("pipe") == 0 ) {
+ string pipe_path = model.substr(5);
+ cur_fdm_state = new FGExternalPipe( dt, pipe_path );
} else if ( model == "null" ) {
cur_fdm_state = new FGNullFDM( dt );
} else if ( model == "yasim" ) {
static void printMat(const sgVec4 *mat, char *name="")
{
int i;
- cout << name << endl;
+ SG_LOG(SG_GENERAL, SG_BULK, name );
for(i=0; i<4; i++) {
- cout <<" "<<mat[i][0]<<" "<<mat[i][1]<<" "<<mat[i][2]<<" "<<mat[i][3]<<endl;
+ SG_LOG(SG_GENERAL, SG_BULK, " " << mat[i][0] << " " << mat[i][1]
+ << " " << mat[i][2] << " " << mat[i][3] );
}
- cout << endl;
}
// Initialize view parameters
// gear, its initialization call should located in this routine.
// Returns non-zero if a problem encountered.
bool fgInitSubsystems() {
- static const SGPropertyNode *longitude
- = fgGetNode("/sim/presets/longitude-deg");
- static const SGPropertyNode *latitude
- = fgGetNode("/sim/presets/latitude-deg");
- static const SGPropertyNode *altitude
- = fgGetNode("/sim/presets/altitude-ft");
+ // static const SGPropertyNode *longitude
+ // = fgGetNode("/sim/presets/longitude-deg");
+ // static const SGPropertyNode *latitude
+ // = fgGetNode("/sim/presets/latitude-deg");
+ // static const SGPropertyNode *altitude
+ // = fgGetNode("/sim/presets/altitude-ft");
fgLIGHT *l = &cur_light_params;
SGPath mpath( globals->get_fg_root() );
mpath.append( "materials.xml" );
- if ( ! material_lib.load( mpath.str() ) ) {
+ if ( ! globals->get_matlib()->load(globals->get_fg_root(), mpath.str()) ) {
SG_LOG( SG_GENERAL, SG_ALERT, "Error loading material lib!" );
exit(-1);
}
// Create and register the logger.
////////////////////////////////////////////////////////////////////
- globals->get_subsystem_mgr()->add(FGSubsystemMgr::GENERAL,
- "logger",
- new FGLogger);
+ globals->add_subsystem("logger", new FGLogger);
+
+
+#if defined(HAVE_PLIB_PSL)
+ ////////////////////////////////////////////////////////////////////
+ // Create and register the script manager.
+ ////////////////////////////////////////////////////////////////////
+
+ globals->add_subsystem("scripting", new FGScriptMgr);
+#endif // HAVE_PLIB_PSL
////////////////////////////////////////////////////////////////////
// Create and register the XML GUI.
////////////////////////////////////////////////////////////////////
- globals->get_subsystem_mgr()->add(FGSubsystemMgr::INIT,
- "gui",
- new NewGUI);
+ globals->add_subsystem("gui", new NewGUI, FGSubsystemMgr::INIT);
////////////////////////////////////////////////////////////////////
}
#endif
- ////////////////////////////////////////////////////////////////////
- // Initialize vor/ndb/ils/fix list management and query systems
- ////////////////////////////////////////////////////////////////////
-
- SG_LOG(SG_GENERAL, SG_INFO, "Loading Navaids");
-
- SG_LOG(SG_GENERAL, SG_INFO, " VOR/NDB");
- current_navlist = new FGNavList;
- SGPath p_nav( globals->get_fg_root() );
- p_nav.append( "Navaids/default.nav" );
- current_navlist->init( p_nav );
-
- SG_LOG(SG_GENERAL, SG_INFO, " ILS and Marker Beacons");
- current_beacons = new FGMarkerBeacons;
- current_beacons->init();
- current_ilslist = new FGILSList;
- SGPath p_ils( globals->get_fg_root() );
- p_ils.append( "Navaids/default.ils" );
- current_ilslist->init( p_ils );
-
- SG_LOG(SG_GENERAL, SG_INFO, " Fixes");
- current_fixlist = new FGFixList;
- SGPath p_fix( globals->get_fg_root() );
- p_fix.append( "Navaids/default.fix" );
- current_fixlist->init( p_fix );
-
- ////////////////////////////////////////////////////////////////////
- // Initialize ATC list management and query systems
- ////////////////////////////////////////////////////////////////////
-
- 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
////////////////////////////////////////////////////////////////////
// Initialise the AI Manager
////////////////////////////////////////////////////////////////////
- if (fgGetBool("/sim/ai-traffic/enabled")) {
- SG_LOG(SG_GENERAL, SG_INFO, " AI Manager");
- globals->set_AI_mgr(new FGAIMgr);
- globals->get_AI_mgr()->init();
- }
+ SG_LOG(SG_GENERAL, SG_INFO, " AI Manager");
+ globals->set_AI_mgr(new FGAIMgr);
+ globals->get_AI_mgr()->init();
+
#ifdef ENABLE_AUDIO_SUPPORT
////////////////////////////////////////////////////////////////////
// Initialize the sound subsystem.
////////////////////////////////////////////////////////////////////
- globals->set_soundmgr(new FGSoundMgr);
+ globals->set_soundmgr(new SGSoundMgr);
globals->get_soundmgr()->init();
globals->get_soundmgr()->bind();
// Initialize the sound-effects subsystem.
////////////////////////////////////////////////////////////////////
- globals->get_subsystem_mgr()->add(FGSubsystemMgr::GENERAL,
- "fx",
- new FGFX);
+ globals->add_subsystem("fx", new FGFX);
-
#endif
- globals->get_subsystem_mgr()->add(FGSubsystemMgr::GENERAL,
- "instrumentation",
- new FGInstrumentMgr);
- globals->get_subsystem_mgr()->add(FGSubsystemMgr::GENERAL,
- "systems",
- new FGSystemMgr);
+ globals->add_subsystem("instrumentation", new FGInstrumentMgr);
+ globals->add_subsystem("systems", new FGSystemMgr);
////////////////////////////////////////////////////////////////////
// Initialize the radio stack subsystem.
////////////////////////////////////////////////////////////////////
- // A textbook example of how FGSubsystem
- // should work...
current_radiostack = new FGRadioStack;
current_radiostack->init();
current_radiostack->bind();
globals->get_io()->init();
globals->get_io()->bind();
- // Initialize the 2D panel.
+
+ ////////////////////////////////////////////////////////////////////
+ // Add a new 2D panel.
+ ////////////////////////////////////////////////////////////////////
+
string panel_path = fgGetString("/sim/panel/path",
"Panels/Default/default.xml");
- current_panel = fgReadPanel(panel_path);
- if (current_panel == 0) {
+
+ globals->set_current_panel( fgReadPanel(panel_path) );
+ if (globals->get_current_panel() == 0) {
SG_LOG( SG_INPUT, SG_ALERT,
"Error reading new panel from " << panel_path );
} else {
SG_LOG( SG_INPUT, SG_INFO, "Loaded new panel from " << panel_path );
- current_panel->init();
- current_panel->bind();
+ globals->get_current_panel()->init();
+ globals->get_current_panel()->bind();
}
////////////////////////////////////////////////////////////////////
- // Initialize the steam subsystem.
+ // Initialize the input subsystem.
////////////////////////////////////////////////////////////////////
- globals->get_steam()->init();
- globals->get_steam()->bind();
+ globals->add_subsystem("input", new FGInput);
////////////////////////////////////////////////////////////////////
- // Initialize the input subsystem.
+ // Bind and initialize subsystems.
////////////////////////////////////////////////////////////////////
- globals->get_subsystem_mgr()->add(FGSubsystemMgr::GENERAL,
- "input",
- new FGInput);
+ globals->get_subsystem_mgr()->bind();
+ globals->get_subsystem_mgr()->init();
+#ifdef FG_MPLAYER_AS
////////////////////////////////////////////////////////////////////
- // Bind and initialize subsystems.
+ // Initialize multiplayer subsystem
////////////////////////////////////////////////////////////////////
- globals->get_subsystem_mgr()->bind();
- globals->get_subsystem_mgr()->init();
+ globals->set_multiplayer_tx_mgr(new FGMultiplayTxMgr);
+ globals->get_multiplayer_tx_mgr()->init();
+ globals->set_multiplayer_rx_mgr(new FGMultiplayRxMgr);
+ globals->get_multiplayer_rx_mgr()->init();
+#endif
////////////////////////////////////////////////////////////////////////
// End of subsystem initialization.
void fgReInitSubsystems()
{
- static const SGPropertyNode *longitude
- = fgGetNode("/sim/presets/longitude-deg");
- static const SGPropertyNode *latitude
- = fgGetNode("/sim/presets/latitude-deg");
+ // static const SGPropertyNode *longitude
+ // = fgGetNode("/sim/presets/longitude-deg");
+ // static const SGPropertyNode *latitude
+ // = fgGetNode("/sim/presets/latitude-deg");
static const SGPropertyNode *altitude
= fgGetNode("/sim/presets/altitude-ft");
static const SGPropertyNode *master_freeze
// 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();
+ // reload offsets from config defaults
+ globals->get_viewmgr()->reinit();
fgInitView();
projects / flightgear.git / blobdiff