#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_types.hxx>
+#include <simgear/ephemeris/ephemeris.hxx>
+#include <simgear/math/sg_types.hxx>
#include <simgear/misc/props.hxx>
+#include <simgear/timing/sg_time.hxx>
#include <Aircraft/aircraft.hxx>
#include <FDM/UIUCModel/uiuc_aircraftdir.h>
#include <Controls/controls.hxx>
#include <Autopilot/newauto.hxx>
#include <Scenery/scenery.hxx>
-#include <Time/fg_time.hxx>
#include <Time/light.hxx>
#include <Time/event.hxx>
#include <Time/sunpos.hxx>
+#include <Time/tmp.hxx>
#include <Cockpit/radiostack.hxx>
-#include <Ephemeris/ephemeris.hxx>
#ifndef FG_OLD_WEATHER
# include <WeatherCM/FGLocalWeatherDatabase.h>
#else
# include <Weather/weather.hxx>
#endif
-#include "options.hxx"
+#include "globals.hxx"
#include "save.hxx"
#include "fg_init.hxx"
+#include <simgear/misc/props.hxx>
FG_USING_NAMESPACE(std);
// 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);
// Position
+ current_properties.tieString("/position/airport-id",
+ getTargetAirport, setTargetAirport);
current_properties.tieDouble("/position/latitude",
getLatitude, setLatitude);
current_properties.tieDouble("/position/longitude",
getLongitude, setLongitude);
current_properties.tieDouble("/position/altitude",
- getAltitude, setAltitude);
+ // getAltitude, setAltitude);
+ getAltitude, setAltitude, false);
current_properties.tieDouble("/position/altitude-agl",
getAGL, 0);
current_properties.tieDouble("/orientation/roll",
getRoll, setRoll);
+ // Engine
+ current_properties.tieDouble("/engines/engine0/rpm",
+ getRPM, 0);
+ current_properties.tieDouble("/engines/engine0/egt",
+ getEGT, 0);
+ current_properties.tieDouble("/engines/engine0/cht",
+ getCHT, 0);
+ current_properties.tieDouble("/engines/engine0/mp",
+ getMP, 0);
+
// Velocities
current_properties.tieDouble("/velocities/airspeed",
getAirspeed, 0);
// 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",
getElevator, setElevator);
current_properties.tieDouble("/controls/elevator-trim",
getElevatorTrim, setElevatorTrim);
- current_properties.tieDouble("/controls/brake",
- getBrake, setBrake);
+ 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);
// Autopilot
current_properties.tieBool("/autopilot/locks/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",
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",
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",
current_properties.tieDouble("/radios/adf/rotation",
getADFRotation, setADFRotation);
+ current_properties.tieDouble("/environment/visibility",
+ getVisibility, setVisibility);
+
+ _needReinit = false;
+
FG_LOG(FG_GENERAL, FG_INFO, "Ending BFI init");
}
cout << "BFI: start reinit\n";
- setHeading(getHeading());
- setPitch(getPitch());
- setRoll(getRoll());
- setSpeedNorth(getSpeedNorth());
- setSpeedEast(getSpeedEast());
- setSpeedDown(getSpeedDown());
- setLatitude(getLatitude());
- setLongitude(getLongitude());
- setAltitude(getAltitude());
-
// TODO: add more AP stuff
double elevator = getElevator();
double aileron = getAileron();
double throttle = getThrottle();
double elevator_trim = getElevatorTrim();
double flaps = getFlaps();
- double brake = getBrake();
+ double brake = getBrakes();
bool apHeadingLock = getAPHeadingLock();
double apHeadingMag = getAPHeadingMag();
bool apAltitudeLock = getAPAltitudeLock();
double gpsLongitude = getGPSTargetLongitude();
setTargetAirport("");
- cout << "Target airport is " << current_options.get_airport_id() << endl;
+ cout << "Target airport is " << globals->get_options()->get_airport_id() << endl;
fgReInitSubsystems();
fgUpdateSunPos();
fgUpdateMoonPos();
cur_light_params.Update();
- FGTime::cur_time_params->updateLocal();
+ fgUpdateLocalTime();
fgUpdateWeatherDatabase();
fgRadioSearch();
setThrottle(throttle);
setElevatorTrim(elevator_trim);
setFlaps(flaps);
- setBrake(brake);
+ setBrakes(brake);
setAPHeadingLock(apHeadingLock);
setAPHeadingMag(apHeadingMag);
setAPAltitudeLock(apAltitudeLock);
setAPAltitude(apAltitude);
setTargetAirport(targetAirport);
setGPSLock(gpsLock);
- setGPSTargetLatitude(gpsLatitude);
- setGPSTargetLongitude(gpsLongitude);
_needReinit = false;
int
FGBFI::getFlightModel ()
{
- return current_options.get_flight_model();
+ return globals->get_options()->get_flight_model();
}
const string
FGBFI::getAircraft ()
{
- return current_options.get_aircraft();
+ return globals->get_options()->get_aircraft();
}
void
FGBFI::setFlightModel (int model)
{
- current_options.set_flight_model(model);
- needReinit();
+ if (getFlightModel() != model) {
+ globals->get_options()->set_flight_model(model);
+ needReinit();
+ }
}
void
FGBFI::setAircraft (const string &aircraft)
{
- current_options.set_aircraft(aircraft);
- needReinit();
+ if (getAircraft() != aircraft) {
+ globals->get_options()->set_aircraft(aircraft);
+ needReinit();
+ }
}
void
FGBFI::setAircraftDir (const string &dir)
{
- aircraft_dir = dir;
- needReinit();
+ if (getAircraftDir() != dir) {
+ aircraft_dir = dir;
+ needReinit();
+ }
}
time_t
FGBFI::getTimeGMT ()
{
- return FGTime::cur_time_params->get_cur_time();
+ return globals->get_time_params()->get_cur_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);
- FGTime::cur_time_params->init( cur_fdm_state->get_Longitude(),
- cur_fdm_state->get_Latitude() );
- FGTime::cur_time_params->update( cur_fdm_state->get_Longitude(),
- cur_fdm_state->get_Latitude(),
- cur_fdm_state->get_Altitude()
- * FEET_TO_METER );
- needReinit();
+ globals->get_options()->set_time_offset(time);
+ globals->get_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();
+ }
+}
+
+
+/**
+ * Return the GMT as a string.
+ */
+const string &
+FGBFI::getGMTString ()
+{
+ static string out; // FIXME: not thread-safe
+ char buf[16];
+ struct tm * t = globals->get_time_params()->getGmt();
+ sprintf(buf, " %.2d:%.2d:%.2d",
+ t->tm_hour, t->tm_min, t->tm_sec);
+ out = buf;
+ return out;
}
bool
FGBFI::getHUDVisible ()
{
- return current_options.get_hud_status();
+ return globals->get_options()->get_hud_status();
}
void
FGBFI::setHUDVisible (bool visible)
{
- current_options.set_hud_status(visible);
+ globals->get_options()->set_hud_status(visible);
}
bool
FGBFI::getPanelVisible ()
{
- return current_options.get_panel_status();
+ return globals->get_options()->get_panel_status();
}
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();
}
}
void
FGBFI::setLatitude (double latitude)
{
- current_options.set_lat(latitude);
- current_aircraft.fdm_state->set_Latitude(latitude * DEG_TO_RAD);
- needReinit();
+ if (getLatitude() != latitude) {
+ globals->get_options()->set_lat(latitude);
+ current_aircraft.fdm_state->set_Latitude(latitude * DEG_TO_RAD);
+ needReinit();
+ }
}
void
FGBFI::setLongitude (double longitude)
{
- current_options.set_lon(longitude);
- current_aircraft.fdm_state->set_Longitude(longitude * DEG_TO_RAD);
- needReinit();
+ if (getLongitude() != longitude) {
+ globals->get_options()->set_lon(longitude);
+ current_aircraft.fdm_state->set_Longitude(longitude * DEG_TO_RAD);
+ needReinit();
+ }
}
FGBFI::getAGL ()
{
return current_aircraft.fdm_state->get_Altitude()
- - scenery.cur_elev * METER_TO_FEET;
+ - (scenery.cur_elev * METER_TO_FEET);
}
void
FGBFI::setAltitude (double altitude)
{
- fgFDMForceAltitude(getFlightModel(), altitude * FEET_TO_METER);
-// current_options.set_altitude(altitude * FEET_TO_METER);
-// current_aircraft.fdm_state->set_Altitude(altitude);
-// needReinit();
+ if (getAltitude() != altitude) {
+ fgFDMForceAltitude(getFlightModel(), altitude);
+ globals->get_options()->set_altitude(altitude);
+ current_aircraft.fdm_state->set_Altitude(altitude);
+ }
}
void
FGBFI::setHeading (double 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();
+ if (getHeading() != heading) {
+ globals->get_options()->set_heading(heading);
+ current_aircraft.fdm_state->set_Euler_Angles(getRoll() * DEG_TO_RAD,
+ getPitch() * DEG_TO_RAD,
+ heading * DEG_TO_RAD);
+ needReinit();
+ }
}
void
FGBFI::setPitch (double 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();
+ if (getPitch() != pitch) {
+ globals->get_options()->set_pitch(pitch);
+ current_aircraft.fdm_state->set_Euler_Angles(getRoll() * DEG_TO_RAD,
+ pitch * DEG_TO_RAD,
+ getHeading() * DEG_TO_RAD);
+ needReinit();
+ }
}
void
FGBFI::setRoll (double 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();
+ if (getRoll() != roll) {
+ globals->get_options()->set_roll(roll);
+ current_aircraft.fdm_state->set_Euler_Angles(roll * DEG_TO_RAD,
+ getPitch() * DEG_TO_RAD,
+ getHeading() * DEG_TO_RAD);
+ needReinit();
+ }
+}
+
+
+/**
+ * Return the current engine0 rpm
+ */
+double
+FGBFI::getRPM ()
+{
+ if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+ return current_aircraft.fdm_state->get_engine(0)->get_RPM();
+ } else {
+ return 0.0;
+ }
+}
+
+
+/**
+ * Set the current engine0 rpm
+ */
+void
+FGBFI::setRPM (double rpm)
+{
+ if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+ if (getRPM() != rpm) {
+ current_aircraft.fdm_state->get_engine(0)->set_RPM( rpm );
+ }
+ }
+}
+
+
+/**
+ * Return the current engine0 EGT.
+ */
+double
+FGBFI::getEGT ()
+{
+ if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+ return current_aircraft.fdm_state->get_engine(0)->get_EGT();
+ }
+}
+
+
+/**
+ * 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();
+ }
+}
+
+
+/**
+ * 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();
+ }
}
void
FGBFI::setSpeedNorth (double speed)
{
- current_options.set_uBody(speed);
- current_aircraft.fdm_state->set_Velocities_Local(speed,
- getSpeedEast(),
- getSpeedDown());
- needReinit();
+ if (getSpeedNorth() != speed) {
+ current_aircraft.fdm_state->set_Velocities_Local(speed,
+ getSpeedEast(),
+ getSpeedDown());
+ needReinit();
+ }
}
void
FGBFI::setSpeedEast (double speed)
{
- current_options.set_vBody(speed);
- current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
- speed,
- getSpeedDown());
- needReinit();
+ if (getSpeedEast() != speed) {
+ current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
+ speed,
+ getSpeedDown());
+ needReinit();
+ }
}
void
FGBFI::setSpeedDown (double speed)
{
- current_options.set_wBody(speed);
- current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
- getSpeedEast(),
- speed);
- needReinit();
+ if (getSpeedDown() != speed) {
+ current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
+ getSpeedEast(),
+ speed);
+ needReinit();
+ }
}
double
FGBFI::getThrottle ()
{
- // FIXME: add throttle selector
+ // FIXME: add engine selector
return controls.get_throttle(0);
}
void
FGBFI::setThrottle (double throttle)
{
- // FIXME: allow throttle selection
- // FIXME: clamp?
+ // FIXME: allow engine selection
controls.set_throttle(0, throttle);
}
+/**
+ * Get the fuel mixture setting, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getMixture ()
+{
+ // FIXME: add engine selector
+ return controls.get_mixture(0);
+}
+
+
+/**
+ * Set the fuel mixture, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setMixture (double mixture)
+{
+ // FIXME: allow engine selection
+ controls.set_mixture(0, mixture);
+}
+
+
+/**
+ * Get the propellor pitch setting, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getPropAdvance ()
+{
+ // FIXME: add engine selector
+ return controls.get_prop_advance(0);
+}
+
+
+/**
+ * Set the propellor pitch, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setPropAdvance (double pitch)
+{
+ // FIXME: allow engine selection
+ controls.set_prop_advance(0, pitch);
+}
+
+
/**
* Get the flaps setting, from 0.0 (none) to 1.0 (full).
*/
/**
- * Get the brake setting, from 0.0 (none) to 1.0 (full).
+ * Get the highest brake setting, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getBrakes ()
+{
+ double b1 = getCenterBrake();
+ double b2 = getLeftBrake();
+ double b3 = getRightBrake();
+ return (b1 > b2 ? (b1 > b3 ? b1 : b3) : (b2 > b3 ? b2 : b3));
+}
+
+
+/**
+ * Set all brakes, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setBrakes (double brake)
+{
+ setCenterBrake(brake);
+ setLeftBrake(brake);
+ setRightBrake(brake);
+}
+
+
+/**
+ * Get the center brake, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getCenterBrake ()
+{
+ return controls.get_brake(2);
+}
+
+
+/**
+ * Set the center brake, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setCenterBrake (double brake)
+{
+ controls.set_brake(2, brake);
+}
+
+
+/**
+ * Get the left brake, from 0.0 (none) to 1.0 (full).
*/
double
-FGBFI::getBrake ()
+FGBFI::getLeftBrake ()
{
- // FIXME: add brake selector
return controls.get_brake(0);
}
/**
- * Set the brake, from 0.0 (none) to 1.0 (full).
+ * Set the left brake, from 0.0 (none) to 1.0 (full).
*/
void
-FGBFI::setBrake (double brake)
+FGBFI::setLeftBrake (double brake)
{
- // FIXME: clamp?
- // FIXME: allow brake selection
controls.set_brake(0, brake);
}
+/**
+ * Get the right brake, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getRightBrake ()
+{
+ return controls.get_brake(1);
+}
+
+
+/**
+ * Set the right brake, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setRightBrake (double brake)
+{
+ controls.set_brake(1, brake);
+}
+
+
+
+
\f
////////////////////////////////////////////////////////////////////////
// Autopilot
}
+/**
+ * Get the autopilot target heading in degrees.
+ */
+double
+FGBFI::getAPHeading ()
+{
+ return current_autopilot->get_TargetHeading();
+}
+
+
+/**
+ * Set the autopilot target heading in degrees.
+ */
+void
+FGBFI::setAPHeading (double heading)
+{
+ current_autopilot->set_TargetHeading( heading );
+}
+
+
/**
* Get the autopilot target heading in degrees.
*/
return current_radiostack->get_nav1_dme_dist();
}
+bool
+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();
+ 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);
+ return (offset <= 20.0 || offset >= 340.0);
+ }
+ } else {
+ return false;
+ }
+}
+
+bool
+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();
+ 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);
+ return (offset >= 160.0 && offset <= 200.0);
+ }
+ } else {
+ return false;
+ }
+}
+
bool
FGBFI::getNAV1InRange ()
{
return current_radiostack->get_nav2_dme_dist();
}
+bool
+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();
+ 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);
+ return (offset <= 20.0 || offset >= 340.0);
+ }
+ } else {
+ return false;
+ }
+}
+
+bool
+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();
+ 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);
+ return (offset >= 160.0 && offset <= 200.0);
+ }
+ } else {
+ return false;
+ }
+}
+
+
bool
FGBFI::getNAV2InRange ()
{
/**
* Get the GPS target airport code.
*/
-const string
+const 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;
}
void
FGBFI::setTargetAirport (const string &airportId)
{
- current_options.set_airport_id(airportId);
+ // cout << "setting target airport id = " << airportId << endl;
+ globals->get_options()->set_airport_id(airportId);
}
}
-/**
- * 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).
*/
return current_autopilot->get_TargetLongitude();
}
-
+#if 0
/**
* Set the GPS target longitude in degrees (negative for west).
*/
{
current_autopilot->set_TargetLongitude( longitude );
}
+#endif
\f
bool
FGBFI::getClouds ()
{
- return current_options.get_clouds();
+ return globals->get_options()->get_clouds();
}
double
FGBFI::getCloudsASL ()
{
- return current_options.get_clouds_asl();
+ return globals->get_options()->get_clouds_asl();
}
void
FGBFI::setClouds (bool clouds)
{
- cout << "Set clouds to " << clouds << endl;
- current_options.set_clouds(clouds);
- needReinit();
+ if (getClouds() != clouds) {
+ cout << "Set clouds to " << clouds << endl;
+ globals->get_options()->set_clouds(clouds);
+ needReinit();
+ }
}
void
FGBFI::setCloudsASL (double cloudsASL)
{
- current_options.set_clouds_asl(cloudsASL);
- needReinit();
+ if (getCloudsASL() != cloudsASL) {
+ globals->get_options()->set_clouds_asl(cloudsASL);
+ needReinit();
+ }
}
double
FGBFI::getMagVar ()
{
- return FGTime::cur_time_params->getMagVar() * RAD_TO_DEG;
+ return globals->get_mag()->get_magvar() * RAD_TO_DEG;
}
double
FGBFI::getMagDip ()
{
- return FGTime::cur_time_params->getMagDip() * RAD_TO_DEG;
+ return globals->get_mag()->get_magdip() * RAD_TO_DEG;
}
projects / flightgear.git / blobdiff