X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fbfi.cxx;h=6e7761d638f8a3157af03dd4aa44cf61598b67d6;hb=8a7e5eeaf2d7bc923437c7d0dee74f99ab3d8a8d;hp=2b9945057d24ab4c08e41d7bada28e06c912e533;hpb=b2d7a4e27ac99f449931f8e4f151c25a9dc81d40;p=flightgear.git

diff --git a/src/Main/bfi.cxx b/src/Main/bfi.cxx
index 2b9945057..6e7761d63 100644
--- a/src/Main/bfi.cxx
+++ b/src/Main/bfi.cxx
@@ -20,16 +20,7 @@
 //
 // $Id$
 
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#if defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#else
-#  include <iostream>
-#endif
+#include "fgfs.hxx"
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
@@ -48,6 +39,7 @@
 #include <Time/sunpos.hxx>
 #include <Time/tmp.hxx>
 #include <Cockpit/radiostack.hxx>
+#include <Cockpit/panel.hxx>
 #ifndef FG_OLD_WEATHER
 #  include <WeatherCM/FGLocalWeatherDatabase.h>
 #else
@@ -55,10 +47,8 @@
 #endif
 
 #include "globals.hxx"
-#include "options.hxx"
-#include "save.hxx"
 #include "fg_init.hxx"
-#include <simgear/misc/props.hxx>
+#include "fg_props.hxx"
 
 FG_USING_NAMESPACE(std);
 
@@ -71,7 +61,150 @@ FG_USING_NAMESPACE(std);
 // Static variables.
 ////////////////////////////////////////////////////////////////////////
 
-bool FGBFI::_needReinit = false;
+				// Yech -- not thread-safe, etc. etc.
+static bool _needReinit = false;
+static string _temp;
+
+static inline void needReinit ()
+{
+  _needReinit = true;
+}
+
+
+/**
+ * Reinitialize FGFS to use the new BFI settings.
+ */
+static inline void
+reinit ()
+{
+				// Save the state of everything
+				// that's going to get clobbered
+				// when we reinit the subsystems.
+
+  FG_LOG(FG_GENERAL, FG_INFO, "Starting BFI reinit");
+
+				// TODO: add more AP stuff
+  double elevator = FGBFI::getElevator();
+  double aileron = FGBFI::getAileron();
+  double rudder = FGBFI::getRudder();
+  double throttle = FGBFI::getThrottle();
+  double elevator_trim = FGBFI::getElevatorTrim();
+  double flaps = FGBFI::getFlaps();
+  double brake = FGBFI::getBrakes();
+  bool apHeadingLock = FGBFI::getAPHeadingLock();
+  double apHeadingMag = FGBFI::getAPHeadingMag();
+  bool apAltitudeLock = FGBFI::getAPAltitudeLock();
+  double apAltitude = FGBFI::getAPAltitude();
+  const string &targetAirport = FGBFI::getTargetAirport();
+  bool gpsLock = FGBFI::getGPSLock();
+  // double gpsLatitude = FGBFI::getGPSTargetLatitude();
+  // double gpsLongitude = FGBFI::getGPSTargetLongitude();
+
+  FGBFI::setTargetAirport("");
+
+  fgReInitSubsystems();
+
+				// FIXME: this is wrong.
+				// All of these are scheduled events,
+				// and it should be possible to force
+				// them all to run once.
+  fgUpdateSunPos();
+  fgUpdateMoonPos();
+  cur_light_params.Update();
+  fgUpdateLocalTime();
+  fgUpdateWeatherDatabase();
+  fgRadioSearch();
+
+				// Restore all of the old states.
+  FGBFI::setElevator(elevator);
+  FGBFI::setAileron(aileron);
+  FGBFI::setRudder(rudder);
+  FGBFI::setThrottle(throttle);
+  FGBFI::setElevatorTrim(elevator_trim);
+  FGBFI::setFlaps(flaps);
+  FGBFI::setBrakes(brake);
+  FGBFI::setAPHeadingLock(apHeadingLock);
+  FGBFI::setAPHeadingMag(apHeadingMag);
+  FGBFI::setAPAltitudeLock(apAltitudeLock);
+  FGBFI::setAPAltitude(apAltitude);
+  FGBFI::setTargetAirport(targetAirport);
+  FGBFI::setGPSLock(gpsLock);
+
+  _needReinit = false;
+
+  FG_LOG(FG_GENERAL, FG_INFO, "Ending BFI reinit");
+}
+
+// BEGIN: kludge 2000-12-07
+// This is a kludge around a LaRCsim problem; see setAltitude()
+// for details.
+static int _altitude_countdown = 0;
+static double _requested_altitude = -9999;
+static bool _saved_freeze = false;
+static inline void _check_altitude ()
+{
+  if (_altitude_countdown > 0) {
+    _altitude_countdown--;
+    if (_altitude_countdown == 0) {
+      current_aircraft.fdm_state->set_Altitude(_requested_altitude);
+      globals->set_freeze(_saved_freeze);
+    }
+  }
+}
+
+static int _lighting_countdown = 0;
+static inline void _check_lighting ()
+{
+  if (_lighting_countdown > 0) {
+    _lighting_countdown--;
+    if (_lighting_countdown == 0)
+      fgUpdateSkyAndLightingParams();
+  }
+}
+// END: kludge
+
+
+// BEGIN: kludge
+// Allow the view to be set from two axes (i.e. a joystick hat)
+// This needs to be in FGViewer itself, somehow.
+static double axisLong = 0.0;
+static double axisLat = 0.0;
+
+static inline void
+_set_view_from_axes ()
+{
+				// Take no action when hat is centered
+  if (axisLong == 0 && axisLat == 0)
+    return;
+
+  double viewDir = 0;
+
+  if (axisLong < 0) {		// Longitudinal axis forward
+    if (axisLat < 0)
+      viewDir = 45;
+    else if (axisLat > 0)
+      viewDir = 315;
+    else
+      viewDir = 0;
+  } else if (axisLong > 0) {	// Longitudinal axis backward
+    if (axisLat < 0)
+      viewDir = 135;
+    else if (axisLat > 0)
+      viewDir = 225;
+    else
+      viewDir = 180;
+  } else {			// Longitudinal axis neutral
+    if (axisLat < 0)
+      viewDir = 90;
+    else
+      viewDir = 270;
+  }
+
+  globals->get_current_view()->set_goal_view_offset(viewDir*DEG_TO_RAD);
+//   globals->get_current_view()->set_view_offset(viewDir*DEG_TO_RAD);
+}
+
+// END: kludge
 
 
 
@@ -79,7 +212,6 @@ bool FGBFI::_needReinit = false;
 // Local functions
 ////////////////////////////////////////////////////////////////////////
 
-
 /**
  * Initialize the BFI by binding its functions to properties.
  *
@@ -91,146 +223,108 @@ FGBFI::init ()
 {
   FG_LOG(FG_GENERAL, FG_INFO, "Starting BFI init");
 				// Simulation
-  current_properties.tieInt("/sim/flight-model",
-			    getFlightModel, setFlightModel);
-//   current_properties.tieString("/sim/aircraft",
-// 			       getAircraft, setAircraft);
-  // TODO: timeGMT
-  current_properties.tieString("/sim/time/gmt-string",
-			       getGMTString, 0);
-  current_properties.tieBool("/sim/hud/visibility",
-			     getHUDVisible, setHUDVisible);
-  current_properties.tieBool("/sim/panel/visibility",
-			     getPanelVisible, setPanelVisible);
+  fgTie("/sim/flight-model", getFlightModel, setFlightModel);
+  fgTie("/sim/aircraft", getAircraft, setAircraft);
+  fgTie("/sim/aircraft-dir", getAircraftDir, setAircraftDir);
+  fgTie("/sim/time/gmt", getDateString, setDateString);
+  fgTie("/sim/time/gmt-string", getGMTString);
+  fgTie("/sim/hud/visibility", getHUDVisible, setHUDVisible);
+  fgTie("/sim/panel/visibility", getPanelVisible, setPanelVisible);
+  fgTie("/sim/panel/x-offset", getPanelXOffset, setPanelXOffset);
+  fgTie("/sim/panel/y-offset", getPanelYOffset, setPanelYOffset);
 
 				// Position
-  current_properties.tieDouble("/position/latitude",
-				getLatitude, setLatitude);
-  current_properties.tieDouble("/position/longitude",
-			       getLongitude, setLongitude);
-  current_properties.tieDouble("/position/altitude",
-			       getAltitude, setAltitude);
-  current_properties.tieDouble("/position/altitude-agl",
-			       getAGL, 0);
+  fgTie("/position/airport-id", getTargetAirport, setTargetAirport);
+  fgTie("/position/latitude", getLatitude, setLatitude);
+  fgTie("/position/longitude", getLongitude, setLongitude);
+  fgTie("/position/altitude", getAltitude, setAltitude);
+  fgTie("/position/altitude-agl", getAGL);
 
 				// Orientation
-  current_properties.tieDouble("/orientation/heading",
-			       getHeading, setHeading);
-  current_properties.tieDouble("/orientation/heading-magnetic",
-			       getHeadingMag, 0);
-  current_properties.tieDouble("/orientation/pitch",
-			       getPitch, setPitch);
-  current_properties.tieDouble("/orientation/roll",
-			       getRoll, setRoll);
+  fgTie("/orientation/heading", getHeading, setHeading);
+  fgTie("/orientation/heading-magnetic", getHeadingMag);
+  fgTie("/orientation/pitch", getPitch, setPitch);
+  fgTie("/orientation/roll", getRoll, setRoll);
 
 				// Engine
-  current_properties.tieDouble("/engines/engine0/rpm",
-			       getRPM, 0);
-  current_properties.tieDouble("/engines/engine0/egt",
-			       getEGT, 0);
+  fgTie("/engines/engine0/rpm", getRPM);
+  fgTie("/engines/engine0/egt", getEGT);
+  fgTie("/engines/engine0/cht", getCHT);
+  fgTie("/engines/engine0/mp", getMP);
 
 				// Velocities
-  current_properties.tieDouble("/velocities/airspeed",
-			       getAirspeed, 0);
-  current_properties.tieDouble("/velocities/side-slip",
-			       getSideSlip, 0);
-  current_properties.tieDouble("/velocities/vertical-speed",
-			       getVerticalSpeed, 0);
-  current_properties.tieDouble("/velocities/speed-north",
-			       getSpeedNorth, setSpeedNorth);
-  current_properties.tieDouble("/velocities/speed-east",
-			       getSpeedEast, setSpeedEast);
-  current_properties.tieDouble("/velocities/speed-down",
-			       getSpeedDown, setSpeedDown);
+  fgTie("/velocities/airspeed", getAirspeed, setAirspeed);
+  fgTie("/velocities/side-slip", getSideSlip);
+  fgTie("/velocities/vertical-speed", getVerticalSpeed);
+  fgTie("/velocities/speed-north", getSpeedNorth);
+  fgTie("/velocities/speed-east", getSpeedEast);
+  fgTie("/velocities/speed-down", getSpeedDown);
 
 				// Controls
-  current_properties.tieDouble("/controls/throttle",
-			       getThrottle, setThrottle);
-  current_properties.tieDouble("/controls/mixture",
-			       getMixture, setMixture);
-  current_properties.tieDouble("/controls/propellor-pitch",
-			       getPropAdvance, setPropAdvance);
-  current_properties.tieDouble("/controls/flaps",
-			       getFlaps, setFlaps);
-  current_properties.tieDouble("/controls/aileron",
-			       getAileron, setAileron);
-  current_properties.tieDouble("/controls/rudder",
-			       getRudder, setRudder);
-  current_properties.tieDouble("/controls/elevator",
-			       getElevator, setElevator);
-  current_properties.tieDouble("/controls/elevator-trim",
-			       getElevatorTrim, setElevatorTrim);
-  current_properties.tieDouble("/controls/brakes/all",
-			       getBrakes, setBrakes);
-  current_properties.tieDouble("/controls/brakes/left",
-			       getLeftBrake, setLeftBrake);
-  current_properties.tieDouble("/controls/brakes/right",
-			       getRightBrake, setRightBrake);
-  current_properties.tieDouble("/controls/brakes/center",
-			       getRightBrake, setCenterBrake);
+#if 0
+  fgTie("/controls/throttle", getThrottle, setThrottle);
+  fgTie("/controls/mixture", getMixture, setMixture);
+  fgTie("/controls/propellor-pitch", getPropAdvance, setPropAdvance);
+  fgTie("/controls/flaps", getFlaps, setFlaps);
+  fgTie("/controls/aileron", getAileron, setAileron);
+  fgTie("/controls/rudder", getRudder, setRudder);
+  fgTie("/controls/elevator", getElevator, setElevator);
+  fgTie("/controls/elevator-trim", getElevatorTrim, setElevatorTrim);
+  fgTie("/controls/brakes/all", getBrakes, setBrakes);
+  fgTie("/controls/brakes/left", getLeftBrake, setLeftBrake);
+  fgTie("/controls/brakes/right", getRightBrake, setRightBrake);
+  fgTie("/controls/brakes/center", getRightBrake, setCenterBrake);
+#endif
 
 				// Autopilot
-  current_properties.tieBool("/autopilot/locks/altitude",
-			     getAPAltitudeLock, setAPAltitudeLock);
-  current_properties.tieDouble("/autopilot/settings/altitude",
-			       getAPAltitude, setAPAltitude);
-  current_properties.tieBool("/autopilot/locks/heading",
-			     getAPHeadingLock, setAPHeadingLock);
-  current_properties.tieDouble("/autopilot/settings/heading",
-			       getAPHeading, setAPHeading);
-  current_properties.tieDouble("/autopilot/settings/heading-magnetic",
-			       getAPHeadingMag, setAPHeadingMag);
-  current_properties.tieBool("/autopilot/locks/nav1",
-			     getAPNAV1Lock, setAPNAV1Lock);
+  fgTie("/autopilot/locks/altitude", getAPAltitudeLock, setAPAltitudeLock);
+  fgTie("/autopilot/settings/altitude", getAPAltitude, setAPAltitude);
+  fgTie("/autopilot/locks/heading", getAPHeadingLock, setAPHeadingLock);
+  fgTie("/autopilot/settings/heading", getAPHeading, setAPHeading);
+  fgTie("/autopilot/settings/heading-magnetic",
+             getAPHeadingMag, setAPHeadingMag);
+  fgTie("/autopilot/locks/nav1", getAPNAV1Lock, setAPNAV1Lock);
 
 				// Radio navigation
-  current_properties.tieDouble("/radios/nav1/frequencies/selected",
-			       getNAV1Freq, setNAV1Freq);
-  current_properties.tieDouble("/radios/nav1/frequencies/standby",
-			       getNAV1AltFreq, setNAV1AltFreq);
-  current_properties.tieDouble("/radios/nav1/radials/actual",
-			       getNAV1Radial, 0);
-  current_properties.tieDouble("/radios/nav1/radials/selected",
-			       getNAV1SelRadial, setNAV1SelRadial);
-  current_properties.tieDouble("/radios/nav1/dme/distance",
-			       getNAV1DistDME, 0);
-  current_properties.tieBool("/radios/nav1/to-flag",
-			     getNAV1TO, 0);
-  current_properties.tieBool("/radios/nav1/from-flag",
-			     getNAV1FROM, 0);
-  current_properties.tieBool("/radios/nav1/in-range",
-			     getNAV1InRange, 0);
-  current_properties.tieBool("/radios/nav1/dme/in-range",
-			     getNAV1DMEInRange, 0);
+  fgTie("/radios/nav1/frequencies/selected", getNAV1Freq, setNAV1Freq);
+  fgTie("/radios/nav1/frequencies/standby", getNAV1AltFreq, setNAV1AltFreq);
+  fgTie("/radios/nav1/radials/actual", getNAV1Radial);
+  fgTie("/radios/nav1/radials/selected",
+             getNAV1SelRadial, setNAV1SelRadial);
+  fgTie("/radios/nav1/dme/distance", getNAV1DistDME);
+  fgTie("/radios/nav1/to-flag", getNAV1TO);
+  fgTie("/radios/nav1/from-flag", getNAV1FROM);
+  fgTie("/radios/nav1/in-range", getNAV1InRange);
+  fgTie("/radios/nav1/dme/in-range", getNAV1DMEInRange);
 			       
-  current_properties.tieDouble("/radios/nav2/frequencies/selected",
-			       getNAV2Freq, setNAV2Freq);
-  current_properties.tieDouble("/radios/nav2/frequencies/standby",
-			       getNAV2AltFreq, setNAV2AltFreq);
-  current_properties.tieDouble("/radios/nav2/radials/actual",
-			       getNAV2Radial, 0);
-  current_properties.tieDouble("/radios/nav2/radials/selected",
-			       getNAV2SelRadial, setNAV2SelRadial);
-  current_properties.tieDouble("/radios/nav2/dme/distance",
-			       getNAV2DistDME, 0);
-  current_properties.tieBool("/radios/nav2/to-flag",
-			     getNAV2TO, 0);
-  current_properties.tieBool("/radios/nav2/from-flag",
-			     getNAV2FROM, 0);
-  current_properties.tieBool("/radios/nav2/in-range",
-			     getNAV2InRange, 0);
-  current_properties.tieBool("/radios/nav2/dme/in-range",
-			     getNAV2DMEInRange, 0);
-
-  current_properties.tieDouble("/radios/adf/frequencies/selected",
-			       getADFFreq, setADFFreq);
-  current_properties.tieDouble("/radios/adf/frequencies/standby",
-			       getADFAltFreq, setADFAltFreq);
-  current_properties.tieDouble("/radios/adf/rotation",
-			       getADFRotation, setADFRotation);
-
-  current_properties.tieDouble("/environment/visibility",
-			       getVisibility, setVisibility);
+  fgTie("/radios/nav2/frequencies/selected", getNAV2Freq, setNAV2Freq);
+  fgTie("/radios/nav2/frequencies/standby",
+             getNAV2AltFreq, setNAV2AltFreq);
+  fgTie("/radios/nav2/radials/actual", getNAV2Radial);
+  fgTie("/radios/nav2/radials/selected",
+             getNAV2SelRadial, setNAV2SelRadial);
+  fgTie("/radios/nav2/dme/distance", getNAV2DistDME);
+  fgTie("/radios/nav2/to-flag", getNAV2TO);
+  fgTie("/radios/nav2/from-flag", getNAV2FROM);
+  fgTie("/radios/nav2/in-range", getNAV2InRange);
+  fgTie("/radios/nav2/dme/in-range", getNAV2DMEInRange);
+
+  fgTie("/radios/adf/frequencies/selected", getADFFreq, setADFFreq);
+  fgTie("/radios/adf/frequencies/standby", getADFAltFreq, setADFAltFreq);
+  fgTie("/radios/adf/rotation", getADFRotation, setADFRotation);
+
+				// Weather
+  fgTie("/environment/visibility", getVisibility, setVisibility);
+  fgTie("/environment/wind-north", getWindNorth, setWindNorth);
+  fgTie("/environment/wind-east", getWindEast, setWindEast);
+  fgTie("/environment/wind-down", getWindDown, setWindDown);
+
+				// View
+  fgTie("/sim/view/axes/long", (double(*)())0, setViewAxisLong);
+  fgTie("/sim/view/axes/lat", (double(*)())0, setViewAxisLat);
+
+  _altitude_countdown = 0;
+  _needReinit = false;
 
   FG_LOG(FG_GENERAL, FG_INFO, "Ending BFI init");
 }
@@ -247,80 +341,15 @@ FGBFI::init ()
 void
 FGBFI::update ()
 {
+  _check_altitude();
+  _check_lighting();
+  _set_view_from_axes();
   if (_needReinit) {
     reinit();
   }
 }
 
 
-/**
- * Reinitialize FGFS to use the new BFI settings.
- */
-void
-FGBFI::reinit ()
-{
-				// Save the state of everything
-				// that's going to get clobbered
-				// when we reinit the subsystems.
-
-  cout << "BFI: start reinit\n";
-
-				// TODO: add more AP stuff
-  double elevator = getElevator();
-  double aileron = getAileron();
-  double rudder = getRudder();
-  double throttle = getThrottle();
-  double elevator_trim = getElevatorTrim();
-  double flaps = getFlaps();
-  double brake = getBrakes();
-  bool apHeadingLock = getAPHeadingLock();
-  double apHeadingMag = getAPHeadingMag();
-  bool apAltitudeLock = getAPAltitudeLock();
-  double apAltitude = getAPAltitude();
-  const string &targetAirport = getTargetAirport();
-  bool gpsLock = getGPSLock();
-  double gpsLatitude = getGPSTargetLatitude();
-  double gpsLongitude = getGPSTargetLongitude();
-
-  setTargetAirport("");
-  cout << "Target airport is " << current_options.get_airport_id() << endl;
-
-  fgReInitSubsystems();
-
-				// FIXME: this is wrong.
-				// All of these are scheduled events,
-				// and it should be possible to force
-				// them all to run once.
-  fgUpdateSunPos();
-  fgUpdateMoonPos();
-  cur_light_params.Update();
-  fgUpdateLocalTime();
-  fgUpdateWeatherDatabase();
-  fgRadioSearch();
-
-				// Restore all of the old states.
-  setElevator(elevator);
-  setAileron(aileron);
-  setRudder(rudder);
-  setThrottle(throttle);
-  setElevatorTrim(elevator_trim);
-  setFlaps(flaps);
-  setBrakes(brake);
-  setAPHeadingLock(apHeadingLock);
-  setAPHeadingMag(apHeadingMag);
-  setAPAltitudeLock(apAltitudeLock);
-  setAPAltitude(apAltitude);
-  setTargetAirport(targetAirport);
-  setGPSLock(gpsLock);
-  setGPSTargetLatitude(gpsLatitude);
-  setGPSTargetLongitude(gpsLongitude);
-
-  _needReinit = false;
-
-  cout << "BFI: end reinit\n";
-}
-
-
 
 ////////////////////////////////////////////////////////////////////////
 // Simulation.
@@ -335,27 +364,29 @@ FGBFI::reinit ()
 int
 FGBFI::getFlightModel ()
 {
-  return current_options.get_flight_model();
+  return globals->get_options()->get_flight_model();
 }
 
 
 /**
  * Return the current aircraft as a string.
  */
-const string
+string
 FGBFI::getAircraft ()
 {
-  return current_options.get_aircraft();
+  _temp = globals->get_options()->get_aircraft();
+  return _temp;
 }
 
 
 /**
  * Return the current aircraft directory (UIUC) as a string.
  */
-const string
+string 
 FGBFI::getAircraftDir ()
 {
-  return aircraft_dir;
+  _temp = aircraft_dir;
+  return _temp;
 }
 
 
@@ -368,7 +399,7 @@ void
 FGBFI::setFlightModel (int model)
 {
   if (getFlightModel() != model) {
-    current_options.set_flight_model(model);
+    globals->get_options()->set_flight_model(model);
     needReinit();
   }
 }
@@ -378,10 +409,10 @@ FGBFI::setFlightModel (int model)
  * Set the current aircraft.
  */
 void
-FGBFI::setAircraft (const string &aircraft)
+FGBFI::setAircraft (string aircraft)
 {
   if (getAircraft() != aircraft) {
-    current_options.set_aircraft(aircraft);
+    globals->get_options()->set_aircraft(aircraft);
     needReinit();
   }
 }
@@ -391,7 +422,7 @@ FGBFI::setAircraft (const string &aircraft)
  * Set the current aircraft directory (UIUC).
  */
 void
-FGBFI::setAircraftDir (const string &dir)
+FGBFI::setAircraftDir (string dir)
 {
   if (getAircraftDir() != dir) {
     aircraft_dir = dir;
@@ -403,10 +434,17 @@ FGBFI::setAircraftDir (const string &dir)
 /**
  * Return the current Zulu time.
  */
-time_t
-FGBFI::getTimeGMT ()
+string 
+FGBFI::getDateString ()
 {
-  return globals->get_time_params()->get_cur_time();
+  string out;
+  char buf[64];
+  struct tm * t = globals->get_time_params()->getGmt();
+  sprintf(buf, "%.4d-%.2d-%.2dT%.2d:%.2d:%.2d",
+	  t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
+	  t->tm_hour, t->tm_min, t->tm_sec);
+  out = buf;
+  return out;
 }
 
 
@@ -414,28 +452,56 @@ FGBFI::getTimeGMT ()
  * Set the current Zulu time.
  */
 void
-FGBFI::setTimeGMT (time_t time)
-{
-  if (getTimeGMT() != time) {
-				// FIXME: need to update lighting
-				// and solar system
-    current_options.set_time_offset(time);
-    current_options.set_time_offset_type(fgOPTIONS::FG_TIME_GMT_ABSOLUTE);
-    globals->get_time_params()->update( cur_fdm_state->get_Longitude(),
-					cur_fdm_state->get_Latitude(),
-					globals->get_warp() );
-    needReinit();
+FGBFI::setDateString (string date_string)
+// FGBFI::setTimeGMT (time_t time)
+{
+  SGTime * st = globals->get_time_params();
+  struct tm * current_time = st->getGmt();
+  struct tm new_time;
+
+				// Scan for basic ISO format
+				// YYYY-MM-DDTHH:MM:SS
+  int ret = sscanf(date_string.c_str(), "%d-%d-%dT%d:%d:%d",
+		   &(new_time.tm_year), &(new_time.tm_mon),
+		   &(new_time.tm_mday), &(new_time.tm_hour),
+		   &(new_time.tm_min), &(new_time.tm_sec));
+
+				// Be pretty picky about this, so
+				// that strange things don't happen
+				// if the save file has been edited
+				// by hand.
+  if (ret != 6) {
+    FG_LOG(FG_INPUT, FG_ALERT, "Date/time string " << date_string
+	   << " not in YYYY-MM-DDTHH:MM:SS format; skipped");
+    return;
   }
+
+				// OK, it looks like we got six
+				// values, one way or another.
+  new_time.tm_year -= 1900;
+  new_time.tm_mon -= 1;
+
+				// Now, tell flight gear to use
+				// the new time.  This was far
+				// too difficult, by the way.
+  long int warp =
+    mktime(&new_time) - mktime(current_time) + globals->get_warp();
+  double lon = current_aircraft.fdm_state->get_Longitude();
+  double lat = current_aircraft.fdm_state->get_Latitude();
+  double alt = current_aircraft.fdm_state->get_Altitude() * FEET_TO_METER;
+  globals->set_warp(warp);
+  st->update(lon, lat, warp);
+  fgUpdateSkyAndLightingParams();
 }
 
 
 /**
  * Return the GMT as a string.
  */
-const string &
+string 
 FGBFI::getGMTString ()
 {
-  static string out;		// FIXME: not thread-safe
+  string out;
   char buf[16];
   struct tm * t = globals->get_time_params()->getGmt();
   sprintf(buf, " %.2d:%.2d:%.2d",
@@ -451,7 +517,7 @@ FGBFI::getGMTString ()
 bool
 FGBFI::getHUDVisible ()
 {
-  return current_options.get_hud_status();
+  return globals->get_options()->get_hud_status();
 }
 
 
@@ -461,7 +527,7 @@ FGBFI::getHUDVisible ()
 void
 FGBFI::setHUDVisible (bool visible)
 {
-  current_options.set_hud_status(visible);
+  globals->get_options()->set_hud_status(visible);
 }
 
 
@@ -471,7 +537,7 @@ FGBFI::setHUDVisible (bool visible)
 bool
 FGBFI::getPanelVisible ()
 {
-  return current_options.get_panel_status();
+  return globals->get_options()->get_panel_status();
 }
 
 
@@ -481,12 +547,62 @@ FGBFI::getPanelVisible ()
 void
 FGBFI::setPanelVisible (bool visible)
 {
-  if (current_options.get_panel_status() != visible) {
-    current_options.toggle_panel();
+  if (globals->get_options()->get_panel_status() != visible) {
+    globals->get_options()->toggle_panel();
   }
 }
 
 
+/**
+ * Get the panel's current x-shift.
+ */
+int
+FGBFI::getPanelXOffset ()
+{
+  if (current_panel != 0)
+    return current_panel->getXOffset();
+  else
+    return 0;
+}
+
+
+/**
+ * Set the panel's current x-shift.
+ */
+void
+FGBFI::setPanelXOffset (int offset)
+{
+  if (current_panel != 0)
+    current_panel->setXOffset(offset);
+}
+
+
+/**
+ * Get the panel's current y-shift.
+ */
+int
+FGBFI::getPanelYOffset ()
+{
+  if (current_panel != 0)
+    return current_panel->getYOffset();
+  else
+    return 0;
+}
+
+
+/**
+ * Set the panel's current y-shift.
+ */
+void
+FGBFI::setPanelYOffset (int offset)
+{
+  if (current_panel != 0)
+    current_panel->setYOffset(offset);
+}
+
+
+
+
 
 ////////////////////////////////////////////////////////////////////////
 // Position
@@ -509,11 +625,10 @@ FGBFI::getLatitude ()
 void
 FGBFI::setLatitude (double latitude)
 {
-  if (getLatitude() != latitude) {
-    current_options.set_lat(latitude);
-    current_aircraft.fdm_state->set_Latitude(latitude * DEG_TO_RAD);
-    needReinit();
-  }
+  current_aircraft.fdm_state->set_Latitude(latitude * DEG_TO_RAD);
+  fgUpdateSkyAndLightingParams();
+  if (_lighting_countdown <= 0)
+    _lighting_countdown = 5;
 }
 
 
@@ -533,11 +648,10 @@ FGBFI::getLongitude ()
 void
 FGBFI::setLongitude (double longitude)
 {
-  if (getLongitude() != longitude) {
-    current_options.set_lon(longitude);
-    current_aircraft.fdm_state->set_Longitude(longitude * DEG_TO_RAD);
-    needReinit();
-  }
+  current_aircraft.fdm_state->set_Longitude(longitude * DEG_TO_RAD);
+  fgUpdateSkyAndLightingParams();
+  if (_lighting_countdown <= 0)
+    _lighting_countdown = 5;
 }
 
 
@@ -569,10 +683,22 @@ FGBFI::getAGL ()
 void
 FGBFI::setAltitude (double altitude)
 {
-  if (getAltitude() != altitude) {
-    fgFDMForceAltitude(getFlightModel(), altitude);
-    current_options.set_altitude(altitude);
-    current_aircraft.fdm_state->set_Altitude(altitude);
+  current_aircraft.fdm_state->set_Altitude(altitude);
+
+				// 2000-12-07
+				// This is an ugly kludge around a
+				// LaRCsim problem; if the
+				// requested altitude cannot be
+				// set right away (because it's
+				// below the last-calculated ground
+				// level), pause FGFS, wait for
+				// five frames, and then try again.
+  if (_altitude_countdown <= 0 &&
+      fabs(getAltitude() - altitude) > 5.0) {
+    _altitude_countdown = 5;
+    _requested_altitude = altitude;
+    _saved_freeze = globals->get_freeze();
+    globals->set_freeze(true);
   }
 }
 
@@ -609,13 +735,9 @@ FGBFI::getHeadingMag ()
 void
 FGBFI::setHeading (double heading)
 {
-  if (getHeading() != heading) {
-    current_options.set_heading(heading);
-    current_aircraft.fdm_state->set_Euler_Angles(getRoll() * DEG_TO_RAD,
-						 getPitch() * DEG_TO_RAD,
-						 heading * DEG_TO_RAD);
-    needReinit();
-  }
+  FGInterface * fdm = current_aircraft.fdm_state;
+  fdm->set_Euler_Angles(fdm->get_Phi(), fdm->get_Theta(),
+			heading * DEG_TO_RAD);
 }
 
 
@@ -635,13 +757,8 @@ FGBFI::getPitch ()
 void
 FGBFI::setPitch (double pitch)
 {
-  if (getPitch() != pitch) {
-    current_options.set_pitch(pitch);
-    current_aircraft.fdm_state->set_Euler_Angles(getRoll() * DEG_TO_RAD,
-						 pitch * DEG_TO_RAD,
-						 getHeading() * DEG_TO_RAD);
-    needReinit();
-  }
+  FGInterface * fdm = current_aircraft.fdm_state;
+  fdm->set_Euler_Angles(fdm->get_Phi(), pitch * DEG_TO_RAD, fdm->get_Psi());
 }
 
 
@@ -661,13 +778,8 @@ FGBFI::getRoll ()
 void
 FGBFI::setRoll (double roll)
 {
-  if (getRoll() != roll) {
-    current_options.set_roll(roll);
-    current_aircraft.fdm_state->set_Euler_Angles(roll * DEG_TO_RAD,
-						 getPitch() * DEG_TO_RAD,
-						 getHeading() * DEG_TO_RAD);
-    needReinit();
-  }
+  FGInterface * fdm = current_aircraft.fdm_state;
+  fdm->set_Euler_Angles(roll * DEG_TO_RAD, fdm->get_Theta(), fdm->get_Psi());
 }
 
 
@@ -707,6 +819,36 @@ FGBFI::getEGT ()
 {
   if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
       return current_aircraft.fdm_state->get_engine(0)->get_EGT();
+  } else {
+      return 0.0;
+  }
+}
+
+
+/**
+ * Return the current engine0 CHT.
+ */
+double
+FGBFI::getCHT ()
+{
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_CHT();
+  } else {
+      return 0.0;
+  }
+}
+
+
+/**
+ * Return the current engine0 CHT.
+ */
+double
+FGBFI::getMP ()
+{
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_Manifold_Pressure();
+  } else {
+      return 0.0;
   }
 }
 
@@ -728,6 +870,16 @@ FGBFI::getAirspeed ()
 }
 
 
+/**
+ * Set the calibrated airspeed in knots.
+ */
+void
+FGBFI::setAirspeed (double speed)
+{
+  current_aircraft.fdm_state->set_V_calibrated_kts(speed);
+}
+
+
 /**
  * Return the current sideslip (FIXME: units unknown).
  */
@@ -759,20 +911,15 @@ FGBFI::getSpeedNorth ()
 }
 
 
-/**
- * Set the current north velocity (units??).
- */
-void
-FGBFI::setSpeedNorth (double speed)
-{
-  if (getSpeedNorth() != speed) {
-    current_options.set_uBody(speed);
-    current_aircraft.fdm_state->set_Velocities_Local(speed,
-						     getSpeedEast(),
-						     getSpeedDown());
-    needReinit();
-  }
-}
+// /**
+//  * Set the current north velocity (units??).
+//  */
+// void
+// FGBFI::setSpeedNorth (double speed)
+// {
+//   FGInterface * fdm = current_aircraft.fdm_state;
+// //   fdm->set_Velocities_Local(speed, fdm->get_V_east(), fdm->get_V_down());
+// }
 
 
 /**
@@ -785,20 +932,15 @@ FGBFI::getSpeedEast ()
 }
 
 
-/**
- * Set the current east velocity (units??).
- */
-void
-FGBFI::setSpeedEast (double speed)
-{
-  if (getSpeedEast() != speed) {
-    current_options.set_vBody(speed);
-    current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
-						     speed,
-						     getSpeedDown());
-    needReinit();
-  }
-}
+// /**
+//  * Set the current east velocity (units??).
+//  */
+// void
+// FGBFI::setSpeedEast (double speed)
+// {
+//   FGInterface * fdm = current_aircraft.fdm_state;
+// //   fdm->set_Velocities_Local(fdm->get_V_north(), speed, fdm->get_V_down());
+// }
 
 
 /**
@@ -811,20 +953,15 @@ FGBFI::getSpeedDown ()
 }
 
 
-/**
- * Set the current down velocity (units??).
- */
-void
-FGBFI::setSpeedDown (double speed)
-{
-  if (getSpeedDown() != speed) {
-    current_options.set_wBody(speed);
-    current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
-						     getSpeedEast(),
-						     speed);
-    needReinit();
-  }
-}
+// /**
+//  * Set the current down velocity (units??).
+//  */
+// void
+// FGBFI::setSpeedDown (double speed)
+// {
+//   FGInterface * fdm = current_aircraft.fdm_state;
+// //   fdm->set_Velocities_Local(fdm->get_V_north(), fdm->get_V_east(), speed);
+// }
 
 
 
@@ -1281,13 +1418,14 @@ FGBFI::getNAV1TO ()
   if (current_radiostack->get_nav1_inrange()) {
     double heading = current_radiostack->get_nav1_heading();
     double radial = current_radiostack->get_nav1_radial();
-    double var = FGBFI::getMagVar();
+//     double var = FGBFI::getMagVar();
     if (current_radiostack->get_nav1_loc()) {
       double offset = fabs(heading - radial);
       return (offset<= 8.0 || offset >= 352.0);
     } else {
-      double offset =
-	fabs(heading - var - radial);
+//       double offset =
+// 	fabs(heading - var - radial);
+      double offset = fabs(heading - radial);
       return (offset <= 20.0 || offset >= 340.0);
     }
   } else {
@@ -1301,13 +1439,14 @@ FGBFI::getNAV1FROM ()
   if (current_radiostack->get_nav1_inrange()) {
     double heading = current_radiostack->get_nav1_heading();
     double radial = current_radiostack->get_nav1_radial();
-    double var = FGBFI::getMagVar();
+//     double var = FGBFI::getMagVar();
     if (current_radiostack->get_nav1_loc()) {
       double offset = fabs(heading - radial);
       return (offset >= 172.0 && offset<= 188.0);
     } else {
-      double offset =
-	fabs(heading - var - radial);
+//       double offset =
+// 	fabs(heading - var - radial);
+      double offset = fabs(heading - radial);
       return (offset >= 160.0 && offset <= 200.0);
     }
   } else {
@@ -1364,13 +1503,14 @@ FGBFI::getNAV2TO ()
   if (current_radiostack->get_nav2_inrange()) {
     double heading = current_radiostack->get_nav2_heading();
     double radial = current_radiostack->get_nav2_radial();
-    double var = FGBFI::getMagVar();
+//     double var = FGBFI::getMagVar();
     if (current_radiostack->get_nav2_loc()) {
       double offset = fabs(heading - radial);
       return (offset<= 8.0 || offset >= 352.0);
     } else {
-      double offset =
-	fabs(heading - var - radial);
+//       double offset =
+// 	fabs(heading - var - radial);
+      double offset = fabs(heading - radial);
       return (offset <= 20.0 || offset >= 340.0);
     }
   } else {
@@ -1384,13 +1524,14 @@ FGBFI::getNAV2FROM ()
   if (current_radiostack->get_nav2_inrange()) {
     double heading = current_radiostack->get_nav2_heading();
     double radial = current_radiostack->get_nav2_radial();
-    double var = FGBFI::getMagVar();
+//     double var = FGBFI::getMagVar();
     if (current_radiostack->get_nav2_loc()) {
       double offset = fabs(heading - radial);
       return (offset >= 172.0 && offset<= 188.0);
     } else {
-      double offset =
-	fabs(heading - var - radial);
+//       double offset =
+// 	fabs(heading - var - radial);
+      double offset = fabs(heading - radial);
       return (offset >= 160.0 && offset <= 200.0);
     }
   } else {
@@ -1522,10 +1663,14 @@ FGBFI::setGPSLock (bool lock)
 /**
  * Get the GPS target airport code.
  */
-const string
+string 
 FGBFI::getTargetAirport ()
 {
-  return current_options.get_airport_id();
+  // FIXME: not thread-safe
+  static string out;
+  out = globals->get_options()->get_airport_id();
+
+  return out;
 }
 
 
@@ -1533,9 +1678,9 @@ FGBFI::getTargetAirport ()
  * Set the GPS target airport code.
  */
 void
-FGBFI::setTargetAirport (const string &airportId)
+FGBFI::setTargetAirport (string airportId)
 {
-  current_options.set_airport_id(airportId);
+  globals->get_options()->set_airport_id(airportId);
 }
 
 
@@ -1549,16 +1694,6 @@ FGBFI::getGPSTargetLatitude ()
 }
 
 
-/**
- * Set the GPS target latitude in degrees (negative for south).
- */
-void
-FGBFI::setGPSTargetLatitude (double latitude)
-{
-  current_autopilot->set_TargetLatitude( latitude );
-}
-
-
 /**
  * Get the GPS target longitude in degrees (negative for west).
  */
@@ -1568,7 +1703,7 @@ FGBFI::getGPSTargetLongitude ()
   return current_autopilot->get_TargetLongitude();
 }
 
-
+#if 0
 /**
  * Set the GPS target longitude in degrees (negative for west).
  */
@@ -1577,6 +1712,7 @@ FGBFI::setGPSTargetLongitude (double longitude)
 {
   current_autopilot->set_TargetLongitude( longitude );
 }
+#endif
 
 
 
@@ -1586,7 +1722,7 @@ FGBFI::setGPSTargetLongitude (double longitude)
 
 
 /**
- * Get the current visible (units??).
+ * Get the current visibility (meters).
  */
 double
 FGBFI::getVisibility ()
@@ -1600,66 +1736,103 @@ FGBFI::getVisibility ()
 
 
 /**
- * Check whether clouds are enabled.
+ * Set the current visibility (meters).
  */
-bool
-FGBFI::getClouds ()
+void
+FGBFI::setVisibility (double visibility)
 {
-  return current_options.get_clouds();
+#ifndef FG_OLD_WEATHER
+  WeatherDatabase->setWeatherVisibility(visibility);
+#else
+  current_weather.set_visibility(visibility);
+#endif
 }
 
 
 /**
- * Check the height of the clouds ASL (units?).
+ * Get the current wind north velocity (feet/second).
  */
 double
-FGBFI::getCloudsASL ()
+FGBFI::getWindNorth ()
 {
-  return current_options.get_clouds_asl();
+  return current_aircraft.fdm_state->get_V_north_airmass();
 }
 
 
 /**
- * Set the current visibility (units??).
+ * Set the current wind north velocity (feet/second).
  */
 void
-FGBFI::setVisibility (double visibility)
+FGBFI::setWindNorth (double speed)
 {
-#ifndef FG_OLD_WEATHER
-  WeatherDatabase->setWeatherVisibility(visibility);
-#else
-  current_weather.set_visibility(visibility);
-#endif
+  current_aircraft.fdm_state->set_Velocities_Local_Airmass(speed,
+							   getWindEast(),
+							   getWindDown());
 }
 
 
 /**
- * Switch clouds on or off.
+ * Get the current wind east velocity (feet/second).
+ */
+double
+FGBFI::getWindEast ()
+{
+  return current_aircraft.fdm_state->get_V_east_airmass();
+}
+
+
+/**
+ * Set the current wind east velocity (feet/second).
  */
 void
-FGBFI::setClouds (bool clouds)
+FGBFI::setWindEast (double speed)
 {
-  if (getClouds() != clouds) {
-    cout << "Set clouds to " << clouds << endl;
-    current_options.set_clouds(clouds);
-    needReinit();
-  }
+  cout << "Set wind-east to " << speed << endl;
+  current_aircraft.fdm_state->set_Velocities_Local_Airmass(getWindNorth(),
+							   speed,
+							   getWindDown());
+}
+
+
+/**
+ * Get the current wind down velocity (feet/second).
+ */
+double
+FGBFI::getWindDown ()
+{
+  return current_aircraft.fdm_state->get_V_down_airmass();
 }
 
 
 /**
- * Set the cloud height.
+ * Set the current wind down velocity (feet/second).
  */
 void
-FGBFI::setCloudsASL (double cloudsASL)
+FGBFI::setWindDown (double speed)
 {
-  if (getCloudsASL() != cloudsASL) {
-    current_options.set_clouds_asl(cloudsASL);
-    needReinit();
-  }
+  current_aircraft.fdm_state->set_Velocities_Local_Airmass(getWindNorth(),
+							   getWindEast(),
+							   speed);
 }
 
 
+
+////////////////////////////////////////////////////////////////////////
+// View.
+////////////////////////////////////////////////////////////////////////
+
+void
+FGBFI::setViewAxisLong (double axis)
+{
+  axisLong = axis;
+}
+
+void
+FGBFI::setViewAxisLat (double axis)
+{
+  axisLat = axis;
+}
+
 
 ////////////////////////////////////////////////////////////////////////
 // Time