From 1166c0a4fb96090894e40823eb815380d55aaf13 Mon Sep 17 00:00:00 2001
From: Joseph Gardner <jjg64@uclive.ac.nz>
Date: Thu, 14 Sep 2017 14:37:53 +1200
Subject: [PATCH] Merged sounds. #story[1196]

---
 .../main/java/visualiser/layout/SkyBox.java   | 24 +++++++++----------
 .../java/visualiser/layout/SkyBoxPlane.java   |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/layout/SkyBox.java b/racevisionGame/src/main/java/visualiser/layout/SkyBox.java
index 09492510..bef03170 100644
--- a/racevisionGame/src/main/java/visualiser/layout/SkyBox.java
+++ b/racevisionGame/src/main/java/visualiser/layout/SkyBox.java
@@ -30,7 +30,7 @@ public class SkyBox {
         this.z = z;
         this.freq = freq;
         this.yshift = -size/64;
-        clipOverlap = 3;
+        clipOverlap = 0;
         makeSkyBox();
     }
 
@@ -44,7 +44,7 @@ public class SkyBox {
     }
 
     private void addTop() {
-        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/ThickCloudsWaterUp2048.png")));
+        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/ThickCloudsWaterUp2048.png")), size);
 
         surface.setRotationAxis(new Point3D(0, 0, 1));
         surface.setRotate(180);
@@ -53,12 +53,12 @@ public class SkyBox {
         surface.setTranslateY(y - size + 1);
         surface.setTranslateZ(z);
 
-        Subject3D top = new Subject3D(surface,0);
+        Subject3D top = new SkyBoxPlane(surface,0);
         skyBoxPlanes.add(top);
     }
 
     private void addRight() {
-        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/ThickCloudsWaterRight2048.png")));
+        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/ThickCloudsWaterRight2048.png")), size + 1);
 
         surface.setTranslateX(size/2);
         surface.setTranslateY(size/2);
@@ -72,12 +72,12 @@ public class SkyBox {
         surface.setTranslateZ(z + size/2 - clipOverlap);
 
 
-        Subject3D right = new Subject3D(surface,0);
+        Subject3D right = new SkyBoxPlane(surface,0);
         skyBoxPlanes.add(right);
     }
 
     private void addLeft() {
-        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/ThickCloudsWaterLeft2048.png")));
+        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/ThickCloudsWaterLeft2048.png")), size + 1);
 
         surface.setTranslateX(size/2);
         surface.setTranslateY(size/2);
@@ -94,12 +94,12 @@ public class SkyBox {
         surface.setTranslateZ(z - size/2 + clipOverlap);
 
 
-        Subject3D left = new Subject3D(surface,0);
+        Subject3D left = new SkyBoxPlane(surface,0);
         skyBoxPlanes.add(left);
     }
 
     private void addBack() {
-        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/ThickCloudsWaterBack2048.png")));
+        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/ThickCloudsWaterBack2048.png")), size);
         surface.getTransforms().add(new Rotate(90, 0, 0));
 
         surface.setRotationAxis(new Point3D(1, 0, 0));
@@ -112,12 +112,12 @@ public class SkyBox {
         surface.setTranslateY(y + yshift);
         surface.setTranslateZ(z);
 
-        Subject3D back = new Subject3D(surface,0);
+        Subject3D back = new SkyBoxPlane(surface,0);
         skyBoxPlanes.add(back);
     }
 
     private void addFront() {
-        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/ThickCloudsWaterFront2048.png")));
+        MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream("images/skybox/ThickCloudsWaterFront2048.png")), size);
 
         surface.setTranslateX(size/2);
         surface.setTranslateY(size/2);
@@ -130,11 +130,11 @@ public class SkyBox {
         surface.setTranslateY(y + yshift);
         surface.setTranslateZ(z);
 
-        Subject3D front = new Subject3D(surface,0);
+        Subject3D front = new SkyBoxPlane(surface,0);
         skyBoxPlanes.add(front);
     }
 
-    private MeshView makeSurface(Image diffuseMap) {
+    private MeshView makeSurface(Image diffuseMap, int size) {
 
         PhongMaterial material = new PhongMaterial();
         material.setDiffuseColor(Color.web("#FFFFFF"));
diff --git a/racevisionGame/src/main/java/visualiser/layout/SkyBoxPlane.java b/racevisionGame/src/main/java/visualiser/layout/SkyBoxPlane.java
index b8824d1e..30858b66 100644
--- a/racevisionGame/src/main/java/visualiser/layout/SkyBoxPlane.java
+++ b/racevisionGame/src/main/java/visualiser/layout/SkyBoxPlane.java
@@ -4,8 +4,8 @@ import javafx.scene.shape.Shape3D;
 
 public class SkyBoxPlane extends Subject3D {
 
-    public SkyBoxPlane(Shape3D mesh) {
-        super(mesh);
+    public SkyBoxPlane(Shape3D mesh, int sourceID) {
+        super(mesh,sourceID);
     }
 
     @Override