Fixed cat ate a meringue sail rotation.

#fix #story[1274]

src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java

@@ -7,8 +7,8 @@ package seng302.visualiser.fxObjects.assets_3D;
  */
 public enum BoatMeshType {
 
-    DINGHY ("dinghy_hull.stl", "dinghy_mast.stl", -1.36653, "dinghy_sail.stl", -1.36653),
+    DINGHY ("dinghy_hull.stl", "dinghy_mast.stl", 1.36653, "dinghy_sail.stl", 1.36653),
-    CATAMARAN ("catamaran_hull.stl", "catamaran_mast.stl", -1.36845, "catamaran_sail.stl", -1.36845);
+    CATAMARAN ("catamaran_hull.stl", "catamaran_mast.stl", 0.997, "catamaran_sail.stl", 0.997);
 
     final String hullFile, mastFile, sailFile;
     final double mastOffset, sailOffset;

src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatModel.java

@@ -37,10 +37,10 @@ public class BoatModel extends Model {
         MeshView mast = getMeshViewChild(MAST_INDEX);
         MeshView sail = getMeshViewChild(SAIL_INDEX);
         mast.getTransforms().setAll(
-                new Rotate(degrees, -meshType.mastOffset, 0,0, new Point3D(0, 0, 1))
+                new Rotate(degrees, 0, -meshType.mastOffset, 0, new Point3D(0, 0, 1))
         );
         sail.getTransforms().setAll(
-                new Rotate(degrees, -meshType.sailOffset, 0,0, new Point3D(0, 0, 1))
+                new Rotate(degrees, 0, -meshType.sailOffset,0, new Point3D(0, 0, 1))
         );
     }
 

src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatObject.java

@@ -28,7 +28,7 @@ public class BoatObject extends Group {
     private Group wake;
     private Color colour = Color.BLACK;
     private Boolean isSelected = false;
-    private Rotate rotation = new Rotate(0,0,1);
+    private Rotate rotation = new Rotate(0, new Point3D(0,0,1));
 
     private List<SelectedBoatListener> selectedBoatListenerListeners = new ArrayList<>();
 
@@ -66,8 +66,6 @@ public class BoatObject extends Group {
      * @param windDir .
      */
     public void moveTo(double x, double y, double rotation, double velocity, Boolean sailIn, double windDir) {
-        Double dx = Math.abs(boatAssets.getAssets().getLayoutX() - x);
-        Double dy = Math.abs(boatAssets.getAssets().getLayoutY() - y);
         Platform.runLater(() -> {
             rotateTo(rotation, sailIn, windDir);
             this.layoutXProperty().setValue(x);