From 0558629dc698196e3f3ac7b5aa94515a7ae275ab Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Mon, 14 Aug 2017 10:42:28 +1200
Subject: [PATCH] Added luffing sails image.

- Created transparent gif of luffing sail
- Displayed image when sail is luffing
- Repositioned luffing sail

#story[1098]
---
 .../visualiser/model/ResizableRaceCanvas.java    |  13 +++++--------
 .../src/main/resources/images/sailsLuff.gif      | Bin 0 -> 4352 bytes
 2 files changed, 5 insertions(+), 8 deletions(-)
 create mode 100644 racevisionGame/src/main/resources/images/sailsLuff.gif

diff --git a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
index c7418f12..736294d9 100644
--- a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
+++ b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
@@ -31,8 +31,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
     private Image background;
     private Image sailsRight = new Image("/images/sailsRight.png");
     private Image sailsLeft = new Image("/images/sailsLeft.png");
-    // TODO: change to luffing sail image
-    private Image sailsLuff = new Image("/images/sailsRight.png");
+    private Image sailsLuff = new Image("/images/sailsLuff.gif", 25, 10, false, false);
 
     // annotations
     private boolean annoName = true;
@@ -361,16 +360,14 @@ public class ResizableRaceCanvas extends ResizableCanvas {
             }
             sailRotateAngle += ((boatBearing + windDirection) * 0.5);
         }
+        // Sails in = luffing sail
         else {
-            xPos -= 3;
+            xPos -= 6;
+            yPos += 1;
             sailImage = sailsLuff;
-            sailImage = null; // TODO: remove line when luffing image added
-            sailRotateAngle = boatBearing;
+            sailRotateAngle = boatBearing + 90;
         }
 
-//        System.out.println("boat: " + boatBearing + " || rotate: " +
-//                sailRotateAngle + " || wind angle: " + windDirection);
-
         gc.save();
 
         // rotate sails based on boats current heading
diff --git a/racevisionGame/src/main/resources/images/sailsLuff.gif b/racevisionGame/src/main/resources/images/sailsLuff.gif
new file mode 100644
index 0000000000000000000000000000000000000000..924023ba455ddebd2a8e2dcd91265e96e2a7f73d
GIT binary patch
literal 4352
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

literal 0
HcmV?d00001