michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sailsin graphics moving and working as expected.

Browse Source 
#story[1111] #pair[kre39,ptg19]
This commit is contained in:
Kusal Ekanayake
2017-08-07 16:48:30 +12:00
parent c7857872ce
commit f97b18d594
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/fxObjects/BoatObject.java
+36 -8
View File
@@ -130,9 +130,9 @@ public class BoatObject extends Group {
boatPoly.setLayoutX(x); boatPoly.setLayoutX(x);
boatPoly.setLayoutY(y); boatPoly.setLayoutY(y);
if (sailIn) { if (sailIn) {
sail.getPoints().clear(); // sail.getPoints().clear();
// sail.getPoints().addAll(0.0, 0.0, 4.0, 1.5, 8.0, 3.0, 12.0, 3.5, 16.0, 3.0, 20.0, 1.5, 24.0, 0.0); // sail.getPoints().addAll(0.0, 0.0, 4.0, 1.5, 8.0, 3.0, 12.0, 3.5, 16.0, 3.0, 20.0, 1.5, 24.0, 0.0);
sail.getPoints().addAll(0.0, 0.0, 24.0, 0.0); // sail.getPoints().addAll(0.0, 0.0, 24.0, 0.0);
sail.setLayoutX(x); sail.setLayoutX(x);
sail.setLayoutY(y); sail.setLayoutY(y);
} else { } else {
@@ -164,13 +164,41 @@ public class BoatObject extends Group {
} }
} }
private void rotateTo(double rotation, boolean sailsIn, double windDir) { private Double normalizeHeading(double heading, double windDirection) {
boatPoly.getTransforms().setAll(new Rotate(rotation)); Double normalizedHeading = heading - windDirection;
normalizedHeading = (double) Math.floorMod(normalizedHeading.longValue(), 360L);
return normalizedHeading;
}
private void rotateTo(double heading, boolean sailsIn, double windDir) {
boatPoly.getTransforms().setAll(new Rotate(heading));
if (sailsIn) { if (sailsIn) {
sail.getTransforms().setAll(new Rotate(windDir + 90)); Double sailWindOffset = 30.0;
Double upwindAngleLimit = 15.0;
Double downwindAngleLimit = 10.0; //Upwind from normalised horizontal
Double normalizedHeading = normalizeHeading(heading, windDir);
if (normalizedHeading < 180) {
sail.getTransforms().setAll(new Rotate(windDir + 90 + sailWindOffset));
sail.getPoints().clear();
sail.getPoints().addAll(0.0, 0.0, 4.0, -1.5, 8.0, -3.0, 12.0, -3.5, 16.0, -3.0, 20.0, -1.5, 24.0, 0.0);
if (normalizedHeading > 90 + sailWindOffset){
sail.getTransforms().setAll(new Rotate(heading + downwindAngleLimit));
}
if (normalizedHeading < sailWindOffset + upwindAngleLimit){
sail.getTransforms().setAll(new Rotate(heading + 90 - upwindAngleLimit));
}
} else {
sail.getTransforms().setAll(new Rotate(windDir + 90 - sailWindOffset));
sail.getPoints().clear();
sail.getPoints().addAll(0.0, 0.0, 4.0, 1.5, 8.0, 3.0, 12.0, 3.5, 16.0, 3.0, 20.0, 1.5, 24.0, 0.0);
if (normalizedHeading < 270 - sailWindOffset){
sail.getTransforms().setAll(new Rotate(heading + 180 - downwindAngleLimit));
}
if (normalizedHeading > 360 - (sailWindOffset + upwindAngleLimit)){
sail.getTransforms().setAll(new Rotate(heading + 90 + upwindAngleLimit));
}
}
} else { } else {
sail.getTransforms().setAll(new Rotate(windDir)); sail.getTransforms().setAll(new Rotate(windDir));
} }
src/test/java/seng302/visualiser/map/BoatSailAnimationToggleTest.java
-2
View File
@@ -25,10 +25,8 @@ public class BoatSailAnimationToggleTest {
@Test @Test
public void sailToggleTest() throws Exception { public void sailToggleTest() throws Exception {
assertFalse(yacht.getClientSailsIn());
assertFalse(yacht.getSailIn()); assertFalse(yacht.getSailIn());
yacht.toggleClientSail(); yacht.toggleClientSail();
assertTrue(yacht.getClientSailsIn());
assertFalse(yacht.getSailIn()); assertFalse(yacht.getSailIn());
} }