Make the vertical acceleration rate scale with vertical performance. The

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

diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx
index 0a1401e50e89b1daadc725a06a69de6517ae15c8..ac9d0861afcc140e6a6d78e1c50a055d4b9935d2 100644 (file)
--- a/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@ -30,6 +30,7 @@
 #include <plib/ssg.h>
 
 #include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/scene/model/location.hxx>
@@ -49,10 +50,10 @@ const double FGAIBase::e = 2.71828183;
 const double FGAIBase::lbs_to_slugs = 0.031080950172;   //conversion factor
 
 
-FGAIBase::FGAIBase(object_type ot)
-  : fp( NULL ),
+FGAIBase::FGAIBase(object_type ot) :
     props( NULL ),
     manager( NULL ),
+    fp( NULL ),
     _refID( _newAIModelID() ),
     _otype(ot)
 {
@@ -288,8 +289,8 @@ double FGAIBase::UpdateRadar(FGAIManager* manager)
      double user_altitude  = manager->get_user_altitude();
      double user_heading   = manager->get_user_heading();
      double user_pitch     = manager->get_user_pitch();
-     double user_yaw       = manager->get_user_yaw();
-     double user_speed     = manager->get_user_speed();
+     //double user_yaw       = manager->get_user_yaw();
+     //double user_speed     = manager->get_user_speed();
 
      // calculate range to target in feet and nautical miles
      double range_ft = sqrt( range_ft2 );
@@ -312,6 +313,19 @@ double FGAIBase::UpdateRadar(FGAIManager* manager)
         }
      }
 
+     // This is an alternate way to compute bearing and distance which
+     // agrees with the original scheme within about 0.1 degrees.
+     //
+     // Point3D start( user_longitude * SGD_DEGREES_TO_RADIANS,
+     //                user_latitude * SGD_DEGREES_TO_RADIANS, 0 );
+     // Point3D dest( pos.getLongitudeRad(), pos.getLatitudeRad(), 0 );
+     // double gc_bearing, gc_range;
+     // calc_gc_course_dist( start, dest, &gc_bearing, &gc_range );
+     // gc_range *= SG_METER_TO_NM;
+     // gc_bearing *= SGD_RADIANS_TO_DEGREES;
+     // printf("orig b = %.3f %.2f  gc b= %.3f, %.2f\n",
+     //        bearing, range, gc_bearing, gc_range);
+
      // calculate look left/right to target, without yaw correction
      horiz_offset = bearing - user_heading;
      if (horiz_offset > 180.0) horiz_offset -= 360.0;
@@ -335,7 +349,7 @@ double FGAIBase::UpdateRadar(FGAIManager* manager)
 */
 
      // now correct look left/right for yaw
-     horiz_offset += user_yaw;
+     // horiz_offset += user_yaw; // FIXME: WHY WOULD WE WANT TO ADD IN SIDE-SLIP HERE?
 
      // calculate values for radar display
      y_shift = range * cos( horiz_offset * SG_DEGREES_TO_RADIANS);