Commit before checking out developement

2017-09-22 21:39:48 +12:00
parent cf9acabd97
commit d3a6b82031
1 changed files with 12 additions and 1 deletions
@@ -323,8 +323,19 @@ public class RaceViewController extends Controller {
            AnimationTimer sailsFollowBoat = new AnimationTimer() {
                @Override
                public void handle(long now) {
+                    double windDir = visualiserRace.getVisualiserRaceState().getWindDirection().degrees();
+                    double windOffset = (360 - windDir + boat.getBearing().degrees()) % 360;
+                    double sailDir =  windOffset / 180 * 270 + windDir + 180;
+                    boolean leftOfWind = windOffset >= 180;
+                    if (leftOfWind){
+                        System.out.println("is left");
+                        sailDir = -sailDir;
+                    } else {
+                        System.out.println("is right");
+                        sailDir = windDir - sailDir;
+                    }
                    if (boat.isSailsOut()) {
-                        sailsSubject.setHeading(visualiserRace.getVisualiserRaceState().getWindDirection().degrees() + 90);
+                        sailsSubject.setHeading(sailDir);
                        if (sails3D.isLuffing()) {
                            sails3D.stopLuffing();
                        }