Merge branch 'story63' into 'master'

63. [C, M] I'd like to be able to make small adjustments to the heading of my boat, as Gemma, either upwind or downwind.

Note: each keypress should change the boat's heading by a small amount (3 degrees?) Pressing the 'upwind' key will turn the boat's head towards the wind by that small amount, while the 'downwind' key will do the opposite. Continuing to press the downwind key when the boat is already heading straight downwind, or upwind when heading directly upwind, achieves nothing.

Acceptance criteria:

- The player boat turns towards wind a small amount for each press of the 'upwind' key.
- The player boat turns away from the wind by a small amount for each press of the 'downwind' key.
- If the boat heading is directly into wind after a series of 'upwind' keypresses, the heading will continue to change in the same direction for one more keypress.
- Substitute 'downwind' for 'upwind' for the downwind case.


See merge request !21

racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java

@@ -1,19 +1,19 @@
 package visualiser.gameController;
 
+import mock.model.RaceLogic;
 import network.BinaryMessageDecoder;
 import network.MessageDecoders.BoatActionDecoder;
 import network.Messages.Enums.BoatActionEnum;
-import visualiser.gameController.Keys.ControlKey;
-import visualiser.gameController.Keys.KeyFactory;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.net.Socket;
+import java.util.Observable;
 
 /**
  * Service for dispatching key press data to race from client
  */
-public class ControllerServer implements Runnable {
+public class ControllerServer extends Observable implements Runnable {
     /**
      * Socket to client
      */
@@ -22,13 +22,23 @@ public class ControllerServer implements Runnable {
      * Wrapper for input from client
      */
     private DataInputStream inputStream;
+    /**
+     * Last received boat action
+     */
+    private BoatActionEnum action;
+    /**
+     *
+     */
+    private RaceLogic rc;
 
     /**
      * Initialise server-side controller with live client socket
      * @param socket to client
      */
-    public ControllerServer(Socket socket) {
+    public ControllerServer(Socket socket, RaceLogic rc) {
         this.socket = socket;
+        this.rc = rc;
+        this.addObserver(rc);
         try {
             this.inputStream = new DataInputStream(this.socket.getInputStream());
         } catch (IOException e) {
@@ -36,6 +46,10 @@ public class ControllerServer implements Runnable {
         }
     }
 
+    public BoatActionEnum getAction() {
+        return action;
+    }
+
     /**
      * Wait for controller key input from client and loop.
      */
@@ -48,8 +62,11 @@ public class ControllerServer implements Runnable {
                     inputStream.read(message);
                     BinaryMessageDecoder encodedMessage = new BinaryMessageDecoder(message);
                     BoatActionDecoder boatActionDecoder = new BoatActionDecoder(encodedMessage.getMessageBody());
-                    BoatActionEnum decodedMessage = boatActionDecoder.getBoatAction();
-                    System.out.println("Received key: " + decodedMessage);
+                    action = boatActionDecoder.getBoatAction();
+
+                    // Notify observers of most recent action
+                    this.notifyObservers();
+                    this.setChanged();
                 }
             } catch (IOException e) {
                 e.printStackTrace();

racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java

@@ -27,8 +27,8 @@ public class KeyFactory {
         keyState.put("SPACE", new VMGKey("VMG"));
         keyState.put("SHIFT", new SailsToggleKey("Toggle Sails"));
         keyState.put("ENTER", new TackGybeKey("Tack/Gybe"));
-        keyState.put("PAGE_UP", new UpWindKey("Upwind"));
-        keyState.put("PAGE_DOWN", new DownWindKey("Downwind"));
+        keyState.put("UP", new UpWindKey("Upwind"));
+        keyState.put("DOWN", new DownWindKey("Downwind"));
     }
 
     /**