Merge remote-tracking branch 'origin/Story62_Creating_Game_Loop' into Story62_Reading_Keystrokes

# Conflicts:
#	src/main/java/seng302/controllers/RaceViewController.java
#	src/main/java/seng302/gameServer/MainServerThread.java
#	src/main/java/seng302/gameServer/ServerToClientThread.java

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

@@ -1,8 +1,13 @@
 package seng302.gameServer;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import seng302.models.Player;
 
 import java.util.ArrayList;
+import seng302.models.Yacht;
+import seng302.server.messages.BoatActionType;
 
 /**
  * A Static class to hold information about the current state of the game (model)
@@ -10,8 +15,13 @@ import java.util.ArrayList;
  */
 public class GameState {
 
+    private static Long previousUpdateTime;
+    private static Double windDirection = 0d;
+    private static Double windSpeed = 0d;
+
     private static String hostIpAddress;
-    private static ArrayList<Player> players;
+    private static List<Player> players;
+    private static Map<Integer, Yacht> yachts;
     private static Boolean isRaceStarted;
     private static GameStages currentStage;
     
@@ -20,13 +30,15 @@ public class GameState {
         players = new ArrayList<>();
         currentStage = GameStages.LOBBYING;
         isRaceStarted = false;
+        //set this when game stage changes to prerace
+        previousUpdateTime = System.currentTimeMillis();
     }
 
     public static String getHostIpAddress() {
         return hostIpAddress;
     }
 
-    public static ArrayList<Player> getPlayers() {
+    public static List<Player> getPlayers() {
         return players;
     }
     
@@ -38,6 +50,10 @@ public class GameState {
         players.remove(player);
     }
 
+    public static void addYacht(Integer sourceId, Yacht yatch) {
+        yachts.put(sourceId, yatch);
+    }
+
     public static Boolean getIsRaceStarted() {
         return isRaceStarted;
     }
@@ -50,16 +66,36 @@ public class GameState {
         GameState.currentStage = currentStage;
     }
 
-    /**
-     * This iterates through all players and updates each players info to its new state based on its current data
-     */
-    private void update(){
-        for(Player player : players) {
-            // TODO: 10/07/17 wmu16 - Update all player info 
+    public static Double getWindDirection() {
+        return windDirection;
+    }
+
+    public static Double getWindSpeed() {
+        return windSpeed;
+    }
+
+    public static void updateBoat(Integer sourceId, BoatActionType actionType) {
+        switch (actionType) {
+            case VMG:
+                break;
+            case SAILS_IN:
+                break;
+            case SAILS_OUT:
+                break;
+            case TACK_GYBE:
+                break;
+            case UPWIND:
+                break;
+            case DOWNWIND:
+                break;
         }
     }
 
-
-
-
+    public static void update() {
+        Long timeInterval = System.currentTimeMillis() - previousUpdateTime;
+        previousUpdateTime = System.currentTimeMillis();
+        for (Yacht yacht : yachts.values()) {
+            yacht.update(timeInterval);
+        }
+    }
 }

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

@@ -1,8 +1,8 @@
 package seng302.gameServer;
 
+import seng302.client.ClientPacketParser;
 import seng302.models.Player;
 import seng302.models.stream.PacketBufferDelegate;
-import seng302.models.stream.StreamParser;
 import seng302.models.stream.packets.StreamPacket;
 
 import java.io.IOException;
@@ -57,11 +57,12 @@ public class MainServerThread extends Thread implements PacketBufferDelegate, Cl
                 e.printStackTrace();
             }
 
-
-
+            if (GameState.getCurrentStage() == GameStages.PRE_RACE) {
+                GameState.update();
+            }
             //RACING
             if (GameState.getCurrentStage() == GameStages.RACING) {
-                updateClients();
+                GameState.update();
             }
 
 
@@ -71,12 +72,11 @@ public class MainServerThread extends Thread implements PacketBufferDelegate, Cl
             }
             updateClients();
 
-
             while (!packetBuffer.isEmpty()){
                 System.out.println("WHATUPPP");
                 try {
                     StreamPacket packet = packetBuffer.take();
-                    StreamParser.parsePacket(packet);
+                    ClientPacketParser.parsePacket(packet);
                 } catch (InterruptedException e) {
                     continue;
                 }

src/main/java/seng302/gameServer/ServerPacketParser.java

@@ -0,0 +1,37 @@
+package seng302.gameServer;
+
+import java.util.Arrays;
+import seng302.models.stream.packets.StreamPacket;
+import seng302.server.messages.BoatActionType;
+
+
+public class ServerPacketParser {
+
+
+    public static BoatActionType extractBoatAction(StreamPacket packet) {
+        byte[] payload = packet.getPayload();
+        int messageVersionNo = payload[0];
+        long actionTypeValue = bytesToLong(Arrays.copyOfRange(payload, 0, 1));
+        return BoatActionType.getType((int) actionTypeValue);
+    }
+
+    /**
+     * takes an array of up to 7 bytes and returns a positive
+     * long constructed from the input bytes
+     *
+     * @return a positive long if there is less than 7 bytes -1 otherwise
+     */
+    private static long bytesToLong(byte[] bytes) {
+        long partialLong = 0;
+        int index = 0;
+        for (byte b : bytes) {
+            if (index > 6) {
+                return -1;
+            }
+            partialLong = partialLong | (b & 0xFFL) << (index * 8);
+            index++;
+        }
+        return partialLong;
+    }
+}
+

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

@@ -1,18 +1,22 @@
 package seng302.gameServer;
 
-import seng302.gameServer.GameState;
+
+import java.util.Random;
+import seng302.client.ClientPacketParser;
 import seng302.models.Player;
-import seng302.models.stream.PacketBufferDelegate;
-import seng302.models.stream.StreamParser;
+import seng302.models.Yacht;
+import seng302.models.stream.packets.PacketType;
 import seng302.models.stream.packets.StreamPacket;
 import seng302.server.messages.ChatterMessage;
 import seng302.server.messages.Heartbeat;
+import seng302.server.messages.BoatActionType;
 import seng302.server.messages.Message;
 
 import java.io.*;
 import java.net.Socket;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
+import seng302.utilities.GeoPoint;
 
 /**
  * A class describing a single connection to a Client for the purposes of sending and receiving on its own thread.
@@ -20,7 +24,6 @@ import java.util.zip.Checksum;
  * Created by wmu16 on 13/07/17.
  */
 public class ServerToClientThread extends Thread {
-
     private static final Integer MAX_ID_ATTEMPTS = 10;
 
     private InputStream is;
@@ -33,6 +36,8 @@ public class ServerToClientThread extends Thread {
     private Boolean connected = true;
     private Boolean updateClient = true;
 
+    private Integer sourceId;
+
     public ServerToClientThread(Socket socket) {
         this.socket = socket;
         try {
@@ -43,6 +48,9 @@ public class ServerToClientThread extends Thread {
         }
 //                threeWayHandshake();
         GameState.addPlayer(new Player(socket));
+        Random rand = new Random();
+        sourceId = rand.nextInt(100000);
+        GameState.addYacht(sourceId, new Yacht("Kappa", "Kap", new GeoPoint(0.0, 0.0), 0.0));
     }
 
     public void run() {
@@ -86,8 +94,14 @@ public class ServerToClientThread extends Thread {
                     long packetCrc = Message.bytesToLong(getBytes(4));
                     if (computedCrc == packetCrc) {
                         //System.out.println("RECEIVED A PACKET");
-                        StreamParser.parsePacket(new StreamPacket(type, payloadLength, timeStamp, payload));
-                        // TODO: 17/07/17 wmu16 - Fix this or maybe we dont need to go through the main server at all!?!?
+                        switch (PacketType.assignPacketType(type)) {
+                            case BOAT_ACTION:
+                                BoatActionType actionType = ServerPacketParser
+                                    .extractBoatAction(
+                                        new StreamPacket(type, payloadLength, timeStamp, payload));
+                                GameState.updateBoat(sourceId, actionType);
+                                break;
+                        }
                     } else {
                         System.err.println("Packet has been dropped");
                     }