fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged sounds. #story[1196]

Browse Source
This commit is contained in:
Joseph Gardner
2017-09-14 14:37:53 +12:00
parent 7b076f3718
commit 1166c0a4fb
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/layout/SkyBox.java
+12 -12
View File
@@ -30,7 +30,7 @@ public class SkyBox {
this.z = z; this.z = z;
this.freq = freq; this.freq = freq;
this.yshift = -size/64; this.yshift = -size/64;
clipOverlap = 3; clipOverlap = 0;
makeSkyBox(); makeSkyBox();
} }
@@ -44,7 +44,7 @@ public class SkyBox {
} }
private void addTop() { 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.setRotationAxis(new Point3D(0, 0, 1));
surface.setRotate(180); surface.setRotate(180);
@@ -53,12 +53,12 @@ public class SkyBox {
surface.setTranslateY(y - size + 1); surface.setTranslateY(y - size + 1);
surface.setTranslateZ(z); surface.setTranslateZ(z);
Subject3D top = new Subject3D(surface,0); Subject3D top = new SkyBoxPlane(surface,0);
skyBoxPlanes.add(top); skyBoxPlanes.add(top);
} }
private void addRight() { 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.setTranslateX(size/2);
surface.setTranslateY(size/2); surface.setTranslateY(size/2);
@@ -72,12 +72,12 @@ public class SkyBox {
surface.setTranslateZ(z + size/2 - clipOverlap); surface.setTranslateZ(z + size/2 - clipOverlap);
Subject3D right = new Subject3D(surface,0); Subject3D right = new SkyBoxPlane(surface,0);
skyBoxPlanes.add(right); skyBoxPlanes.add(right);
} }
private void addLeft() { 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.setTranslateX(size/2);
surface.setTranslateY(size/2); surface.setTranslateY(size/2);
@@ -94,12 +94,12 @@ public class SkyBox {
surface.setTranslateZ(z - size/2 + clipOverlap); surface.setTranslateZ(z - size/2 + clipOverlap);
Subject3D left = new Subject3D(surface,0); Subject3D left = new SkyBoxPlane(surface,0);
skyBoxPlanes.add(left); skyBoxPlanes.add(left);
} }
private void addBack() { 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.getTransforms().add(new Rotate(90, 0, 0));
surface.setRotationAxis(new Point3D(1, 0, 0)); surface.setRotationAxis(new Point3D(1, 0, 0));
@@ -112,12 +112,12 @@ public class SkyBox {
surface.setTranslateY(y + yshift); surface.setTranslateY(y + yshift);
surface.setTranslateZ(z); surface.setTranslateZ(z);
Subject3D back = new Subject3D(surface,0); Subject3D back = new SkyBoxPlane(surface,0);
skyBoxPlanes.add(back); skyBoxPlanes.add(back);
} }
private void addFront() { 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.setTranslateX(size/2);
surface.setTranslateY(size/2); surface.setTranslateY(size/2);
@@ -130,11 +130,11 @@ public class SkyBox {
surface.setTranslateY(y + yshift); surface.setTranslateY(y + yshift);
surface.setTranslateZ(z); surface.setTranslateZ(z);
Subject3D front = new Subject3D(surface,0); Subject3D front = new SkyBoxPlane(surface,0);
skyBoxPlanes.add(front); skyBoxPlanes.add(front);
} }
private MeshView makeSurface(Image diffuseMap) { private MeshView makeSurface(Image diffuseMap, int size) {
PhongMaterial material = new PhongMaterial(); PhongMaterial material = new PhongMaterial();
material.setDiffuseColor(Color.web("#FFFFFF")); material.setDiffuseColor(Color.web("#FFFFFF"));
racevisionGame/src/main/java/visualiser/layout/SkyBoxPlane.java
+2 -2
View File
@@ -4,8 +4,8 @@ import javafx.scene.shape.Shape3D;
public class SkyBoxPlane extends Subject3D { public class SkyBoxPlane extends Subject3D {
public SkyBoxPlane(Shape3D mesh) { public SkyBoxPlane(Shape3D mesh, int sourceID) {
super(mesh); super(mesh,sourceID);
} }
@Override @Override