Mathias Fröhölöiööhlich:

[flightgear.git] / src / AIModel / AIThermal.cxx

diff --git a/src/AIModel/AIThermal.cxx b/src/AIModel/AIThermal.cxx
index 7ceafcee9f99b4048f4dae0ba45580e4c58680b7..c3d2def1c32375ba74eda9039913e95d158dae02 100644 (file)
--- a/src/AIModel/AIThermal.cxx
+++ b/src/AIModel/AIThermal.cxx
@@ -34,11 +34,8 @@ SG_USING_STD(string);
 #include "AIThermal.hxx"
 
 
-FGAIThermal *FGAIThermal::_self = NULL;
-
 FGAIThermal::FGAIThermal(FGAIManager* mgr) {
    manager = mgr;   
-   _self = this;
    _type_str = "thermal";
    _otype = otThermal;
    max_strength = 6.0;
@@ -48,7 +45,6 @@ FGAIThermal::FGAIThermal(FGAIManager* mgr) {
 
 
 FGAIThermal::~FGAIThermal() {
-    _self = NULL;
 }
 
 
@@ -67,9 +63,9 @@ void FGAIThermal::unbind() {
 
 
 void FGAIThermal::update(double dt) {
+   FGAIBase::update(dt);
    Run(dt);
    Transform();
-   FGAIBase::update(dt);
 }
 
 
@@ -77,15 +73,6 @@ void FGAIThermal::Run(double dt) {
 
    FGAIThermal::dt = dt;
        
-   double ft_per_deg_lon;
-   double ft_per_deg_lat;
-
-   // get size of a degree at this latitude
-   ft_per_deg_lat = 366468.96 - 3717.12 * cos(pos.lat()/SG_RADIANS_TO_DEGREES);
-   ft_per_deg_lon = 365228.16 * cos(pos.lat() / SG_RADIANS_TO_DEGREES);
-
-   double altitude_ft = altitude * SG_METER_TO_FEET;
-
    //###########################//
    // do calculations for range //
    //###########################//
@@ -98,7 +85,7 @@ void FGAIThermal::Run(double dt) {
    // calculate range to target in feet and nautical miles
    double lat_range = fabs(pos.lat() - user_latitude) * ft_per_deg_lat;
    double lon_range = fabs(pos.lon() - user_longitude) * ft_per_deg_lon;
-   double range_ft = sqrt( lat_range*lat_range + lon_range*lon_range );
+   double range_ft = sqrt(lat_range*lat_range + lon_range*lon_range);
    range = range_ft / 6076.11549;
 
    // Calculate speed of rising air if within range. 
@@ -109,5 +96,16 @@ void FGAIThermal::Run(double dt) {
    } else {
      strength = 0.0;
    }
+
+   // Stop lift at the top of the thermal (smoothly)
+   if (user_altitude > (height + 100.0)) {
+     strength = 0.0;
+   }
+   else if (user_altitude < height) {
+     // do nothing
+   }
+   else {
+     strength -= (strength * (user_altitude - height) * 0.01);
+   }
 }