Moved some of the low level scene graph construction code over to simgear.

[flightgear.git] / src / Environment / environment.cxx

diff --git a/src/Environment/environment.cxx b/src/Environment/environment.cxx
index a8de3c3a9ac5482830938c814613a1a39a513b25..fedccb3bd5ed0daf50e55be6b55ca85d45de9be7 100644 (file)
--- a/src/Environment/environment.cxx
+++ b/src/Environment/environment.cxx
@@ -179,6 +179,8 @@ void
 FGEnvironment::set_temperature_sea_level_degc (double t)
 {
   temperature_sea_level_degc = t;
+  if (dewpoint_sea_level_degc > t)
+      dewpoint_sea_level_degc = t;
   _recalc_alt_temperature();
   _recalc_density();
 }
@@ -195,6 +197,8 @@ void
 FGEnvironment::set_dewpoint_sea_level_degc (double t)
 {
   dewpoint_sea_level_degc = t;
+  if (temperature_sea_level_degc < t)
+      temperature_sea_level_degc = t;
   _recalc_alt_dewpoint();
   _recalc_density();
 }
@@ -285,29 +289,29 @@ FGEnvironment::set_elevation_ft (double e)
 
 // Elevation (ft), temperature factor (degK), pressure factor (inHG)
 static double atmosphere_data[][3] = {
-  0.00, 1.00, 1.000,
-  2952.76, 0.98, 0.898,
-  5905.51, 0.96, 0.804,
-  8858.27, 0.94, 0.719,
-  11811.02, 0.92, 0.641,
-  14763.78, 0.90, 0.570,
-  17716.54, 0.88, 0.506,
-  20669.29, 0.86, 0.447,
-  23622.05, 0.84, 0.394,
-  26574.80, 0.82, 0.347,
-  29527.56, 0.80, 0.304,
-  32480.31, 0.78, 0.266,
-  35433.07, 0.76, 0.231,
-  38385.83, 0.75, 0.201,
-  41338.58, 0.75, 0.174,
-  44291.34, 0.75, 0.151,
-  47244.09, 0.75, 0.131,
-  50196.85, 0.75, 0.114,
-  53149.61, 0.75, 0.099,
-  56102.36, 0.75, 0.086,
-  59055.12, 0.75, 0.075,
-  62007.87, 0.75, 0.065,
-  -1, -1, -1
+ { 0.00, 1.00, 1.000 },
+ { 2952.76, 0.98, 0.898 },
+ { 5905.51, 0.96, 0.804 },
+ { 8858.27, 0.94, 0.719 },
+ { 11811.02, 0.92, 0.641 },
+ { 14763.78, 0.90, 0.570 },
+ { 17716.54, 0.88, 0.506 },
+ { 20669.29, 0.86, 0.447 },
+ { 23622.05, 0.84, 0.394 },
+ { 26574.80, 0.82, 0.347 },
+ { 29527.56, 0.80, 0.304 },
+ { 32480.31, 0.78, 0.266 },
+ { 35433.07, 0.76, 0.231 },
+ { 38385.83, 0.75, 0.201 },
+ { 41338.58, 0.75, 0.174 },
+ { 44291.34, 0.75, 0.151 },
+ { 47244.09, 0.75, 0.131 },
+ { 50196.85, 0.75, 0.114 },
+ { 53149.61, 0.75, 0.099 },
+ { 56102.36, 0.75, 0.086 },
+ { 59055.12, 0.75, 0.075 },
+ { 62007.87, 0.75, 0.065 },
+ { -1, -1, -1 }
 };
 
 void