Merge branch 'storyA_sounds' into storyD-3D

# Conflicts: # racevisionGame/src/main/java/visualiser/layout/SeaSurface.java # racevisionGame/src/main/java/visualiser/layout/SkyBox.java
2017-09-14 14:16:53 +12:00
parent c23fcfcaa3 de9f4e22eb
commit 7b076f3718
61 changed files with 1279 additions and 945 deletions
@@ -50,10 +50,10 @@ public class SkyBox {
        surface.setRotate(180);

        surface.setTranslateX(x);
-        surface.setTranslateY(y - size/2 + yshift + clipOverlap);
+        surface.setTranslateY(y - size + 1);
        surface.setTranslateZ(z);

-        Subject3D top = new SkyBoxPlane(surface);
+        Subject3D top = new Subject3D(surface,0);
        skyBoxPlanes.add(top);
    }

@@ -72,7 +72,7 @@ public class SkyBox {
        surface.setTranslateZ(z + size/2 - clipOverlap);


-        Subject3D right = new SkyBoxPlane(surface);
+        Subject3D right = new Subject3D(surface,0);
        skyBoxPlanes.add(right);
    }

@@ -94,7 +94,7 @@ public class SkyBox {
        surface.setTranslateZ(z - size/2 + clipOverlap);


-        Subject3D left = new SkyBoxPlane(surface);
+        Subject3D left = new Subject3D(surface,0);
        skyBoxPlanes.add(left);
    }

@@ -112,7 +112,7 @@ public class SkyBox {
        surface.setTranslateY(y + yshift);
        surface.setTranslateZ(z);

-        Subject3D back = new SkyBoxPlane(surface);
+        Subject3D back = new Subject3D(surface,0);
        skyBoxPlanes.add(back);
    }

@@ -130,7 +130,7 @@ public class SkyBox {
        surface.setTranslateY(y + yshift);
        surface.setTranslateZ(z);

-        Subject3D front = new SkyBoxPlane(surface);
+        Subject3D front = new Subject3D(surface,0);
        skyBoxPlanes.add(front);
    }