From 78f64557c36f4120c1afe1dd115f8e2bb323bc29 Mon Sep 17 00:00:00 2001 From: Michael Rausch Date: Wed, 27 Sep 2017 14:46:12 +1300 Subject: [PATCH] Merged dev onto 1273_Skybox --- src/main/java/seng302/gameServer/GameState.java | 5 ++--- src/main/java/seng302/gameServer/MainServerThread.java | 2 -- src/main/java/seng302/gameServer/MessageFactory.java | 1 + src/main/java/seng302/model/mark/MarkOrder.java | 1 + src/main/java/seng302/visualiser/GameView3D.java | 6 +++--- .../controllers/dialogs/ServerCreationController.java | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java index e958e18c..302de0a1 100644 --- a/src/main/java/seng302/gameServer/GameState.java +++ b/src/main/java/seng302/gameServer/GameState.java @@ -87,7 +87,7 @@ public class GameState implements Runnable { private static GameStages currentStage; private static MarkOrder markOrder; private static long startTime; - private static List marks; + private static Set marks = new HashSet<>(); private static List courseLimit; private static Integer maxPlayers = 8; @@ -112,8 +112,6 @@ public class GameState implements Runnable { isRaceStarted = false; previousUpdateTime = System.currentTimeMillis(); newMessageListeners = new ArrayList<>(); - marks = new MarkOrder().getAllMarks(); - randomSpawn = new RandomSpawn(markOrder.getOrderedUniqueCompoundMarks()); resetStartTime(); //setCourseLimit("/server_config/race.xml"); @@ -125,6 +123,7 @@ public class GameState implements Runnable { for (CompoundMark compoundMark : raceXMLData.getCompoundMarks().values()){ marks.addAll(compoundMark.getMarks()); } + randomSpawn = new RandomSpawn(markOrder.getOrderedUniqueCompoundMarks()); courseLimit = raceXMLData.getCourseLimit(); } diff --git a/src/main/java/seng302/gameServer/MainServerThread.java b/src/main/java/seng302/gameServer/MainServerThread.java index e54a62e4..826d5f14 100644 --- a/src/main/java/seng302/gameServer/MainServerThread.java +++ b/src/main/java/seng302/gameServer/MainServerThread.java @@ -82,8 +82,6 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate { startAdvertisingServer(); PolarTable.parsePolarFile(getClass().getResourceAsStream("/server_config/acc_polars.csv")); GameState.addMessageEventListener(this::broadcastMessage); - startUpdatingWind(); - startSpawningTokens(); sendSetupMessages(); } diff --git a/src/main/java/seng302/gameServer/MessageFactory.java b/src/main/java/seng302/gameServer/MessageFactory.java index ae6ea176..b1c10b45 100644 --- a/src/main/java/seng302/gameServer/MessageFactory.java +++ b/src/main/java/seng302/gameServer/MessageFactory.java @@ -22,6 +22,7 @@ import seng302.model.stream.xml.generator.RegattaXMLTemplate; import seng302.model.stream.xml.parser.RaceXMLData; import seng302.model.stream.xml.parser.RegattaXMLData; import seng302.model.token.Token; +import seng302.model.token.TokenType; import seng302.utilities.XMLGenerator; import java.util.ArrayList; diff --git a/src/main/java/seng302/model/mark/MarkOrder.java b/src/main/java/seng302/model/mark/MarkOrder.java index 99d080ed..5f19b40c 100644 --- a/src/main/java/seng302/model/mark/MarkOrder.java +++ b/src/main/java/seng302/model/mark/MarkOrder.java @@ -27,6 +27,7 @@ public class MarkOrder { ); raceMarkOrder.add(compoundMark); } + orderedUniqueCompoundMarks = new ArrayList<>(raceXMLData.getCompoundMarks().values()); } /** diff --git a/src/main/java/seng302/visualiser/GameView3D.java b/src/main/java/seng302/visualiser/GameView3D.java index 4edfc9e2..a4704c8f 100644 --- a/src/main/java/seng302/visualiser/GameView3D.java +++ b/src/main/java/seng302/visualiser/GameView3D.java @@ -102,7 +102,7 @@ public class GameView3D extends GameView{ chaseCam = new ChaseCamera(); for (PerspectiveCamera pc : Arrays.asList(isometricCam, topDownCam, chaseCam)) { - pc.setFarClip(600); + pc.setFarClip(100000); pc.setNearClip(0.1); pc.setFieldOfView(FOV); } @@ -114,7 +114,7 @@ public class GameView3D extends GameView{ ); view.setCamera(isometricCam); - skybox = new Skybox(new Image(getClass().getResourceAsStream("/images/skybox.jpg")), 100000, camera); + skybox = new Skybox(new Image(getClass().getResourceAsStream("/images/skybox.jpg")), 100000, isometricCam); skybox.getTransforms().addAll(new Rotate(90, Rotate.X_AXIS)); Model land = ModelFactory.importModel(ModelType.LAND_SMOOTH); @@ -375,7 +375,7 @@ public class GameView3D extends GameView{ private void updateBoatLocation(ClientYacht boat, Double lat, Double lon, Double heading, Boolean sailIn, Double velocity) { BoatObject bo = boatObjects.get(boat); - Point2D p2d = findScaledXY(lat, lon); + Point2D p2d = scaledPoint.findScaledXY(lat, lon); bo.moveTo(p2d.getX(), p2d.getY(), heading, velocity, sailIn, windDir); } diff --git a/src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java b/src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java index abf496c0..5ed46bd0 100644 --- a/src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java +++ b/src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java @@ -92,7 +92,7 @@ public class ServerCreationController implements Initializable { mapHolder.getChildren().setAll(mapMaker.getCurrentGameView()); mapNameLabel.setText(mapMaker.getCurrentRegatta().getCourseName()); - closeLabel.setOnMouseClicked(event -> notifyListeners()); + //closeLabel.setOnMouseClicked(event -> notifyListeners()); } /**