#endif
#include <simgear/compiler.h>
-
#include <simgear/structure/exception.hxx>
+#include <simgear/props/props_io.hxx>
+
#include <simgear/magvar/magvar.hxx>
#include <simgear/timing/sg_time.hxx>
#include <simgear/misc/sg_path.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 <Environment/environment.hxx>
-
+#include <FDM/flight.hxx>
#include <GUI/gui.h>
#include "globals.hxx"
#include "fg_props.hxx"
-SG_USING_STD(istream);
-SG_USING_STD(ostream);
static bool winding_ccw = true; // FIXME: temporary
static bool frozen = false; // FIXME: temporary
-
+using std::string;
\f
////////////////////////////////////////////////////////////////////////
// Default property bindings (not yet handled by any module).
getLoggingClasses ()
{
sgDebugClass classes = logbuf::get_log_classes();
- static string result = ""; // FIXME
+ static string result;
+ result = "";
for (int i = 0; log_class_mappings[i].c != SG_UNDEFD; i++) {
if ((classes&log_class_mappings[i].c) > 0) {
if (!result.empty())
if ( s != NULL ) {
if ( f ) {
s->pause();
- } else {
+ } else if (!fgGetBool("/sim/sound/pause")) {
s->resume();
}
}
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;
}
glFrontFace ( GL_CW );
}
-static bool
-getFullScreen ()
-{
-#if defined(FX) && !defined(WIN32)
- return globals->get_fullscreen();
-#else
- return false;
-#endif
-}
-
-static void
-setFullScreen (bool state)
-{
-#if defined(FX) && !defined(WIN32)
- globals->set_fullscreen(state);
-# if defined(XMESA_FX_FULLSCREEN) && defined(XMESA_FX_WINDOW)
- XMesaSetFXmode( state ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW );
-# endif
-#endif
-}
-
static bool
getFDMDataLogging ()
{
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", d);
+ 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
// 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,
- d < 0.0 ? 'W' : 'E');
+ 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
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), sec, d < 0.0 ? 'W' : 'E');
+ int(min), fabs(sec), c);
}
+ buf[31] = '\0';
return buf;
}
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", d);
+ 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,
- d < 0.0 ? 'S' : 'N');
+ 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), sec, d < 0.0 ? 'S' : 'N');
+ int(min), fabs(sec), c);
}
+ buf[31] = '\0';
return buf;
}
// Misc. Temporary junk.
fgTie("/sim/temp/winding-ccw", getWindingCCW, setWindingCCW, false);
- fgTie("/sim/temp/full-screen", getFullScreen, setFullScreen);
fgTie("/sim/temp/fdm-data-logging", getFDMDataLogging, setFDMDataLogging);
}
* Save the current state of the simulator to a stream.
*/
bool
-fgSaveFlight (ostream &output, bool write_all)
+fgSaveFlight (std::ostream &output, bool write_all)
{
fgSetBool("/sim/presets/onground", false);
* Restore the current state of the simulator from a stream.
*/
bool
-fgLoadFlight (istream &input)
+fgLoadFlight (std::istream &input)
{
SGPropertyNode props;
try {