Committed merge-related bug fixes

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

@@ -62,12 +62,12 @@ public class Boundary3D {
         double c = Math.sqrt(a * a + b * b);
 
 
-        Subject3D bound1 = new Subject3D(new Sphere(thickness * 2));
+        Subject3D bound1 = new Subject3D(new Sphere(thickness * 2),0);
         bound1.setX(graphCoord1.getX());
         bound1.setZ(graphCoord1.getY());
         boundaryNodes.add(bound1);
 
-        Subject3D connector = new Subject3D(new Box(c, thickness, thickness));
+        Subject3D connector = new Subject3D(new Box(c, thickness, thickness),0);
         connector.setX(avgCoord.getX());
         connector.setZ(avgCoord.getY());
         double angle = 90 + Math.toDegrees(GPSConverter.getAngle(graphCoord2, graphCoord1));

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

@@ -23,7 +23,7 @@ public class SeaSurface extends Subject3D {
      * @param freq frequency the perlin noise is to be generated at
      */
     public SeaSurface(int size, double freq){
-        super(createSurface(size, freq));
+        super(createSurface(size, freq),0);
     }
 
     /**

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

@@ -52,7 +52,7 @@ public class SkyBox {
         surface.setTranslateY(y - size + 1);
         surface.setTranslateZ(z);
 
-        Subject3D top = new Subject3D(surface);
+        Subject3D top = new Subject3D(surface,0);
         skyBoxPlanes.add(top);
     }
 
@@ -71,7 +71,7 @@ public class SkyBox {
         surface.setTranslateZ(z + size/2 - 1);
 
 
-        Subject3D right = new Subject3D(surface);
+        Subject3D right = new Subject3D(surface,0);
         skyBoxPlanes.add(right);
     }
 
@@ -93,7 +93,7 @@ public class SkyBox {
         surface.setTranslateZ(z - size/2 + 1);
 
 
-        Subject3D left = new Subject3D(surface);
+        Subject3D left = new Subject3D(surface,0);
         skyBoxPlanes.add(left);
     }
 
@@ -111,7 +111,7 @@ public class SkyBox {
         surface.setTranslateY(y - size/2);
         surface.setTranslateZ(z);
 
-        Subject3D back = new Subject3D(surface);
+        Subject3D back = new Subject3D(surface,0);
         skyBoxPlanes.add(back);
     }
 
@@ -129,7 +129,7 @@ public class SkyBox {
         surface.setTranslateY(y - size/2);
         surface.setTranslateZ(z);
 
-        Subject3D front = new Subject3D(surface);
+        Subject3D front = new Subject3D(surface,0);
         skyBoxPlanes.add(front);
     }