Merged dev onto 1273_Skybox

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<Mark> marks;
+    private static Set<Mark> marks = new HashSet<>();
     private static List<Limit> 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();
     }
 

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();
     }
 

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;

src/main/java/seng302/model/mark/MarkOrder.java

@@ -27,6 +27,7 @@ public class MarkOrder {
             );
             raceMarkOrder.add(compoundMark);
         }
+        orderedUniqueCompoundMarks = new ArrayList<>(raceXMLData.getCompoundMarks().values());
     }
 
     /**

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);
     }
 

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());
     }
 
     /**