Ground network distance tracking code. AIAircraft taxiing at airports

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

diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx
index 31384fa20227d3391468249f2de196b818d61df6..1fe6a7e0ebbb581082cea26c03ecb61ec03dbba9 100644 (file)
--- a/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@ -35,6 +35,7 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/scene/model/location.hxx>
 #include <simgear/scene/model/model.hxx>
+#include <simgear/scene/model/personality.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/props/props.hxx>
 
@@ -50,10 +51,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)
 {
@@ -162,6 +163,8 @@ ssgBranch * FGAIBase::load3DModel(const string& fg_root,
   // some more code here to check whether a model with this name has already been loaded
   // if not load it, otherwise, get the memory pointer and do something like
   // SetModel as in ATC/AIEntity.cxx
+  ssgBranch *personality_branch = new SGPersonalityBranch;
+
   model = manager->getModel(path);
   if (!(model)) {
       model = sgLoad3DModel(fg_root,
@@ -170,8 +173,9 @@ ssgBranch * FGAIBase::load3DModel(const string& fg_root,
                             sim_time_sec);
       manager->setModel(path, model);
   }
+  personality_branch->addKid( model );
 
-  return model;
+  return personality_branch;
 }
 
 bool FGAIBase::isa( object_type otype ) {
@@ -289,8 +293,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 );