diff --git a/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java b/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java index 5c659c9c..4be41d90 100644 --- a/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java +++ b/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java @@ -13,7 +13,8 @@ public enum BoatMeshType { PIRATE_SHIP("pirateship_hull.stl", "pirateship_mast.stl", -0.5415, "pirateship_mainsail.stl", -0.5415, "pirateship_frontsail.stl", true, 1.2, 1.6, 1.2), DUCKY("ducky_hull.stl", "ducky_mast.stl", -2.18539, "ducky_sail.stl", -2.18539, "ducky_eyes.stl", false, 1.2, 1.1, 1.4), - PARROT("parrot_hull.stl", null, 0, "parrot_sail.stl", 0, "parrot_features.stl", true, 1, 1, 1); + PARROT("parrot_hull.stl", null, 0, "parrot_sail.stl", 0, "parrot_features.stl", true, 1, 1, 1), + WAKA("waka_hull.stl", "waka_mast.stl", 0, "waka_sail.stl", 0, null, true, 1.7, 0.5, 1.5); final String hullFile, mastFile, sailFile, jibFile; final double mastOffset, sailOffset; @@ -21,7 +22,7 @@ public enum BoatMeshType { public final double accelerationMultiplier; public final double turnStep; final boolean fixedSail; - final static BoatMeshType[] boatTypes = new BoatMeshType[]{DINGHY, CATAMARAN, PIRATE_SHIP, DUCKY, PARROT}; + final static BoatMeshType[] boatTypes = new BoatMeshType[]{DINGHY, CATAMARAN, PIRATE_SHIP, DUCKY, PARROT, WAKA}; BoatMeshType(String hullFile, String mastFile, double mastOffset, String sailFile, double sailOffset, String jibFile, boolean fixedSail, double maxSpeedMultiplier, double accelerationMultiplier, double turnStep) { diff --git a/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java b/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java index 8ca060c6..11b44398 100644 --- a/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java +++ b/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java @@ -80,30 +80,6 @@ public class ModelFactory { return bo; } - public static BoatModel boatRotatingView(BoatMeshType boatType, Color primaryColour) { - Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour); - boatAssets.getTransforms().addAll( - new Scale(40, 40, 40), - new Rotate(90, new Point3D(0,0,1)), - new Rotate(90, new Point3D(0, 1, 0)) - ); - - final Rotate animationRotate = new Rotate(0, new Point3D(1,1,1)); - boatAssets.getTransforms().add(animationRotate); - - return new BoatModel(boatAssets, new AnimationTimer() { - - private double rotation = 0; - private Rotate rotate = animationRotate; - - @Override - public void handle(long now) { - rotation += 0.5; - rotate.setAngle(rotation); - } - }, boatType); - } - public static BoatModel boatGameView(BoatMeshType boatType, Color primaryColour) { Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour); boatAssets.getTransforms().setAll( diff --git a/src/main/resources/meshes/boatSTLs/waka_hull.stl b/src/main/resources/meshes/boatSTLs/waka_hull.stl new file mode 100644 index 00000000..baccf69e Binary files /dev/null and b/src/main/resources/meshes/boatSTLs/waka_hull.stl differ diff --git a/src/main/resources/meshes/boatSTLs/waka_mast.stl b/src/main/resources/meshes/boatSTLs/waka_mast.stl new file mode 100644 index 00000000..baccf69e Binary files /dev/null and b/src/main/resources/meshes/boatSTLs/waka_mast.stl differ diff --git a/src/main/resources/meshes/boatSTLs/waka_sail.stl b/src/main/resources/meshes/boatSTLs/waka_sail.stl new file mode 100644 index 00000000..baccf69e Binary files /dev/null and b/src/main/resources/meshes/boatSTLs/waka_sail.stl differ