Merged Host Customisation onto 1273_Skybox

src/main/java/seng302/gameServer/GameState.java

@@ -5,14 +5,7 @@ import java.util.*;
 import javafx.scene.paint.Color;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import seng302.gameServer.messages.BoatAction;
-import seng302.gameServer.messages.BoatStatus;
-import seng302.gameServer.messages.ChatterMessage;
-import seng302.gameServer.messages.CustomizeRequestType;
-import seng302.gameServer.messages.MarkRoundingMessage;
-import seng302.gameServer.messages.MarkType;
-import seng302.gameServer.messages.Message;
-import seng302.gameServer.messages.RoundingBoatStatus;
+import seng302.gameServer.messages.*;
 import seng302.model.GeoPoint;
 import seng302.model.Limit;
 import seng302.model.Player;
@@ -97,6 +90,7 @@ public class GameState implements Runnable {
     private static List<NewMessageListener> newMessageListeners;
 
     private static Map<Player, String> playerStringMap = new HashMap<>();
+    private static boolean tokensEnabled = false;
 
     public GameState() {
         windDirection = 180d;
@@ -253,9 +247,11 @@ public class GameState implements Runnable {
         timer.schedule(new TimerTask() {
             @Override
             public void run() {
+                if (tokensEnabled) {
                     spawnNewToken();
                     notifyMessageListeners(MessageFactory.getRaceXML());
                 }
+            }
         }, 0, TOKEN_SPAWN_TIME);
     }
 
@@ -340,6 +336,7 @@ public class GameState implements Runnable {
 //        token.assignType(TokenType.RANDOM);
         logger.debug("Spawned token of type " + token.getTokenType());
         tokensInPlay.add(token);
+        MessageFactory.updateTokens(tokensInPlay);
     }
 
     /**
@@ -386,6 +383,8 @@ public class GameState implements Runnable {
         if (collidedToken != null) {
             tokensInPlay.remove(collidedToken);
             powerUpYacht(yacht, collidedToken);
+            MessageFactory.updateTokens(tokensInPlay);
+            notifyMessageListeners(MessageFactory.getRaceXML());
         }
 
         checkPowerUpTimeout(yacht);
@@ -1036,4 +1035,8 @@ public class GameState implements Runnable {
     public static double getServerSpeedMultiplier() {
         return serverSpeedMultiplier;
     }
+
+    public static void setTokensEnabled (boolean tokensEnabled) {
+        GameState.tokensEnabled = tokensEnabled;
+    }
 }

src/main/java/seng302/gameServer/MainServerThread.java

@@ -163,7 +163,6 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
 
     private void sendSetupMessages() {
         MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
-
         broadcastMessage(MessageFactory.getRaceXML());
         broadcastMessage(MessageFactory.getRegattaXML());
         broadcastMessage(MessageFactory.getBoatXML());

src/main/java/seng302/gameServer/ServerToClientThread.java

@@ -203,6 +203,7 @@ public class ServerToClientThread implements Runnable {
                                     XMLParser.parseRace(document)
                                 );
                                 GameState.setMaxPlayers(XMLParser.getMaxPlayers(document));
+                                GameState.setTokensEnabled(XMLParser.tokensEnabled(document));
                                 break;
                             case REGATTA_XML:
                                 regattaXMLProperty.set(

src/main/java/seng302/utilities/XMLParser.java

@@ -201,11 +201,16 @@ public class XMLParser {
     public static Boolean tokensEnabled(Document doc) {
         Element docEle = doc.getDocumentElement();
         try {
-            Node tokenNode = docEle.getAttributeNode("Tokens");
-            return Boolean.valueOf(XMLParser.getNodeAttributeString(tokenNode, "Enabled"));
+            NamedNodeMap namedNodeMap = docEle.getElementsByTagName("Tokens").item(0).getAttributes();
+            Node node = namedNodeMap.getNamedItem("Enabled");
+            if (node != null) {
+                return Boolean.parseBoolean(node.getNodeValue());
+            }
         } catch (NullPointerException npe) {
+            npe.printStackTrace();
             return false;
         }
+        return false;
     }
 
     public static Integer getMaxPlayers(Document doc) {

src/main/java/seng302/visualiser/GameView3D.java

@@ -24,11 +24,7 @@ import javafx.scene.transform.Scale;
 import javafx.scene.transform.Translate;
 import org.fxyz3d.scene.Skybox;
 import seng302.gameServer.messages.RoundingSide;
-import seng302.model.ClientYacht;
-import seng302.model.GameKeyBind;
-import seng302.model.KeyAction;
-import seng302.model.Limit;
-import seng302.model.ScaledPoint;
+import seng302.model.*;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Corner;
 import seng302.model.mark.Mark;
@@ -67,22 +63,10 @@ public class GameView3D extends GameView{
     private PerspectiveCamera topDownCam;
     private PerspectiveCamera chaseCam;
 
-    private double bufferSize = 0;
-    private double canvasWidth = 200;
-    private double canvasHeight = 200;
-    private boolean horizontalInversion = false;
-
-    private double distanceScaleFactor;
-    private ScaleDirection scaleDirection;
-    private GeoPoint minLatPoint, minLonPoint, maxLatPoint, maxLonPoint;
-    private double referencePointX, referencePointY;
-    private Group raceBorder = new Group();
-
     /* Note that if either of these is null then values for it have not been added and the other
        should be used as the limits of the map. */
     private Map<Mark, Marker3D> markerObjects;
     private Map<ClientYacht, BoatObject> boatObjects = new HashMap<>();
-    private BoatObject selectedBoat = null;
     private Group wakesGroup = new Group();
     private Group boatObjectGroup = new Group();
     private List<Node> mapTokens;
@@ -91,11 +75,6 @@ public class GameView3D extends GameView{
     private Double windDir;
     private Skybox skybox;
 
-    private enum ScaleDirection {
-        HORIZONTAL,
-        VERTICAL
-    }
-
     public GameView3D () {
         isometricCam = new IsometricCamera(DEFAULT_CAMERA_X, DEFAULT_CAMERA_Y);
         topDownCam = new TopDownCamera();

src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java

@@ -95,6 +95,7 @@ public class ServerCreationController implements Initializable {
 
         mapHolder.getChildren().setAll(mapMaker.getCurrentGameView());
         mapNameLabel.setText(mapMaker.getCurrentRegatta().getCourseName());
+        pickupsCheckBox.setSelected(true);
         //closeLabel.setOnMouseClicked(event -> notifyListeners());
     }