Merge branch 'master' into storyD-3D

# Conflicts:
#	.gitignore
#	racevisionGame/src/main/java/mock/model/RaceServer.java
#	racevisionGame/src/main/java/mock/model/collider/Collider.java
#	racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
#	racevisionGame/src/main/java/shared/model/Boat.java
#	racevisionGame/src/main/java/shared/model/Mark.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/java/visualiser/layout/Plane3D.java
#	racevisionGame/src/main/java/visualiser/layout/SeaSurface.java
#	racevisionGame/src/main/java/visualiser/layout/View3D.java
#	racevisionGame/src/main/java/visualiser/utils/PerlinNoiseGenerator.java
#	racevisionGame/src/main/resources/visualiser/scenes/title.fxml

racevisionGame/src/main/java/visualiser/layout/Plane3D.java

@@ -8,6 +8,9 @@ import javafx.scene.shape.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import javafx.scene.shape.TriangleMesh;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**

racevisionGame/src/main/java/visualiser/layout/SeaSurface.java

@@ -18,20 +18,22 @@ import visualiser.utils.PerlinNoiseGenerator;
  */
 public class SeaSurface extends Subject3D {
     private static Image image;
+
     /**
      * Sea Surface Constructor
+     *
      * @param size size of the sea surface (has to be square for simplicity's sake)
      * @param freq frequency the perlin noise is to be generated at
      */
-    public SeaSurface(int size, double freq){
-        super(createSurface(size, freq),0);
+    public SeaSurface(int size, double freq) {
+        super(createSurface(size, freq), 0);
         image = new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/ThickCloudsWaterDown2048.png"));
     }
 
     /**
      * Creates the sea surface
      */
-    private static Shape3D createSurface(int size, double freq){
+    private static Shape3D createSurface(int size, double freq) {
         float[][] noiseArray = PerlinNoiseGenerator.createNoise(size, freq);
         Image diffuseMap = createImage(noiseArray.length, noiseArray); //image
 
@@ -51,7 +53,8 @@ public class SeaSurface extends Subject3D {
 
     /**
      * Create texture for uv mapping
-     * @param size size of the image to make
+     *
+     * @param size  size of the image to make
      * @param noise array of noise
      * @return image that is created
      */
@@ -90,9 +93,10 @@ public class SeaSurface extends Subject3D {
 
     /**
      * Nomalises the values so that the colours are correct
-     * @param value value to normalise
-     * @param min current min
-     * @param max current max
+     *
+     * @param value  value to normalise
+     * @param min    current min
+     * @param max    current max
      * @param newMin new min
      * @param newMax new max
      * @return returns normalised value
@@ -105,9 +109,10 @@ public class SeaSurface extends Subject3D {
 
     /**
      * clamps a value between a min and max
+     *
      * @param value value to clamp
-     * @param min minimum value it can be
-     * @param max maximum value it can be
+     * @param min   minimum value it can be
+     * @param max   maximum value it can be
      * @return result after clamp
      */
     private static double clamp(double value, double min, double max) {
@@ -123,8 +128,10 @@ public class SeaSurface extends Subject3D {
 
     /**
      * Prevent rescaling of sea surface
+     *
      * @param scale ignored
      */
     @Override
-    public void setScale(double scale) {}
+    public void setScale(double scale) {
+    }
 }

racevisionGame/src/main/java/visualiser/layout/View3D.java

@@ -316,4 +316,4 @@ public class View3D extends Pane {
     public void addPointLight(PointLight pointLight) {
         this.world.getChildren().add(pointLight);
     }
-}
+}