X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Futil.cxx;h=0986e91ea47a71c93b9595c25affa837743abc22;hb=b587400846111cc4d6713dcdd38b715c97923d5a;hp=9525f1d582553cd6760ba5a19eccfb41ba143f00;hpb=5822e0b0e858037b9122fd81fbd0b3a407003c15;p=flightgear.git

diff --git a/src/Main/util.cxx b/src/Main/util.cxx
index 9525f1d58..0986e91ea 100644
--- a/src/Main/util.cxx
+++ b/src/Main/util.cxx
@@ -1,5 +1,5 @@
 // util.cxx - general-purpose utility functions.
-// Copyright (C) 2002  Curtis L. Olson  - curt@me.umn.edu
+// Copyright (C) 2002  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -13,7 +13,7 @@
 //
 // 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$
 
@@ -22,8 +22,10 @@
 
 #include <math.h>
 
+#include <cstdlib>
+
 #include <vector>
-SG_USING_STD(vector);
+using std::vector;
 
 #include <simgear/debug/logstream.hxx>
 
@@ -32,6 +34,9 @@ SG_USING_STD(vector);
 #include "globals.hxx"
 #include "util.hxx"
 
+#ifdef OSG_LIBRARY_STATIC
+#include "osgDB/Registry"
+#endif
 
 void
 fgDefaultWeatherValue (const char * propname, double value)
@@ -98,28 +103,18 @@ fgSetupWind (double min_hdg, double max_hdg, double speed, double gust)
               min_hdg);
   fgSetDouble("/environment/config/aloft/entry[2]/wind-speed-kt",
               speed);
-
-#ifdef FG_WEATHERCM
-  // convert to fps
-  speed *= SG_NM_TO_METER * SG_METER_TO_FEET * (1.0/3600);
-  while (min_hdg > 360)
-    min_hdg -= 360;
-  while (min_hdg <= 0)
-    min_hdg += 360;
-  min_hdg *= SGD_DEGREES_TO_RADIANS;
-  fgSetDouble("/environment/wind-from-north-fps", speed * cos(dir));
-  fgSetDouble("/environment/wind-from-east-fps", speed * sin(dir));
-#endif // FG_WEATHERCM
 }
 
 
 void
 fgExit (int status)
 {
-    SG_LOG(SG_GENERAL, SG_INFO, "Exiting FlightGear with status " << status);
+#ifdef OSG_LIBRARY_STATIC
+    osgDB::Registry::instance( true);
+#endif
 
-    globals->get_io()->shutdown_all();
-    exit(status);
+    SG_LOG(SG_GENERAL, SG_INFO, "Exiting FlightGear with status " << status);
+    std::exit(status);
 }
 
 
@@ -128,7 +123,7 @@ double
 fgGetLowPass (double current, double target, double timeratio)
 {
     if ( timeratio < 0.0 ) {
-	if ( timeratio < -1.0 ) {
+        if ( timeratio < -1.0 ) {
                                 // time went backwards; kill the filter
                 current = target;
         } else {
@@ -150,5 +145,79 @@ fgGetLowPass (double current, double target, double timeratio)
     return current;
 }
 
+
+string
+fgUnescape (const char *s)
+{
+    string r;
+    while (*s) {
+        if (*s != '\\') {
+            r += *s++;
+            continue;
+        }
+        if (!*++s)
+            break;
+        if (*s == '\\') {
+            r += '\\';
+        } else if (*s == 'n') {
+            r += '\n';
+        } else if (*s == 'r') {
+            r += '\r';
+        } else if (*s == 't') {
+            r += '\t';
+        } else if (*s == 'v') {
+            r += '\v';
+        } else if (*s == 'f') {
+            r += '\f';
+        } else if (*s == 'a') {
+            r += '\a';
+        } else if (*s == 'b') {
+            r += '\b';
+        } else if (*s == 'x') {
+            if (!*++s)
+                break;
+            int v = 0;
+            for (int i = 0; i < 2 && isxdigit(*s); i++, s++)
+                v = v * 16 + (isdigit(*s) ? *s - '0' : 10 + tolower(*s) - 'a');
+            r += v;
+            continue;
+
+        } else if (*s >= '0' && *s <= '7') {
+            int v = *s++ - '0';
+            for (int i = 0; i < 3 && *s >= '0' && *s <= '7'; i++, s++)
+                v = v * 8 + *s - '0';
+            r += v;
+            continue;
+
+        } else {
+            r += *s;
+        }
+        s++;
+    }
+    return r;
+}
+
+
+// Write out path to validation node and read it back in. A Nasal
+// listener is supposed to replace the path with a validated version
+// or an empty string otherwise.
+const char *fgValidatePath (const char *str, bool write)
+{
+    static SGPropertyNode_ptr r, w;
+    if (!r) {
+        r = fgGetNode("/sim/paths/validate/read", true);
+        r->setAttribute(SGPropertyNode::READ, true);
+        r->setAttribute(SGPropertyNode::WRITE, true);
+
+        w = fgGetNode("/sim/paths/validate/write", true);
+        w->setAttribute(SGPropertyNode::READ, true);
+        w->setAttribute(SGPropertyNode::WRITE, true);
+    }
+    SGPropertyNode *prop = write ? w : r;
+    prop->setStringValue(str);
+    const char *result = prop->getStringValue();
+    return result[0] ? result : 0;
+}
+
 // end of util.cxx