Moved random ground cover object management code (userdata.[ch]xx) over

[flightgear.git] / src / Instrumentation / altimeter.cxx

diff --git a/src/Instrumentation/altimeter.cxx b/src/Instrumentation/altimeter.cxx
index 08cfcb36e1fb623b36711bb0c35051aac9732ff3..2a9578705ce73b54cc8a7aad7668278972e320fc 100644 (file)
--- a/src/Instrumentation/altimeter.cxx
+++ b/src/Instrumentation/altimeter.cxx
@@ -10,34 +10,38 @@
 #include <Main/util.hxx>
 
 
+// A higher number means more responsive
+#define RESPONSIVENESS 10.0
+
+
 // Altitude based on pressure difference from sea level.
 // pressure difference inHG, altitude ft
 static double altitude_data[][2] = {
-    -8.41, -8858.27,
-    0.00, 0.00,
-    3.05, 2952.76,
-    5.86, 5905.51,
-    8.41, 8858.27,
-    10.74, 11811.02,
-    12.87, 14763.78,
-    14.78, 17716.54,
-    16.55, 20669.29,
-    18.13, 23622.05,
-    19.62, 26574.80,
-    20.82, 29527.56,
-    21.96, 32480.31,
-    23.01, 35433.07,
-    23.91, 38385.83,
-    24.71, 41338.58,
-    25.40, 44291.34,
-    26.00, 47244.09,
-    26.51, 50196.85,
-    26.96, 53149.61,
-    27.35, 56102.36,
-    27.68, 59055.12,
-    27.98, 62007.87,
-    29.62, 100000.00            // just to fill it in
-    -1, -1,
+ { -8.41, -8858.27 },
+ { 0.00, 0.00 },
+ { 3.05, 2952.76 },
+ { 5.86, 5905.51 },
+ { 8.41, 8858.27 },
+ { 10.74, 11811.02 },
+ { 12.87, 14763.78 },
+ { 14.78, 17716.54 },
+ { 16.55, 20669.29 },
+ { 18.13, 23622.05 },
+ { 19.62, 26574.80 },
+ { 20.82, 29527.56 },
+ { 21.96, 32480.31 },
+ { 23.01, 35433.07 },
+ { 23.91, 38385.83 },
+ { 24.71, 41338.58 },
+ { 25.40, 44291.34 },
+ { 26.00, 47244.09 },
+ { 26.51, 50196.85 },
+ { 26.96, 53149.61 },
+ { 27.35, 56102.36 },
+ { 27.68, 59055.12 },
+ { 27.98, 62007.87 },
+ { 29.62, 100000.00 },            // just to fill it in
+ { -1, -1 }
 };
 
 
@@ -67,27 +71,20 @@ Altimeter::init ()
         fgGetNode("/instrumentation/altimeter/indicated-altitude-ft", true);
 }
 
-void
-Altimeter::bind ()
-{
-}
-
-void
-Altimeter::unbind ()
-{
-}
-
 void
 Altimeter::update (double dt)
 {
     if (_serviceable_node->getBoolValue()) {
         double pressure = _pressure_node->getDoubleValue();
         double setting = _setting_node->getDoubleValue();
-        double altitude =
-            fgGetLowPass(_altitude_node->getDoubleValue(),
-                         _altitude_table->interpolate(setting - pressure),
-                         dt * 10);
-        _altitude_node->setDoubleValue(altitude);
+
+                                // Move towards the current setting
+        double last_altitude = _altitude_node->getDoubleValue();
+        double current_altitude =
+            _altitude_table->interpolate(setting - pressure);
+        _altitude_node->setDoubleValue(fgGetLowPass(last_altitude,
+                                                    current_altitude,
+                                                    dt * RESPONSIVENESS));
     }
 }