sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] fix double drawing

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-10-23 20:33:47 +02:00
parent 3c0f5018db
commit 3015c0312f
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Client/ViewModels/ViewModelGame.cs
View File

@@ -75,8 +75,13 @@ namespace Client.ViewModels
data.Client.IncomingPlayer = HandleIncomingPlayer; data.Client.IncomingPlayer = HandleIncomingPlayer;
data.Client.UpdateUserScores = UpdateUserScores; data.Client.UpdateUserScores = UpdateUserScores;
Application.Current.Dispatcher.Invoke(delegate
{
Messages.Clear();
});
queueTimer = new Timer(50);
queueTimer = new Timer(50);
queueTimer.Start(); queueTimer.Start();
queueTimer.Elapsed += sendArrayFromQueue; queueTimer.Elapsed += sendArrayFromQueue;
} }

3
Server/Models/ServerClient.cs
View File

@@ -176,7 +176,8 @@ namespace Server.Models
coords = JSONConvert.getCoordinates(payload), coords = JSONConvert.getCoordinates(payload),
color = JSONConvert.getCanvasDrawingColor(payload) color = JSONConvert.getCanvasDrawingColor(payload)
}; };
serverCom.SendToLobby(serverCom.GetLobbyForUser(User),JSONConvert.GetMessageToSend(JSONConvert.CANVAS,canvasData)); //serverCom.SendToLobby(serverCom.GetLobbyForUser(User),JSONConvert.GetMessageToSend(JSONConvert.CANVAS,canvasData));
serverCom.SendCanvasDataToLobby(serverCom.GetLobbyForUser(User), User.Username, JSONConvert.GetMessageToSend(JSONConvert.CANVAS, canvasData));
break; break;
case JSONConvert.CANVAS_RESET: case JSONConvert.CANVAS_RESET:

3
Server/Models/ServerCommunication.cs
View File

@@ -174,7 +174,8 @@ namespace Server.Models
{ {
foreach (ServerClient sc in serverClientsInlobbies[l]) foreach (ServerClient sc in serverClientsInlobbies[l])
{ {
sc.sendMessage(message); if (sc.User.Username != username)
sc.sendMessage(message);
} }
break; break;
} }