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

Skybox no longer preloaded

Browse Source
This commit is contained in:
Joseph Gardner
2017-09-28 16:34:47 +13:00
parent 8ed0bf09ca
commit ec4fc9da24
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+1 -1
View File
@@ -402,7 +402,7 @@ public class RaceViewController extends Controller {
RaceDataSource raceData = visualiserRace.getVisualiserRaceState().getRaceDataSource(); RaceDataSource raceData = visualiserRace.getVisualiserRaceState().getRaceDataSource();
gpsConverter = new GPSConverter(raceData, 450, 450); gpsConverter = new GPSConverter(raceData, 450, 450);
SkyBox skyBox = Assets3D.skyBox; SkyBox skyBox = new SkyBox(750, 200, 250, 0, 210);
viewSubjects.addAll(skyBox.getSkyBoxPlanes()); viewSubjects.addAll(skyBox.getSkyBoxPlanes());
// Set up sea surface // Set up sea surface
racevisionGame/src/main/java/visualiser/layout/Assets3D.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class Assets3D {
loadWindArrow(); loadWindArrow();
loadNextArrow(); loadNextArrow();
loadSeaSurface(); loadSeaSurface();
loadSkybox(); //loadSkybox();
loadSeagull(); loadSeagull();
loadBoatHightlight(); loadBoatHightlight();
} }
racevisionGame/src/main/java/visualiser/layout/SkyBox.java
+15 -10
View File
@@ -45,8 +45,9 @@ public class SkyBox {
} }
private void addTop() { private void addTop() {
String imagePath = "images/skybox/ThickCloudsWaterUp2048.png"; String imagePath;
if (!App.dayMode) imagePath = "images/skybox/DarkStormyUp2048.png"; if (App.dayMode) imagePath = "images/skybox/ThickCloudsWaterUp2048.png";
else imagePath = "images/skybox/DarkStormyUp2048.png";
MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream(imagePath)), size); MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream(imagePath)), size);
surface.setRotationAxis(new Point3D(0, 0, 1)); surface.setRotationAxis(new Point3D(0, 0, 1));
@@ -61,8 +62,9 @@ public class SkyBox {
} }
private void addRight() { private void addRight() {
String imagePath = "images/skybox/ThickCloudsWaterRight2048.png"; String imagePath;
if (!App.dayMode) imagePath = "images/skybox/DarkStormyRight2048.png"; if (App.dayMode) imagePath = "images/skybox/ThickCloudsWaterRight2048.png";
else imagePath = "images/skybox/DarkStormyRight2048.png";
MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream(imagePath)), size + 1); MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream(imagePath)), size + 1);
surface.setTranslateX(size/2); surface.setTranslateX(size/2);
@@ -82,8 +84,9 @@ public class SkyBox {
} }
private void addLeft() { private void addLeft() {
String imagePath = "images/skybox/ThickCloudsWaterLeft2048.png"; String imagePath;
if (!App.dayMode) imagePath = "images/skybox/DarkStormyLeft2048.png"; if (App.dayMode) imagePath = "images/skybox/ThickCloudsWaterLeft2048.png";
else imagePath = "images/skybox/DarkStormyLeft2048.png";
MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream(imagePath)), size + 1); MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream(imagePath)), size + 1);
surface.setTranslateX(size/2); surface.setTranslateX(size/2);
@@ -106,8 +109,9 @@ public class SkyBox {
} }
private void addBack() { private void addBack() {
String imagePath = "images/skybox/ThickCloudsWaterBack2048.png"; String imagePath;
if (!App.dayMode) imagePath = "images/skybox/DarkStormyBack2048.png"; if (App.dayMode) imagePath = "images/skybox/ThickCloudsWaterBack2048.png";
else imagePath = "images/skybox/DarkStormyBack2048.png";
MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream(imagePath)), size); MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream(imagePath)), size);
surface.getTransforms().add(new Rotate(90, 0, 0)); surface.getTransforms().add(new Rotate(90, 0, 0));
@@ -126,8 +130,9 @@ public class SkyBox {
} }
private void addFront() { private void addFront() {
String imagePath = "images/skybox/ThickCloudsWaterFront2048.png"; String imagePath;
if (!App.dayMode) imagePath = "images/skybox/DarkStormyFront2048.png"; if (App.dayMode) imagePath = "images/skybox/ThickCloudsWaterFront2048.png";
else imagePath = "images/skybox/DarkStormyFront2048.png";
MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream(imagePath)), size); MeshView surface = makeSurface(new Image(getClass().getClassLoader().getResourceAsStream(imagePath)), size);
surface.setTranslateX(size/2); surface.setTranslateX(size/2);
surface.setTranslateY(size/2); surface.setTranslateY(size/2);