#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/scene/model/particles.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
-#include STL_IOSTREAM
-
-#include <Aircraft/aircraft.hxx>
-#include <Time/tmp.hxx>
-#include <Environment/environment.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 fdm_data_logging = false; // FIXME: temporary
-
static bool frozen = false; // FIXME: temporary
-
+using std::string;
\f
////////////////////////////////////////////////////////////////////////
// Default property bindings (not yet handled by any module).
/**
* Get the logging classes.
*/
+// XXX Making the result buffer be global is a band-aid that hopefully
+// delays its destruction 'til after its last use.
+namespace
+{
+string loggingResult;
+}
+
static const char *
getLoggingClasses ()
{
sgDebugClass classes = logbuf::get_log_classes();
- static string result;
- result = "";
+ loggingResult.clear();
for (int i = 0; log_class_mappings[i].c != SG_UNDEFD; i++) {
if ((classes&log_class_mappings[i].c) > 0) {
- if (!result.empty())
- result += '|';
- result += log_class_mappings[i].name;
+ if (!loggingResult.empty())
+ loggingResult += '|';
+ loggingResult += log_class_mappings[i].name;
}
}
- return result.c_str();
+ return loggingResult.c_str();
}
frozen = f;
// Stop sound on a pause
- SGSoundMgr *s = globals->get_soundmgr();
- if ( s != NULL ) {
+ SGSoundMgr *smgr = globals->get_soundmgr();
+ if ( smgr != NULL ) {
if ( f ) {
- s->pause();
- } else if (!fgGetBool("/sim/sound/pause")) {
- s->resume();
+ smgr->suspend();
+ } else if (fgGetBool("/sim/sound/working")) {
+ smgr->resume();
}
}
+
+ // Pause the particle system
+ simgear::Particles::setFrozen(f);
}
getDateString ()
{
static char buf[64]; // FIXME
- struct tm * t = globals->get_time_params()->getGmt();
+
+ SGTime * st = globals->get_time_params();
+ if (!st) {
+ buf[0] = 0;
+ return buf;
+ }
+
+ struct tm * t = st->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);
static void
setDateString (const char * date_string)
{
- static const SGPropertyNode *cur_time_override
- = fgGetNode("/sim/time/cur-time-override", true);
-
SGTime * st = globals->get_time_params();
struct tm * current_time = st->getGmt();
struct tm new_time;
// 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();
- globals->set_warp(warp);
- st->update(lon, lat, cur_time_override->getLongValue(), warp);
+
+ fgSetInt("/sim/time/warp", warp);
}
/**
getGMTString ()
{
static char buf[16];
- struct tm *t = globals->get_time_params()->getGmt();
+ SGTime * st = globals->get_time_params();
+ if (!st) {
+ buf[0] = 0;
+ return buf;
+ }
+
+ struct tm *t = st->getGmt();
snprintf(buf, 16, "%.2d:%.2d:%.2d",
t->tm_hour, t->tm_min, t->tm_sec);
return buf;
getHeadingMag ()
{
double magheading;
- magheading = current_aircraft.fdm_state->get_Psi() * SGD_RADIANS_TO_DEGREES - getMagVar();
+ magheading = fgGetDouble("/orientation/heading-deg") - getMagVar();
if (magheading < 0) magheading += 360;
return magheading;
}
-static long
-getWarp ()
-{
- return globals->get_warp();
-}
-
-static void
-setWarp (long warp)
-{
- globals->set_warp(warp);
-}
-
-static long
-getWarpDelta ()
-{
- return globals->get_warp_delta();
-}
-
-static void
-setWarpDelta (long delta)
+/**
+ * Return the current track in degrees.
+ */
+static double
+getTrackMag ()
{
- globals->set_warp_delta(delta);
+ double magtrack;
+ magtrack = fgGetDouble("/orientation/track-deg") - getMagVar();
+ if (magtrack < 0) magtrack += 360;
+ return magtrack;
}
static bool
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 ()
-{
- return fdm_data_logging;
-}
-
-static void
-setFDMDataLogging (bool state)
-{
- // kludge; no getter or setter available
- if (state != fdm_data_logging) {
- fgToggleFDMdataLogging();
- fdm_data_logging = state;
- }
-}
-
static const char *
getLongitudeString ()
{
// Orientation
fgTie("/orientation/heading-magnetic-deg", getHeadingMag);
+ fgTie("/orientation/track-magnetic-deg", getTrackMag);
fgTie("/environment/magnetic-variation-deg", getMagVar);
fgTie("/environment/magnetic-dip-deg", getMagDip);
- fgTie("/sim/time/warp", getWarp, setWarp, false);
- fgTie("/sim/time/warp-delta", getWarpDelta, setWarpDelta);
-
// 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);
}
void
// Orientation
fgUntie("/orientation/heading-magnetic-deg");
+ fgUntie("/orientation/track-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");
+// fgUntie("/sim/temp/full-screen");
+// fgUntie("/sim/temp/fdm-data-logging");
}
void
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());
+ static SGPropertyNode_ptr offset = fgGetNode("/sim/time/local-offset", true);
+ offset->setIntValue(globals->get_time_params()->get_local_offset());
+
+
+ // utc date/time
+ static SGPropertyNode_ptr uyear = fgGetNode("/sim/time/utc/year", true);
+ static SGPropertyNode_ptr umonth = fgGetNode("/sim/time/utc/month", true);
+ static SGPropertyNode_ptr uday = fgGetNode("/sim/time/utc/day", true);
+ static SGPropertyNode_ptr uhour = fgGetNode("/sim/time/utc/hour", true);
+ static SGPropertyNode_ptr umin = fgGetNode("/sim/time/utc/minute", true);
+ static SGPropertyNode_ptr usec = fgGetNode("/sim/time/utc/second", true);
+ static SGPropertyNode_ptr uwday = fgGetNode("/sim/time/utc/weekday", true);
+ static SGPropertyNode_ptr udsec = fgGetNode("/sim/time/utc/day-seconds", true);
+
+ struct tm *u = globals->get_time_params()->getGmt();
+ uyear->setIntValue(u->tm_year + 1900);
+ umonth->setIntValue(u->tm_mon + 1);
+ uday->setIntValue(u->tm_mday);
+ uhour->setIntValue(u->tm_hour);
+ umin->setIntValue(u->tm_min);
+ usec->setIntValue(u->tm_sec);
+ uwday->setIntValue(u->tm_wday);
+
+ udsec->setIntValue(u->tm_hour * 3600 + u->tm_min * 60 + u->tm_sec);
+
+
+ // real local date/time
+ static SGPropertyNode_ptr ryear = fgGetNode("/sim/time/real/year", true);
+ static SGPropertyNode_ptr rmonth = fgGetNode("/sim/time/real/month", true);
+ static SGPropertyNode_ptr rday = fgGetNode("/sim/time/real/day", true);
+ static SGPropertyNode_ptr rhour = fgGetNode("/sim/time/real/hour", true);
+ static SGPropertyNode_ptr rmin = fgGetNode("/sim/time/real/minute", true);
+ static SGPropertyNode_ptr rsec = fgGetNode("/sim/time/real/second", true);
+ static SGPropertyNode_ptr rwday = fgGetNode("/sim/time/real/weekday", true);
+
+ time_t real = time(0);
+ struct tm *r = localtime(&real);
+ ryear->setIntValue(r->tm_year + 1900);
+ rmonth->setIntValue(r->tm_mon + 1);
+ rday->setIntValue(r->tm_mday);
+ rhour->setIntValue(r->tm_hour);
+ rmin->setIntValue(r->tm_min);
+ rsec->setIntValue(r->tm_sec);
+ rwday->setIntValue(r->tm_wday);
}
* 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 {
}
void
-fgUntie (const char * name)
+fgUntie(const char * name)
{
- if (!globals->get_props()->untie(name))
+ SGPropertyNode* node = globals->get_props()->getNode(name);
+ if (!node) {
+ SG_LOG(SG_GENERAL, SG_WARN, "fgUntie: unknown property " << name);
+ return;
+ }
+
+ if (!node->isTied()) {
+ return;
+ }
+
+ if (!node->untie()) {
SG_LOG(SG_GENERAL, SG_WARN, "Failed to untie property " << name);
+ }
}
projects / flightgear.git / blobdiff