Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D

# Conflicts:
#	racevisionGame/src/main/java/visualiser/layout/SkyBox.java

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

@@ -34,12 +34,12 @@ public class SkyBox {
     }
 
     private void makeSkyBox() {
-        //addTop();
+        addTop();
         addFront();
-        //addBack();
+        addBack();
-        //addLeft();
+        addLeft();
-        //addRight();
+        addRight();
-        //addSeaOverlay();
+        addSeaOverlay();
     }
 
     private void addTop() {
@@ -49,15 +49,15 @@ public class SkyBox {
         surface.setRotate(180);
 
         surface.setTranslateX(x);
-        surface.setTranslateY(y - size + 0.01);
+        surface.setTranslateY(y - size + 1);
         surface.setTranslateZ(z);
 
         Subject3D top = new Subject3D(surface);
         skyBoxPlanes.add(top);
     }
 
-    private void addLeft() {
+    private void addRight() {
-        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/skyLeft.png")));
+        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/skyRight.png")));
 
         surface.setTranslateX(size/2);
         surface.setTranslateY(size/2);
@@ -68,15 +68,15 @@ public class SkyBox {
 
         surface.setTranslateX(x);
         surface.setTranslateY(y - size/2);
-        surface.setTranslateZ(z + size/2);
+        surface.setTranslateZ(z + size/2 - 1);
 
 
-        Subject3D left = new Subject3D(surface);
+        Subject3D right = new Subject3D(surface);
-        skyBoxPlanes.add(left);
+        skyBoxPlanes.add(right);
     }
 
-    private void addRight() {
+    private void addLeft() {
-        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/skyRight.png")));
+        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/skyLeft.png")));
 
         surface.setTranslateX(size/2);
         surface.setTranslateY(size/2);
@@ -90,11 +90,11 @@ public class SkyBox {
 
         surface.setTranslateX(x);
         surface.setTranslateY(y - size/2);
-        surface.setTranslateZ(z - size/2);
+        surface.setTranslateZ(z - size/2 + 1);
 
 
-        Subject3D right = new Subject3D(surface);
+        Subject3D left = new Subject3D(surface);
-        skyBoxPlanes.add(right);
+        skyBoxPlanes.add(left);
     }
 
     private void addBack() {
@@ -107,7 +107,7 @@ public class SkyBox {
         surface.setScaleY(-1);
         surface.setScaleZ(-1);
 
-        surface.setTranslateX(x - size/2);
+        surface.setTranslateX(x - size/2 + 1);
         surface.setTranslateY(y - size/2);
         surface.setTranslateZ(z);
 
@@ -118,15 +118,14 @@ public class SkyBox {
     private void addFront() {
         MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/skyFront.png")));
 
-        surface.getTransforms().add(new Rotate(90, 0, 0));
+        surface.setTranslateX(size/2);
+        surface.setTranslateY(size/2);
+        surface.setRotationAxis(new Point3D(0, 0, 1));
+        surface.setRotate(-90);
+        surface.setTranslateX(-size/2);
+        surface.setTranslateY(-size/2);
 
-        surface.setRotationAxis(new Point3D(1, 0, 0));
+        surface.setTranslateX(x + size/2 - 1);
-        surface.setRotate(90);
-
-        surface.setScaleY(-1);
-        surface.setScaleZ(-1);
-
-        surface.setTranslateX(x + size/2);
         surface.setTranslateY(y - size/2);
         surface.setTranslateZ(z);
 
@@ -149,7 +148,7 @@ public class SkyBox {
     }
 
     private void addSeaOverlay() {
-        SeaSurface seaSurface = new SeaSurface(size * 3, 200);
+        SeaSurface seaSurface = new SeaSurface(size * 3, freq);
         seaSurface.setX(x);
         seaSurface.setY(y - size/4 + 1);
         seaSurface.setZ(z);