X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_props.cxx;h=a5726b79b00b7e7ad44d76565dc0acf9e971b9ca;hb=b587400846111cc4d6713dcdd38b715c97923d5a;hp=8ed56f001ef2fa47f225dabb173c9db320e9d4b8;hpb=429f2530de08f922d62fcfeade85740569e04768;p=flightgear.git

diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 8ed56f001..a5726b79b 100644
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -25,29 +25,21 @@
 #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 <iostream>
-
 #include <Aircraft/aircraft.hxx>
 #include <FDM/flight.hxx>
-
-#include <Time/tmp.hxx>
-#include <Environment/environment.hxx>
-
 #include <GUI/gui.h>
 
 #include "globals.hxx"
 #include "fg_props.hxx"
 
-using std::istream;
-using std::ostream;
 
 static bool winding_ccw = true; // FIXME: temporary
 
@@ -55,7 +47,7 @@ static bool fdm_data_logging = false; // FIXME: temporary
 
 static bool frozen = false;	// FIXME: temporary
 
-
+using std::string;
 
 ////////////////////////////////////////////////////////////////////////
 // Default property bindings (not yet handled by any module).
@@ -93,20 +85,26 @@ LogClassMapping log_class_mappings [] = {
 /**
  * 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();
 }
 
 
@@ -230,12 +228,12 @@ setFreeze (bool f)
     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();
         }
     }
 }
@@ -357,6 +355,18 @@ getHeadingMag ()
   return magheading;
 }
 
+/**
+ * Return the current track in degrees.
+ */
+static double
+getTrackMag ()
+{
+  double magtrack;
+  magtrack = current_aircraft.fdm_state->get_Track() - getMagVar();
+  if (magtrack < 0) magtrack += 360;
+  return magtrack;
+}
+
 static long
 getWarp ()
 {
@@ -516,6 +526,7 @@ FGProperties::bind ()
 
 				// 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);
@@ -545,6 +556,7 @@ FGProperties::unbind ()
 
 				// Orientation
   fgUntie("/orientation/heading-magnetic-deg");
+  fgUntie("/orientation/track-magnetic-deg");
 
 				// Environment
   fgUntie("/environment/magnetic-variation-deg");
@@ -562,23 +574,50 @@ FGProperties::unbind ()
 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);
 }
 
 
@@ -592,7 +631,7 @@ FGProperties::update (double dt)
  * 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);
@@ -616,7 +655,7 @@ fgSaveFlight (ostream &output, bool write_all)
  * Restore the current state of the simulator from a stream.
  */
 bool
-fgLoadFlight (istream &input)
+fgLoadFlight (std::istream &input)
 {
   SGPropertyNode props;
   try {