Improve timing statistics

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

diff --git a/src/AIModel/AIGroundVehicle.cxx b/src/AIModel/AIGroundVehicle.cxx
index 1303b60e05a00f05358de345fe22ee24adae6047..08a47489b99302099492b9144064ed6ff8eefa39 100644 (file)
--- a/src/AIModel/AIGroundVehicle.cxx
+++ b/src/AIModel/AIGroundVehicle.cxx
@@ -26,7 +26,6 @@
 
 #include <Main/viewer.hxx>
 #include <Scenery/scenery.hxx>
-#include <Scenery/tilemgr.hxx>
 #include <Airports/dynamics.hxx>
 
 #include "AIGroundVehicle.hxx"
@@ -40,11 +39,11 @@ _speed_kt(0),
 _range_ft(0),
 _relbrg (0),
 _parent_speed(0),
-_dt_count(0),
-_next_run(0),
 _parent_x_offset(0),
 _parent_y_offset(0),
 _parent_z_offset(0),
+_dt_count(0),
+_next_run(0),
 _break_count(0)
 
 {
@@ -232,39 +231,6 @@ void FGAIGroundVehicle::setTowAngle(double ta, double dt, double coeff){
     SG_CLAMP_RANGE(_tow_angle, -limit, limit);
 }
 
-bool FGAIGroundVehicle::getGroundElev(SGGeod inpos) {
-
-    double height_m ;
-
-    if (globals->get_scenery()->get_elevation_m(SGGeod::fromGeodM(inpos, 3000), height_m, &_material,0)){
-            _ht_agl_ft = inpos.getElevationFt() - height_m * SG_METER_TO_FEET;
-
-            if (_material) {
-                const vector<string>& names = _material->get_names();
-
-                _solid = _material->get_solid();
-
-                if (!names.empty())
-                    props->setStringValue("material/name", names[0].c_str());
-                else
-                    props->setStringValue("material/name", "");
-
-                //cout << "material " << names[0].c_str()
-                //    << " _elevation_m " << _elevation_m
-                //    << " solid " << _solid
-                //    << " load " << _load_resistance
-                //    << " frictionFactor " << _frictionFactor
-                //    << endl;
-
-            }
-
-            return true;
-    } else {
-        return false;
-    }
-
-}
-
 bool FGAIGroundVehicle::getPitch() {
 
     if (!_tunnel){
@@ -285,7 +251,7 @@ bool FGAIGroundVehicle::getPitch() {
         double rear_elev_m = 0;
         double elev_front = 0;
         double elev_rear = 0;
-        double max_alt = 10000;
+        //double max_alt = 10000;
 
         if (globals->get_scenery()->get_elevation_m(SGGeod::fromGeodM(geodFront, 3000),
             elev_front, &_material, 0)){
@@ -351,62 +317,9 @@ bool FGAIGroundVehicle::getPitch() {
 
     }
 
-    //getGroundElev(pos);
-
     return true;
 }
 
-//void FGAIGroundVehicle::setParentNode() {
-//
-//    if(_parent == "")
-//        return;
-//
-//    const SGPropertyNode_ptr ai = fgGetNode("/ai/models", true);
-//
-//    for (int i = ai->nChildren() - 1; i >= -1; i--) {
-//        SGPropertyNode_ptr model;
-//
-//        if (i < 0) { // last iteration: selected model
-//            model = _selected_ac;
-//        } else {
-//            model = ai->getChild(i);
-//            string path = ai->getPath();
-//            const string name = model->getStringValue("name");
-//
-//            if (!model->nChildren()){
-//                continue;
-//            }
-//            if (name == _parent) {
-//                _selected_ac = model;  // save selected model for last iteration
-//                break;
-//            }
-//
-//        }
-//        if (!model)
-//            continue;
-//
-//    }// end for loop
-//
-//    if (_selected_ac != 0){
-//        const string name = _selected_ac->getStringValue("name");
-//        //_parent_x_offset = _selected_ac->getDoubleValue("hitch/x-offset-ft");
-//        //_parent_y_offset = _selected_ac->getDoubleValue("hitch/y-offset-ft");
-//        //_parent_z_offset = _selected_ac->getDoubleValue("hitch/z-offset-ft");
-//        //_hitch_x_offset_m = _selected_ac->getDoubleValue("hitch/x-offset-ft")
-//        //    * SG_FEET_TO_METER;
-//        //_hitch_y_offset_m = _selected_ac->getDoubleValue("hitch/y-offset-ft")
-//        //    * SG_FEET_TO_METER;
-//        //_hitch_z_offset_m = _selected_ac->getDoubleValue("hitch/z-offset-ft")
-//        //    * SG_FEET_TO_METER;
-//        //setParent();
-//    } else {
-//        SG_LOG(SG_GENERAL, SG_ALERT, "AIGroundVeh1cle: " << _name
-//                << " parent not found: dying ");
-//        setDie(true);
-//    }
-//
-//}
-
 void FGAIGroundVehicle::setParent(){
 
     double lat = _selected_ac->getDoubleValue("position/latitude-deg");
@@ -444,12 +357,6 @@ void FGAIGroundVehicle::calcRangeBearing(double lat, double lon, double lat2, do
     range = distance * SG_METER_TO_NM;
 }
 
-double FGAIGroundVehicle::calcRelBearingDeg(double bearing, double heading)
-{
-    double angle = bearing - heading;
-    SG_NORMALIZE_RANGE(angle, -180.0, 180.0);
-    return angle;
-}
 
 SGVec3d FGAIGroundVehicle::getCartHitchPosAt(const SGVec3d& _off) const {
     double hdg = _selected_ac->getDoubleValue("orientation/true-heading-deg");
@@ -533,7 +440,7 @@ void FGAIGroundVehicle::AdvanceFP(){
 
 void FGAIGroundVehicle::setTowSpeed(){
 
-    double diff = _range_ft - _x_offset;
+    //double diff = _range_ft - _x_offset;
     double  x = 0;
 
     if (_range_ft > _x_offset * 3) x = 50;
@@ -590,7 +497,7 @@ void FGAIGroundVehicle::RunGroundVehicle(double dt){
 
     string parent_next_name = _selected_ac->getStringValue("waypoint/name-next");
     bool parent_waiting = _selected_ac->getBoolValue("waypoint/waiting");
-    bool parent_restart = _selected_ac->getBoolValue("controls/restart"); 
+    //bool parent_restart = _selected_ac->getBoolValue("controls/restart"); 
 
     if (parent_next_name == "END" && fp->getNextWaypoint()->name != "END" ){
         SG_LOG(SG_GENERAL, SG_DEBUG, "AIGroundVeh1cle: " << _name