Support a --no-default-config option.

[flightgear.git] / src / Main / fg_commands.cxx

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 21711098b75ddfc52503f90e9ba68af5ecf0ea63..5611cbf10c471f0e548348da1bee9d280f5b19d5 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -49,6 +49,7 @@
 #include "logger.hxx"
 #include "util.hxx"
 #include "main.hxx"
+#include "positioninit.hxx"
 
 #include <boost/scoped_array.hpp>
 
@@ -923,14 +924,18 @@ do_property_randomize (const SGPropertyNode * arg)
 /**
  * Built-in command: interpolate a property value over time
  *
- * property: the name of the property value to interpolate.
- * value[0..n] any number of constant values to interpolate
- * time[0..n]  time between each value, number of time elements must
- *          match those of value elements
+ * property:        the name of the property value to interpolate.
+ * value[0..n]      any number of constant values to interpolate
+ * time/rate[0..n]  time between each value, number of time elements must
+ *                  match those of value elements. Instead of time also rate can
+ *                  be used which automatically calculates the time to change
+ *                  the property value at the given speed.
  * -or-
- * property[1..n] any number of target values taken from named properties
- * time[0..n]     time between each value, number of time elements must
- *                match those of property elements minus one
+ * property[1..n]   any number of target values taken from named properties
+ * time/rate[0..n]  time between each value, number of time elements must
+ *                  match those of value elements. Instead of time also rate can
+ *                  be used which automatically calculates the time to change
+ *                  the property value at the given speed.
  */
 static bool
 do_property_interpolate (const SGPropertyNode * arg)
@@ -939,13 +944,22 @@ do_property_interpolate (const SGPropertyNode * arg)
 
     simgear::PropertyList valueNodes = arg->getChildren( "value" );
     simgear::PropertyList timeNodes = arg->getChildren( "time" );
+    simgear::PropertyList rateNodes = arg->getChildren( "rate" );
+
+    if( !timeNodes.empty() && !rateNodes.empty() )
+      // mustn't specify time and rate
+      return false;
+
+    simgear::PropertyList::size_type num_times = timeNodes.empty()
+                                               ? rateNodes.size()
+                                               : timeNodes.size();
 
     boost::scoped_array<double> value;
     boost::scoped_array<double> time;
 
     if( valueNodes.size() > 0 ) {
         // must match
-        if( timeNodes.size() != valueNodes.size() )
+        if( num_times != valueNodes.size() )
             return false;
 
         value.reset( new double[valueNodes.size()] );
@@ -955,7 +969,7 @@ do_property_interpolate (const SGPropertyNode * arg)
     } else {
         valueNodes = arg->getChildren("property");
         // must have one more property node
-        if( valueNodes.size() - 1 != timeNodes.size() )
+        if( valueNodes.size() - 1 != num_times )
           return false;
 
         value.reset( new double[valueNodes.size()-1] );
@@ -965,14 +979,22 @@ do_property_interpolate (const SGPropertyNode * arg)
 
     }
 
-    time.reset( new double[timeNodes.size()] );
-    for( simgear::PropertyList::size_type n = 0; n < timeNodes.size(); n++ ) {
-        time[n] = timeNodes[n]->getDoubleValue();
+    time.reset( new double[num_times] );
+    if( !timeNodes.empty() ) {
+        for( simgear::PropertyList::size_type n = 0; n < num_times; n++ ) {
+            time[n] = timeNodes[n]->getDoubleValue();
+        }
+    } else {
+        for( simgear::PropertyList::size_type n = 0; n < num_times; n++ ) {
+            double delta = value[n]
+                         - (n > 0 ? value[n - 1] : prop->getDoubleValue());
+            time[n] = fabs(delta / rateNodes[n]->getDoubleValue());
+        }
     }
 
     ((SGInterpolator*)globals->get_subsystem_mgr()
       ->get_group(SGSubsystemMgr::INIT)->get_subsystem("interpolator"))
-      ->interpolate(prop, timeNodes.size(), value.get(), time.get() );
+      ->interpolate(prop, num_times, value.get(), time.get() );
 
     return true;
 }
@@ -1000,7 +1022,10 @@ static bool
 do_dialog_new (const SGPropertyNode * arg)
 {
     NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
-
+    if (!gui) {
+      return false;
+    }
+  
     // Note the casting away of const: this is *real*.  Doing a
     // "dialog-apply" command later on will mutate this property node.
     // I'm not convinced that this isn't the Right Thing though; it
@@ -1207,7 +1232,7 @@ do_presets_commit (const SGPropertyNode * arg)
       // Nasal can trigger this during initial init, which confuses
       // the logic in ReInitSubsystems, since initial state has not been
       // saved at that time. Short-circuit everything here.
-      fgInitPosition();
+      flightgear::initPosition();
     }
     
     return true;