X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_props.cxx;h=a5726b79b00b7e7ad44d76565dc0acf9e971b9ca;hb=224afcc7e4cb4191be15f3df025164fcd83f5102;hp=de3e11d26ff01761969ce54a0294ce625ae53f90;hpb=51c04e9e4c4d2ecc0f3ee0a6d3559d1e22e247c5;p=flightgear.git

diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index de3e11d26..a5726b79b 100644
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -16,47 +16,30 @@
 //
 // 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/props/props_io.hxx>
+
 #include <simgear/magvar/magvar.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/misc/sg_path.hxx>
-#include <simgear/sound/soundmgr.hxx>
-
-#include STL_IOSTREAM
+#include <simgear/sound/soundmgr_openal.hxx>
 
-#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 <FDM/flight.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
 
@@ -64,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,6 +76,8 @@ LogClassMapping log_class_mappings [] = {
   LogClassMapping(SG_IO, "io"),
   LogClassMapping(SG_CLIPPER, "clipper"),
   LogClassMapping(SG_NETWORK, "network"),
+  LogClassMapping(SG_INSTR, "instrumentation"),
+  LogClassMapping(SG_SYSTEMS, "systems"),
   LogClassMapping(SG_UNDEFD, "")
 };
 
@@ -100,19 +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 = "";	// FIXME
+  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();
 }
 
 
@@ -126,7 +118,7 @@ addLoggingClass (const string &name)
       return;
     }
   }
-  SG_LOG(SG_GENERAL, SG_ALERT, "Unknown logging class: " << name);
+  SG_LOG(SG_GENERAL, SG_WARN, "Unknown logging class: " << name);
 }
 
 
@@ -197,6 +189,8 @@ getLoggingPriority ()
 static void
 setLoggingPriority (const char * p)
 {
+  if (p == 0)
+      return;
   string priority = p;
   if (priority == "bulk") {
     logbuf::set_log_priority(SG_BULK);
@@ -211,7 +205,7 @@ setLoggingPriority (const char * p)
   } 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());
 }
 
 
@@ -234,37 +228,17 @@ 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 {
-            s->resume();
+            smgr->suspend();
+        } else if (fgGetBool("/sim/sound/working")) {
+            smgr->resume();
         }
     }
 }
 
 
-/**
- * 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.
  */
@@ -315,7 +289,7 @@ setDateString (const char * date_string)
 				// 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;
   }
@@ -334,7 +308,6 @@ setDateString (const char * date_string)
   double lat = current_aircraft.fdm_state->get_Latitude();
   globals->set_warp(warp);
   st->update(lon, lat, cur_time_override->getLongValue(), warp);
-  fgUpdateSkyAndLightingParams();
 }
 
 /**
@@ -343,38 +316,13 @@ setDateString (const char * date_string)
 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
  */
@@ -401,98 +349,24 @@ getMagDip ()
 static double
 getHeadingMag ()
 {
-  return current_aircraft.fdm_state->get_Psi() * SGD_RADIANS_TO_DEGREES - getMagVar();
-}
-
-
-#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());
+  double magheading;
+  magheading = current_aircraft.fdm_state->get_Psi() * SGD_RADIANS_TO_DEGREES - getMagVar();
+  if (magheading < 0) magheading += 360;
+  return magheading;
 }
 
-
 /**
- * Get the current wind down velocity (feet/second).
+ * Return the current track in degrees.
  */
 static double
-getWindDown ()
+getTrackMag ()
 {
-  return current_aircraft.fdm_state->get_V_down_airmass();
+  double magtrack;
+  magtrack = current_aircraft.fdm_state->get_Track() - getMagVar();
+  if (magtrack < 0) magtrack += 360;
+  return magtrack;
 }
 
-
-/**
- * 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 ()
 {
@@ -533,27 +407,6 @@ setWindingCCW (bool state)
     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 ()
 {
@@ -570,41 +423,110 @@ setFDMDataLogging (bool state)
   }
 }
 
+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);
+  }
+  buf[31] = '\0';
+  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);
+  }
+  buf[31] = '\0';
+  return buf;
+}
+
+
+
 
 ////////////////////////////////////////////////////////////////////////
 // Tie the properties.
 ////////////////////////////////////////////////////////////////////////
 
+FGProperties::FGProperties ()
+{
+}
+
+FGProperties::~FGProperties ()
+{
+}
+
+void
+FGProperties::init ()
+{
+}
+
 void
-fgInitProps ()
+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("/orientation/track-magnetic-deg", getTrackMag);
 
   fgTie("/environment/magnetic-variation-deg", getMagVar);
   fgTie("/environment/magnetic-dip-deg", getMagDip);
@@ -614,16 +536,88 @@ fgInitProps ()
 
 				// 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);
-
-  SG_LOG(SG_GENERAL, SG_DEBUG, "end of fgInitProps()" );
 }
 
-
 void
-fgUpdateProps ()
+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");
+  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");
+}
+
+void
+FGProperties::update (double dt)
+{
+    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);
 }
 
 
@@ -637,7 +631,7 @@ fgUpdateProps ()
  * 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);
@@ -661,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 {
@@ -684,7 +678,7 @@ fgLoadFlight (istream &input)
 
 
 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) {
@@ -696,7 +690,7 @@ fgLoadProps (const char * path, SGPropertyNode * props, bool in_fg_root)
     }
 
     try {
-        readProperties(fullpath, props);
+        readProperties(fullpath, props, default_mode);
     } catch (const sg_exception &e) {
         guiErrorMessage("Error reading properties: ", e);
         return false;
@@ -818,7 +812,7 @@ fgSetArchivable (const char * name, bool state)
 {
   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
@@ -830,7 +824,7 @@ fgSetReadable (const char * name, bool state)
 {
   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
@@ -842,7 +836,7 @@ fgSetWritable (const char * name, bool state)
 {
   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