Merge branch 'master' into feature/playerList

Client/Client.cs

@@ -5,22 +5,31 @@ using System.Diagnostics;
 using System.IO;
 using System.Net.Sockets;
 using System.Text;
+using System.Windows.Media;
 using System.Windows;
+
 using static SharedClientServer.JSONConvert;
 
 namespace Client
 {
-    public delegate void LobbyCallback(int id);
     public delegate void LobbyJoinCallback(bool isHost);
+
     public delegate void RandomWord(string word);
     public delegate void HandleIncomingMsg(string username, string msg);
     internal delegate void HandleIncomingPlayer(Lobby lobby);
+    public delegate void CanvasDataReceived(double[][] coordinates, Color color);
+    public delegate void CanvasReset();
+    public delegate void LobbyCallback(int id);
+
     class Client : ObservableObject
     {
+
+        private ClientData clientData = ClientData.Instance;
+
         private TcpClient tcpClient;
         private NetworkStream stream;
-        private byte[] buffer = new byte[1024];
-        private byte[] totalBuffer = new byte[1024];
+        private byte[] buffer = new byte[2048];
+        private byte[] totalBuffer = new byte[2048];
         private int totalBufferReceived = 0;
         public int Port = 5555;
         public bool Connected = false;
@@ -37,6 +46,8 @@ namespace Client
         public HandleIncomingMsg IncomingMsg;
         public HandleIncomingPlayer IncomingPlayer;
         private ClientData data = ClientData.Instance;
+        public CanvasDataReceived CanvasDataReceived;
+        public CanvasReset CReset;
         public Lobby[] Lobbies { get; set; }
 
         public Client(string username)
@@ -68,6 +79,7 @@ namespace Client
 
         private void OnReadComplete(IAsyncResult ar)
         {
+
             if (ar == null || (!ar.IsCompleted) || (!this.stream.CanRead) || !this.tcpClient.Client.Connected)
                 return;
 
@@ -75,11 +87,12 @@ namespace Client
             {
                 int amountReceived = stream.EndRead(ar);
 
-                if (totalBufferReceived + amountReceived > 1024)
+                if (totalBufferReceived + amountReceived > 2048)
                 {
                     throw new OutOfMemoryException("buffer too small");
                 }
 
+
                 Array.Copy(buffer, 0, totalBuffer, totalBufferReceived, amountReceived);
                 totalBufferReceived += amountReceived;
 
@@ -91,7 +104,6 @@ namespace Client
                     byte[] message = new byte[expectedMessageLength];
                     // put the message received into the message array
                     Array.Copy(totalBuffer, 0, message, 0, expectedMessageLength);
-
                     handleData(message);
 
                     totalBufferReceived -= expectedMessageLength;
@@ -105,7 +117,6 @@ namespace Client
                 Debug.WriteLine("[CLIENT] server not responding! got error: " + e.Message);
                 OnServerDisconnect?.Invoke();   
             }
-            
         }
 
         private void handleData(byte[] message)
@@ -169,7 +180,22 @@ namespace Client
 
                 case JSONConvert.CANVAS:
                     // canvas data
-                    break;
+                    //clientData.CanvasData = JSONConvert.getCoordinates(payload);         
+                    int type = JSONConvert.GetCanvasMessageType(payload);
+                    switch (type)
+                    {
+                        case JSONConvert.CANVAS_RESET:
+                            CReset?.Invoke();
+                            break;
+
+                        case JSONConvert.CANVAS_WRITING:
+                            CanvasDataReceived?.Invoke(JSONConvert.getCoordinates(payload), JSONConvert.getCanvasDrawingColor(payload));
+                            // we hebben gedrawed, dus stuur dat we weer kunnen drawen
+                            
+                            break;
+                    }
+                break;
+
 
                 case JSONConvert.RANDOMWORD:
                     //Flag byte for receiving the random word.