//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
#ifdef HAVE_CONFIG_H
-# include <simgear/compiler.h>
+# include "config.h"
#endif
-#include <simgear/misc/exception.hxx>
+#include <simgear/compiler.h>
+
+#include <simgear/structure/exception.hxx>
#include <simgear/magvar/magvar.hxx>
#include <simgear/timing/sg_time.hxx>
#include <simgear/misc/sg_path.hxx>
-#include <simgear/sound/soundmgr.hxx>
+#include <simgear/scene/material/matlib.hxx>
+#include <simgear/sound/soundmgr_openal.hxx>
#include STL_IOSTREAM
#include <ATC/ATCdisplay.hxx>
#include <Aircraft/aircraft.hxx>
#include <Time/tmp.hxx>
-#include <FDM/UIUCModel/uiuc_aircraftdir.h>
-#ifdef FG_WEATHERCM
-# include <WeatherCM/FGLocalWeatherDatabase.h>
-#else
-# include <Environment/environment.hxx>
-#endif // FG_WEATHERCM
-#include <Objects/matlib.hxx>
+#include <Environment/environment.hxx>
#include <GUI/gui.h>
#include "globals.hxx"
-#include "fgfs.hxx"
#include "fg_props.hxx"
SG_USING_STD(istream);
SG_USING_STD(ostream);
-#ifdef FG_WEATHERCM
-static double getWindNorth ();
-static double getWindEast ();
-static double getWindDown ();
-#endif // FG_WEATHERCM
-
static bool winding_ccw = true; // FIXME: temporary
static bool fdm_data_logging = false; // FIXME: temporary
LogClassMapping(SG_IO, "io"),
LogClassMapping(SG_CLIPPER, "clipper"),
LogClassMapping(SG_NETWORK, "network"),
+ LogClassMapping(SG_INSTR, "instrumentation"),
+ LogClassMapping(SG_SYSTEMS, "systems"),
LogClassMapping(SG_UNDEFD, "")
};
return;
}
}
- SG_LOG(SG_GENERAL, SG_ALERT, "Unknown logging class: " << name);
+ SG_LOG(SG_GENERAL, SG_WARN, "Unknown logging class: " << name);
}
static void
setLoggingPriority (const char * p)
{
+ if (p == 0)
+ return;
string priority = p;
if (priority == "bulk") {
logbuf::set_log_priority(SG_BULK);
} else {
SG_LOG(SG_GENERAL, SG_WARN, "Unknown logging priority " << priority);
}
- SG_LOG(SG_GENERAL, SG_INFO, "Logging priority is " << getLoggingPriority());
+ SG_LOG(SG_GENERAL, SG_DEBUG, "Logging priority is " << getLoggingPriority());
}
frozen = f;
// Stop sound on a pause
- SoundMgr *s = globals->get_soundmgr();
+ SGSoundMgr *s = globals->get_soundmgr();
if ( s != NULL ) {
if ( f ) {
s->pause();
}
-/**
- * Return the current aircraft directory (UIUC) as a string.
- */
-static const char *
-getAircraftDir ()
-{
- return aircraft_dir.c_str();
-}
-
-
-/**
- * Set the current aircraft directory (UIUC).
- */
-static void
-setAircraftDir (const char * dir)
-{
- aircraft_dir = dir;
-}
-
-
/**
* Return the number of milliseconds elapsed since simulation started.
*/
// if the save file has been edited
// by hand.
if (ret != 6) {
- SG_LOG(SG_INPUT, SG_ALERT, "Date/time string " << date_string
+ SG_LOG(SG_INPUT, SG_WARN, "Date/time string " << date_string
<< " not in YYYY-MM-DDTHH:MM:SS format; skipped");
return;
}
double lat = current_aircraft.fdm_state->get_Latitude();
globals->set_warp(warp);
st->update(lon, lat, cur_time_override->getLongValue(), warp);
- fgUpdateSkyAndLightingParams();
}
/**
static const char *
getGMTString ()
{
- static char buf[16]; // FIXME
+ static 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);
- // cout << t << " " << buf << endl;
+ snprintf(buf, 16, "%.2d:%.2d:%.2d",
+ t->tm_hour, t->tm_min, t->tm_sec);
return buf;
}
-
-/**
- * Get the texture rendering state.
- */
-static bool
-getTextures ()
-{
- return (material_lib.get_step() == 0);
-}
-
-
-/**
- * Set the texture rendering state.
- */
-static void
-setTextures (bool textures)
-{
- if (textures)
- material_lib.set_step(0);
- else
- material_lib.set_step(1);
-}
-
-
/**
* Return the magnetic variation
*/
static double
getHeadingMag ()
{
- return current_aircraft.fdm_state->get_Psi() * SGD_RADIANS_TO_DEGREES - getMagVar();
+ double magheading;
+ magheading = current_aircraft.fdm_state->get_Psi() * SGD_RADIANS_TO_DEGREES - getMagVar();
+ if (magheading < 0) magheading += 360;
+ return magheading;
}
-
-#ifdef FG_WEATHERCM
-
-/**
- * Get the current visibility (meters).
- */
-static double
-getVisibility ()
-{
- return WeatherDatabase->getWeatherVisibility();
-}
-
-
-/**
- * Set the current visibility (meters).
- */
-static void
-setVisibility (double visibility)
-{
- WeatherDatabase->setWeatherVisibility(visibility);
-}
-
-/**
- * Get the current wind north velocity (feet/second).
- */
-static double
-getWindNorth ()
-{
- return current_aircraft.fdm_state->get_V_north_airmass();
-}
-
-
-/**
- * Set the current wind north velocity (feet/second).
- */
-static void
-setWindNorth (double speed)
-{
- current_aircraft.fdm_state
- ->set_Velocities_Local_Airmass(speed, getWindEast(), getWindDown());
-}
-
-
-/**
- * Get the current wind east velocity (feet/second).
- */
-static double
-getWindEast ()
-{
- return current_aircraft.fdm_state->get_V_east_airmass();
-}
-
-
-/**
- * Set the current wind east velocity (feet/second).
- */
-static void
-setWindEast (double speed)
-{
- SG_LOG(SG_GENERAL, SG_INFO,, "Set wind-east to " << speed );
- current_aircraft.fdm_state->set_Velocities_Local_Airmass(getWindNorth(),
- speed,
- getWindDown());
-}
-
-
-/**
- * Get the current wind down velocity (feet/second).
- */
-static double
-getWindDown ()
-{
- return current_aircraft.fdm_state->get_V_down_airmass();
-}
-
-
-/**
- * Set the current wind down velocity (feet/second).
- */
-static void
-setWindDown (double speed)
-{
- current_aircraft.fdm_state->set_Velocities_Local_Airmass(getWindNorth(),
- getWindEast(),
- speed);
-}
-
-#endif // FG_WEATHERCM
-
static long
getWarp ()
{
}
}
+static const char *
+getLongitudeString ()
+{
+ static SGConstPropertyNode_ptr n = fgGetNode("/position/longitude-deg", true);
+ static SGConstPropertyNode_ptr f = fgGetNode("/sim/lon-lat-format", true);
+ static char buf[32];
+ double d = n->getDoubleValue();
+ int format = f->getIntValue();
+ char c = d < 0.0 ? 'W' : 'E';
+
+ if (format == 0) {
+ snprintf(buf, 32, "%3.6f%c", d, c);
+
+ } else if (format == 1) {
+ // dd mm.mmm' (DMM-Format) -- uses a round-off factor tailored to the
+ // required precision of the minutes field (three decimal places),
+ // preventing minute values of 60.
+ double deg = fabs(d) + 5.0E-4 / 60.0;
+ double min = fabs(deg - int(deg)) * 60.0 - 4.999E-4;
+ snprintf(buf, 32, "%d*%06.3f%c", int(d < 0.0 ? -deg : deg), min, c);
+
+ } else {
+ // mm'ss.s'' (DMS-Format) -- uses a round-off factor tailored to the
+ // required precision of the seconds field (one decimal place),
+ // preventing second values of 60.
+ double deg = fabs(d) + 0.05 / 3600.0;
+ double min = (deg - int(deg)) * 60.0;
+ double sec = (min - int(min)) * 60.0 - 0.049;
+ snprintf(buf, 32, "%d*%02d %04.1f%c", int(d < 0.0 ? -deg : deg),
+ int(min), fabs(sec), c);
+ }
+ return buf;
+}
+
+static const char *
+getLatitudeString ()
+{
+ static SGConstPropertyNode_ptr n = fgGetNode("/position/latitude-deg", true);
+ static SGConstPropertyNode_ptr f = fgGetNode("/sim/lon-lat-format", true);
+ static char buf[32];
+ double d = n->getDoubleValue();
+ int format = f->getIntValue();
+ char c = d < 0.0 ? 'S' : 'N';
+
+ if (format == 0) {
+ snprintf(buf, 32, "%3.6f%c", d, c);
+
+ } else if (format == 1) {
+ double deg = fabs(d) + 5.0E-4 / 60.0;
+ double min = fabs(deg - int(deg)) * 60.0 - 4.999E-4;
+ snprintf(buf, 32, "%d*%06.3f%c", int(d < 0.0 ? -deg : deg), min, c);
+
+ } else {
+ double deg = fabs(d) + 0.05 / 3600.0;
+ double min = (deg - int(deg)) * 60.0;
+ double sec = (min - int(min)) * 60.0 - 0.049;
+ snprintf(buf, 32, "%d*%02d %04.1f%c", int(d < 0.0 ? -deg : deg),
+ int(min), fabs(sec), c);
+ }
+ return buf;
+}
+
+
+
\f
////////////////////////////////////////////////////////////////////////
// Tie the properties.
////////////////////////////////////////////////////////////////////////
+FGProperties::FGProperties ()
+{
+}
+
+FGProperties::~FGProperties ()
+{
+}
+
void
-fgInitProps ()
+FGProperties::init ()
+{
+}
+
+void
+FGProperties::bind ()
{
- SG_LOG(SG_GENERAL, SG_DEBUG, "start of fgInitProps()" );
// Simulation
fgTie("/sim/logging/priority", getLoggingPriority, setLoggingPriority);
fgTie("/sim/logging/classes", getLoggingClasses, setLoggingClasses);
fgTie("/sim/freeze/master", getFreeze, setFreeze);
- fgTie("/sim/aircraft-dir", getAircraftDir, setAircraftDir);
fgTie("/sim/time/elapsed-sec", getElapsedTime_sec);
fgTie("/sim/time/gmt", getDateString, setDateString);
fgSetArchivable("/sim/time/gmt");
fgTie("/sim/time/gmt-string", getGMTString);
- fgTie("/sim/rendering/textures", getTextures, setTextures);
+
+ // Position
+ fgTie("/position/latitude-string", getLatitudeString);
+ fgTie("/position/longitude-string", getLongitudeString);
// Orientation
fgTie("/orientation/heading-magnetic-deg", getHeadingMag);
- // Environment
-#ifdef FG_WEATHERCM
- fgTie("/environment/visibility-m", getVisibility, setVisibility);
- fgSetArchivable("/environment/visibility-m");
- fgTie("/environment/wind-from-north-fps", getWindNorth, setWindNorth);
- fgSetArchivable("/environment/wind-from-north-fps");
- fgTie("/environment/wind-from-east-fps", getWindEast, setWindEast);
- fgSetArchivable("/environment/wind-from-east-fps");
- fgTie("/environment/wind-from-down-fps", getWindDown, setWindDown);
- fgSetArchivable("/environment/wind-from-down-fps");
-#endif
-
fgTie("/environment/magnetic-variation-deg", getMagVar);
fgTie("/environment/magnetic-dip-deg", getMagDip);
fgTie("/sim/temp/winding-ccw", getWindingCCW, setWindingCCW, false);
fgTie("/sim/temp/full-screen", getFullScreen, setFullScreen);
fgTie("/sim/temp/fdm-data-logging", getFDMDataLogging, setFDMDataLogging);
-
- SG_LOG(SG_GENERAL, SG_DEBUG, "end of fgInitProps()" );
}
+void
+FGProperties::unbind ()
+{
+ // Simulation
+ fgUntie("/sim/logging/priority");
+ fgUntie("/sim/logging/classes");
+ fgUntie("/sim/freeze/master");
+
+ fgUntie("/sim/time/elapsed-sec");
+ fgUntie("/sim/time/gmt");
+ fgUntie("/sim/time/gmt-string");
+ // Position
+ fgUntie("/position/latitude-string");
+ fgUntie("/position/longitude-string");
+
+ // Orientation
+ fgUntie("/orientation/heading-magnetic-deg");
+
+ // Environment
+ fgUntie("/environment/magnetic-variation-deg");
+ fgUntie("/environment/magnetic-dip-deg");
+
+ fgUntie("/sim/time/warp");
+ fgUntie("/sim/time/warp-delta");
+
+ // Misc. Temporary junk.
+ fgUntie("/sim/temp/winding-ccw");
+ fgUntie("/sim/temp/full-screen");
+ fgUntie("/sim/temp/fdm-data-logging");
+}
void
-fgUpdateProps ()
+FGProperties::update (double dt)
{
+ // Date and time
+ struct tm *t = globals->get_time_params()->getGmt();
+
+ fgSetInt("/sim/time/utc/year", t->tm_year + 1900);
+ fgSetInt("/sim/time/utc/month", t->tm_mon + 1);
+ fgSetInt("/sim/time/utc/day", t->tm_mday);
+ fgSetInt("/sim/time/utc/hour", t->tm_hour);
+ fgSetInt("/sim/time/utc/minute", t->tm_min);
+ fgSetInt("/sim/time/utc/second", t->tm_sec);
+
+ fgSetDouble("/sim/time/utc/day-seconds",
+ t->tm_hour * 3600 +
+ t->tm_min * 60 +
+ t->tm_sec);
+
+ fgSetInt("/sim/time/local-offset",
+ globals->get_time_params()->get_local_offset());
}
bool
-fgLoadProps (const char * path, SGPropertyNode * props, bool in_fg_root)
+fgLoadProps (const char * path, SGPropertyNode * props, bool in_fg_root, int default_mode)
{
string fullpath;
if (in_fg_root) {
}
try {
- readProperties(fullpath, props);
+ readProperties(fullpath, props, default_mode);
} catch (const sg_exception &e) {
guiErrorMessage("Error reading properties: ", e);
return false;
{
SGPropertyNode * node = globals->get_props()->getNode(name);
if (node == 0)
- SG_LOG(SG_GENERAL, SG_ALERT,
+ SG_LOG(SG_GENERAL, SG_DEBUG,
"Attempt to set archive flag for non-existant property "
<< name);
else
{
SGPropertyNode * node = globals->get_props()->getNode(name);
if (node == 0)
- SG_LOG(SG_GENERAL, SG_ALERT,
+ SG_LOG(SG_GENERAL, SG_DEBUG,
"Attempt to set read flag for non-existant property "
<< name);
else
{
SGPropertyNode * node = globals->get_props()->getNode(name);
if (node == 0)
- SG_LOG(SG_GENERAL, SG_ALERT,
+ SG_LOG(SG_GENERAL, SG_DEBUG,
"Attempt to set write flag for non-existant property "
<< name);
else
projects / flightgear.git / blobdiff