Merge pull request zlsa#289 from tedrek/t-wind-blows-aircraft

Include wind in aircraft movement

Author: zlsa

assets/scripts/aircraft.js

@@ -81,6 +81,7 @@ var Aircraft=Fiber.extend(function() {
       this.heading     = 0;
       this.altitude    = 0;
       this.speed       = 0;
+      this.groundSpeed = 0;
       this.ds          = 0;
 
       this.radial      = 0;
@@ -1317,9 +1318,28 @@ var Aircraft=Fiber.extend(function() {
       if (prop.game.option.get('simplifySpeeds') == 'no') {
         // Calculate the true air speed as indicated airspeed * 1.6% per 1000'
         scaleSpeed *= 1 + (this.altitude * 0.000016);
+
+        // Calculate movement including wind assuming wind speed
+        // increases 2% per 1000'
+        var wind = airport_get().wind;
+        var vector;
+        if (this.isLanded()) {
+          vector = vscale([sin(angle), cos(angle)], scaleSpeed);
+        }
+        else {
+          vector = vsum(vscale([sin(wind.angle + Math.PI), cos(wind.angle + Math.PI)],
+                               wind.speed * 0.000514444 * game_delta()),
+                        vscale([sin(angle), cos(angle)], scaleSpeed));
+        }
+        this.ds = vlen(vector);
+        this.groundSpeed = this.ds / 0.000514444 / game_delta();
+        this.position = vsum(this.position, vector);
+      }
+      else {
+        this.ds = scaleSpeed;
+        this.groundSpeed = this.speed;
+        this.position = vsum(this.position, vscale([sin(angle), cos(angle)], scaleSpeed));
       }
-      this.ds = scaleSpeed;
-      this.position = vsum(this.position, vscale([sin(angle), cos(angle)], scaleSpeed));
 
       this.distance = vlen(this.position);
       this.radial = vradial(this.position);

assets/scripts/canvas.js

@@ -764,11 +764,9 @@ function canvas_draw_info(cc, aircraft) {
     cc.fillText(lpad(round(aircraft.altitude * 0.01), 2), -separation, line_height);
 
     cc.textAlign = "left";
-    var speed = aircraft.speed;
-    if (prop.game.option.get('simplifySpeeds') == 'no') {
-        speed *= 1 + (aircraft.altitude * 0.000016);
-    }
-    cc.fillText(lpad(round(speed * 0.1), 2), separation, line_height);
+    cc.fillText(lpad(round(aircraft.groundSpeed * 0.1), 2),
+                separation,
+                line_height);
 
     cc.textAlign = "center";
     cc.fillText(aircraft.getCallsign(), 0, -line_height);