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

diff --git a/src/Main/util.cxx b/src/Main/util.cxx
index e790e27e7..2cd15b5b0 100644
--- a/src/Main/util.cxx
+++ b/src/Main/util.cxx
@@ -17,7 +17,10 @@
 //
 // $Id$
 
-
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
 
 #include <math.h>
@@ -25,9 +28,11 @@
 #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"
@@ -38,86 +43,6 @@ SG_USING_STD(vector);
 #include "osgDB/Registry"
 #endif
 
-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)
-{
-#ifdef OSG_LIBRARY_STATIC
-    osgDB::Registry::instance( true);
-#endif
-
-    SG_LOG(SG_GENERAL, SG_INFO, "Exiting FlightGear with status " << status);
-    std::exit(status);
-}
-
-
 // Originally written by Alex Perry.
 double
 fgGetLowPass (double current, double target, double timeratio)
@@ -198,6 +123,9 @@ fgUnescape (const char *s)
 }
 
 
+// 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;