From 321dcde72f7e6c2ac5afd6305e237f16cf8179b5 Mon Sep 17 00:00:00 2001 From: Jessica Syder Date: Thu, 10 Aug 2017 12:49:00 +1200 Subject: [PATCH] Implemented luffing sail without image (yet). - Added sailsLuff image property - Displayed luffing sail in correct position and angle #story[1098] --- .../main/java/visualiser/model/ResizableRaceCanvas.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java index 7e682abd..c7418f12 100644 --- a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java +++ b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java @@ -31,6 +31,8 @@ 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"); // annotations private boolean annoName = true; @@ -357,12 +359,15 @@ public class ResizableRaceCanvas extends ResizableCanvas { sailImage = sailsLeft; xPos -= 5; // left align sail to boat edge on canvas } + sailRotateAngle += ((boatBearing + windDirection) * 0.5); } else { - // TODO: display luffing sail + xPos -= 3; + sailImage = sailsLuff; + sailImage = null; // TODO: remove line when luffing image added + sailRotateAngle = boatBearing; } - sailRotateAngle += ((boatBearing + windDirection) * 0.5); // System.out.println("boat: " + boatBearing + " || rotate: " + // sailRotateAngle + " || wind angle: " + windDirection);