Roy Vegard Ovesen:

[flightgear.git] / src / ATC / AIPlane.cxx

diff --git a/src/ATC/AIPlane.cxx b/src/ATC/AIPlane.cxx
index 23ebeda2ebbe265feb9e49a8e5909cd0f687eb4c..1faef86787e4a2d76c099aeacfa0b9e349a5b026 100644 (file)
--- a/src/ATC/AIPlane.cxx
+++ b/src/ATC/AIPlane.cxx
@@ -44,6 +44,11 @@ FGAIPlane::FGAIPlane() {
        playing = false;
        voiceOK = false;
        vPtr = NULL;
+       track = 0.0;
+       _tgtTrack = 0.0;
+       _trackSet = false;
+       _tgtRoll = 0.0;
+       _rollSuspended = false;
 }
 
 FGAIPlane::~FGAIPlane() {
@@ -87,7 +92,12 @@ void FGAIPlane::Update(double dt) {
                _max_count = 5.0;               // FIXME - hardwired length of message - need to calculate it!
                
                //cout << "Transmission = " << pending_transmission << '\n';
-               if(freq == user_freq0 || freq == user_freq1) {
+
+               // The radios dialog seems to set slightly imprecise freqs, eg 118.099998
+               // The eplison stuff below is a work-around
+               double eps0 = fabs(freq - user_freq0);
+               double eps1 = fabs(freq - user_freq1);
+               if(eps0 < 0.002 || eps1 < 0.002) {
                        //cout << "Transmitting..." << endl;
                        // we are on the same frequency, so check distance to the user plane
                        if(1) {
@@ -113,20 +123,28 @@ void FGAIPlane::Update(double dt) {
                }
                _counter += dt;
        }
-}
-
-void FGAIPlane::Bank(double angle) {
-       // This *should* bank us smoothly to any angle
-       if(fabs(_roll - angle) > 0.6) {
-               _roll -= ((_roll - angle)/fabs(_roll - angle));  
+       
+       // Fly the plane if necessary
+       if(_trackSet) {
+               while((_tgtTrack - track) > 180.0) track += 360.0;
+               while((track - _tgtTrack) > 180.0) track -= 360.0;
+               double turn_time = 60.0;
+               track += (360.0 / turn_time) * dt * (_tgtTrack > track ? 1.0 : -1.0);
+               // TODO - bank a bit less for small turns.
+               Bank(25.0 * (_tgtTrack > track ? 1.0 : -1.0));
+               if(fabs(track - _tgtTrack) < 2.0) {             // TODO - might need to optimise the delta there - it's on the large (safe) side atm.
+                       track = _tgtTrack;
+                       LevelWings();
+               }
        }
-}
-
-// Duplication of Bank(0.0) really - should I cut this?
-void FGAIPlane::LevelWings(void) {
-       // bring the plane back to level smoothly (this should work to come out of either bank)
-       if(fabs(_roll) > 0.6) {
-               _roll -= (_roll/fabs(_roll));
+       
+       if(!_rollSuspended) {
+               if(fabs(_roll - _tgtRoll) > 0.6) {
+                       // This *should* bank us smoothly to any angle
+                       _roll -= ((_roll - _tgtRoll)/fabs(_roll - _tgtRoll));
+               } else {
+                       _roll = _tgtRoll;
+               }
        }
 }