fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented luffing sail without image (yet).

Browse Source 
- Added sailsLuff image property
- Displayed luffing sail in correct position and angle

#story[1098]
This commit is contained in:
Jessica Syder
2017-08-10 12:49:00 +12:00
parent 1a7152f54e
commit 321dcde72f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
+7 -2
View File
@@ -31,6 +31,8 @@ public class ResizableRaceCanvas extends ResizableCanvas {
private Image background; private Image background;
private Image sailsRight = new Image("/images/sailsRight.png"); private Image sailsRight = new Image("/images/sailsRight.png");
private Image sailsLeft = new Image("/images/sailsLeft.png"); private Image sailsLeft = new Image("/images/sailsLeft.png");
// TODO: change to luffing sail image
private Image sailsLuff = new Image("/images/sailsRight.png");
// annotations // annotations
private boolean annoName = true; private boolean annoName = true;
@@ -357,12 +359,15 @@ public class ResizableRaceCanvas extends ResizableCanvas {
sailImage = sailsLeft; sailImage = sailsLeft;
xPos -= 5; // left align sail to boat edge on canvas xPos -= 5; // left align sail to boat edge on canvas
} }
sailRotateAngle += ((boatBearing + windDirection) * 0.5);
} }
else { 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: " + // System.out.println("boat: " + boatBearing + " || rotate: " +
// sailRotateAngle + " || wind angle: " + windDirection); // sailRotateAngle + " || wind angle: " + windDirection);