X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Futil.cxx;h=2cd15b5b008a7fa9e10d339a7c17f7eafb4acecf;hb=38226af24ec01e8f0a20d7fd73ef838a69f6ef25;hp=f80e3236aa2a412d2e3f6c93efbff561f60a336a;hpb=ca80161dcf233a23c1324c928bc2c31a1a407b94;p=flightgear.git

diff --git a/src/Main/util.cxx b/src/Main/util.cxx
index f80e3236a..2cd15b5b0 100644
--- a/src/Main/util.cxx
+++ b/src/Main/util.cxx
@@ -13,109 +13,42 @@
 //
 // 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 <config.h>
+#endif
+
 #include <simgear/compiler.h>
 
 #include <math.h>
 
+#include <cstdlib>
+
 #include <vector>
-SG_USING_STD(vector);
+using std::vector;
 
 #include <simgear/debug/logstream.hxx>
+#include <simgear/math/SGLimits.hxx>
+#include <simgear/math/SGMisc.hxx>
 
 #include "fg_io.hxx"
 #include "fg_props.hxx"
 #include "globals.hxx"
 #include "util.hxx"
 
-
-void
-fgDefaultWeatherValue (const char * propname, double value)
-{
-    unsigned int i;
-
-    SGPropertyNode * branch = fgGetNode("/environment/config/boundary", true);
-    vector<SGPropertyNode_ptr> entries = branch->getChildren("entry");
-    for (i = 0; i < entries.size(); i++) {
-        entries[i]->setDoubleValue(propname, value);
-    }
-
-    branch = fgGetNode("/environment/config/aloft", true);
-    entries = branch->getChildren("entry");
-    for (i = 0; i < entries.size(); i++) {
-        entries[i]->setDoubleValue(propname, value);
-    }
-}
-
-
-void
-fgSetupWind (double min_hdg, double max_hdg, double speed, double gust)
-{
-                                // Initialize to a reasonable state
-  fgDefaultWeatherValue("wind-from-heading-deg", min_hdg);
-  fgDefaultWeatherValue("wind-speed-kt", speed);
-
-  SG_LOG(SG_GENERAL, SG_INFO, "WIND: " << min_hdg << '@' <<
-         speed << " knots" << endl);
-
-                                // Now, add some variety to the layers
-  min_hdg += 10;
-  if (min_hdg > 360)
-      min_hdg -= 360;
-  speed *= 1.1;
-  fgSetDouble("/environment/config/boundary/entry[1]/wind-from-heading-deg",
-              min_hdg);
-  fgSetDouble("/environment/config/boundary/entry[1]/wind-speed-kt",
-              speed);
-
-  min_hdg += 20;
-  if (min_hdg > 360)
-      min_hdg -= 360;
-  speed *= 1.1;
-  fgSetDouble("/environment/config/aloft/entry[0]/wind-from-heading-deg",
-              min_hdg);
-  fgSetDouble("/environment/config/aloft/entry[0]/wind-speed-kt",
-              speed);
-
-  min_hdg += 10;
-  if (min_hdg > 360)
-      min_hdg -= 360;
-  speed *= 1.1;
-  fgSetDouble("/environment/config/aloft/entry[1]/wind-from-heading-deg",
-              min_hdg);
-  fgSetDouble("/environment/config/aloft/entry[1]/wind-speed-kt",
-              speed);
-
-  min_hdg += 10;
-  if (min_hdg > 360)
-      min_hdg -= 360;
-  speed *= 1.1;
-  fgSetDouble("/environment/config/aloft/entry[2]/wind-from-heading-deg",
-              min_hdg);
-  fgSetDouble("/environment/config/aloft/entry[2]/wind-speed-kt",
-              speed);
-}
-
-
-void
-fgExit (int status)
-{
-    SG_LOG(SG_GENERAL, SG_INFO, "Exiting FlightGear with status " << status);
-
-    exit(status);
-}
-
+#ifdef OSG_LIBRARY_STATIC
+#include "osgDB/Registry"
+#endif
 
 // Originally written by Alex Perry.
 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 {
@@ -137,5 +70,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