the fuck?????
This commit is contained in:
@@ -10,7 +10,7 @@ using static SharedClientServer.JSONConvert;
|
||||
namespace Client
|
||||
{
|
||||
public delegate void LobbyJoinCallback(bool isHost);
|
||||
public delegate void CanvasDataReceived(double[] coordinates, Color color);
|
||||
public delegate void CanvasDataReceived(double[][] coordinates, Color color);
|
||||
public delegate void CanvasReset();
|
||||
public delegate void LobbyCallback(int id);
|
||||
class Client : ObservableObject
|
||||
@@ -58,7 +58,7 @@ namespace Client
|
||||
private void OnReadComplete(IAsyncResult ar)
|
||||
{
|
||||
int amountReceived = stream.EndRead(ar);
|
||||
if (totalBufferReceived + amountReceived > 1024)
|
||||
if (totalBufferReceived + amountReceived > 2048)
|
||||
{
|
||||
throw new OutOfMemoryException("buffer too small");
|
||||
}
|
||||
@@ -83,7 +83,7 @@ namespace Client
|
||||
Debug.WriteLine($"reduced buffer: {expectedMessageLength}");
|
||||
expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
|
||||
}
|
||||
|
||||
ar.AsyncWaitHandle.WaitOne();
|
||||
stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnReadComplete), null);
|
||||
}
|
||||
|
||||
@@ -149,18 +149,21 @@ namespace Client
|
||||
case JSONConvert.CANVAS:
|
||||
// canvas data
|
||||
//clientData.CanvasData = JSONConvert.getCoordinates(payload);
|
||||
CanvasInfo type = JSONConvert.GetCanvasMessageType(payload);
|
||||
int type = JSONConvert.GetCanvasMessageType(payload);
|
||||
switch (type)
|
||||
{
|
||||
case CanvasInfo.RESET:
|
||||
case JSONConvert.CANVAS_RESET:
|
||||
CReset?.Invoke();
|
||||
break;
|
||||
|
||||
case CanvasInfo.DRAWING:
|
||||
case JSONConvert.CANVAS_WRITING:
|
||||
CanvasDataReceived?.Invoke(JSONConvert.getCoordinates(payload), JSONConvert.getCanvasDrawingColor(payload));
|
||||
// we hebben gedrawed, dus stuur dat we weer kunnen drawen
|
||||
|
||||
break;
|
||||
}
|
||||
break;
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
Debug.WriteLine("[CLIENT] Received weird identifier: " + id);
|
||||
|
||||
@@ -3,9 +3,11 @@
|
||||
using GalaSoft.MvvmLight.Command;
|
||||
using SharedClientServer;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.ComponentModel;
|
||||
using System.Diagnostics;
|
||||
using System.Timers;
|
||||
using System.Windows;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
@@ -19,7 +21,12 @@ namespace Client.ViewModels
|
||||
private ClientData data = ClientData.Instance;
|
||||
private GameWindow window;
|
||||
private Point currentPoint = new Point();
|
||||
private Color color;
|
||||
public Color color;
|
||||
public double[][] buffer;
|
||||
public int pos = 0;
|
||||
public int maxLines = 1;
|
||||
public Queue<double[][]> linesQueue;
|
||||
private Timer queueTimer;
|
||||
|
||||
public static ObservableCollection<string> Messages { get; } = new ObservableCollection<string>();
|
||||
|
||||
@@ -59,6 +66,9 @@ namespace Client.ViewModels
|
||||
//_username = data.User.Username;
|
||||
//Messages.Add($"{data.User.Username}: {Message}");
|
||||
}
|
||||
|
||||
buffer = new double[maxLines][];
|
||||
linesQueue = new Queue<double[][]>();
|
||||
OnKeyDown = new RelayCommand(ChatBox_KeyDown);
|
||||
ButtonStartGame = new RelayCommand(BeginGame);
|
||||
ButtonResetCanvas = new RelayCommand(CanvasResetLocal);
|
||||
@@ -72,6 +82,10 @@ namespace Client.ViewModels
|
||||
|
||||
public void BeginGame()
|
||||
{
|
||||
|
||||
queueTimer = new Timer(500);
|
||||
queueTimer.Start();
|
||||
queueTimer.Elapsed += sendArrayFromQueue;
|
||||
data.Client.SendMessage(JSONConvert.ConstructGameStartData(data.Lobby.ID));
|
||||
}
|
||||
|
||||
@@ -79,7 +93,7 @@ namespace Client.ViewModels
|
||||
private void CanvasResetLocal()
|
||||
{
|
||||
this.window.CanvasForPaint.Children.Clear();
|
||||
data.Client.SendMessage(JSONConvert.GetMessageToSend(JSONConvert.CANVAS, JSONConvert.CanvasInfo.RESET));
|
||||
data.Client.SendMessage(JSONConvert.GetMessageToSend(JSONConvert.CANVAS, JSONConvert.CANVAS_RESET));
|
||||
}
|
||||
|
||||
|
||||
@@ -109,9 +123,33 @@ namespace Client.ViewModels
|
||||
coordinates[2] = line.X2;
|
||||
coordinates[3] = line.Y2;
|
||||
currentPoint = e.GetPosition(window.CanvasForPaint);
|
||||
buffer[pos] = coordinates;
|
||||
pos++;
|
||||
|
||||
window.CanvasForPaint.Children.Add(line);
|
||||
data.Client.SendMessage(JSONConvert.ConstructCanvasDataSend(JSONConvert.CanvasInfo.DRAWING,coordinates, color));
|
||||
if (pos == maxLines)
|
||||
{
|
||||
double[][] temp = new double[maxLines][];
|
||||
for (int i = 0; i < maxLines; i++)
|
||||
{
|
||||
temp[i] = buffer[i];
|
||||
}
|
||||
linesQueue.Enqueue(temp);
|
||||
Array.Clear(buffer, 0, buffer.Length);
|
||||
pos = 0;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private void sendArrayFromQueue(object sender, ElapsedEventArgs e)
|
||||
{
|
||||
|
||||
if (linesQueue.Count != 0)
|
||||
{
|
||||
Debug.WriteLine("[GAME] sending canvas data...");
|
||||
double[][] temp = linesQueue.Dequeue();
|
||||
data.Client.SendMessage(JSONConvert.GetMessageToSend(JSONConvert.CANVAS, JSONConvert.ConstructDrawingCanvasData(temp,color)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -125,17 +163,20 @@ namespace Client.ViewModels
|
||||
color = colorSelected;
|
||||
}
|
||||
|
||||
private void UpdateCanvasWithNewData(double[] coordinates, Color color)
|
||||
private void UpdateCanvasWithNewData(double[][] buffer, Color color)
|
||||
{
|
||||
Application.Current.Dispatcher.Invoke(delegate
|
||||
{
|
||||
Line line = new Line();
|
||||
line.Stroke = new SolidColorBrush(color);
|
||||
line.X1 = coordinates[0];
|
||||
line.Y1 = coordinates[1];
|
||||
line.X2 = coordinates[2];
|
||||
line.Y2 = coordinates[3];
|
||||
this.window.CanvasForPaint.Children.Add(line);
|
||||
foreach (double[] arr in buffer)
|
||||
{
|
||||
Line line = new Line();
|
||||
line.Stroke = new SolidColorBrush(color);
|
||||
line.X1 = arr[0];
|
||||
line.Y1 = arr[1];
|
||||
line.X2 = arr[2];
|
||||
line.Y2 = arr[3];
|
||||
this.window.CanvasForPaint.Children.Add(line);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user