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

Merge branch 'master' into setupBranch

Browse Source
This commit is contained in:
Lars
2020-10-22 15:46:20 +02:00
parent cac0fdc0a4 d4d0545f0b
commit 1fdba622cc
10 changed files with 595 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Client/ViewModels/ViewModel.cs
View File

@@ -37,6 +37,7 @@ namespace Client
_lobbies = new ObservableCollection<Lobby>();
client = ClientData.Instance.Client;
client.OnLobbiesListReceived = updateLobbies;
client.OnLobbyLeave = leaveLobby;
OnHostButtonClick = new RelayCommand(hostGame);
@@ -44,6 +45,13 @@ namespace Client
JoinSelectedLobby = new RelayCommand(joinLobby, true);
}
private void leaveLobby(int id)
{
_model.CanStartGame = true;
ClientData.Instance.Lobby = null;
SelectedLobby = null;
}
private void hostGame()
{
Debug.WriteLine("attempting to host game for " + ClientData.Instance.User.Username);
@@ -94,8 +102,9 @@ namespace Client
}
private void OnLobbyJoinSuccess()
private void OnLobbyJoinSuccess(bool isHost)
{
ClientData.Instance.User.Host = isHost;
startGameInLobby();
}
@@ -107,19 +116,6 @@ namespace Client
Lobby[] lobbiesArr = client.Lobbies;
Application.Current.Dispatcher.Invoke(delegate
{
//for (int i = 0; i < lobbiesArr.Length; i++)
//{
// Lobby lobby = lobbiesArr[i];
// Debug.WriteLine(lobby.PlayersIn);
// if (i < _lobbies.Count && _lobbies[i].ID == lobby.ID)
// {
// _lobbies[i].Set(lobby);
// } else
// {
// _lobbies.Add(lobbiesArr[i]);
// }
//}
_lobbies.Clear();

24
Client/ViewModels/ViewModelGame.cs
View File

@@ -4,6 +4,7 @@ using GalaSoft.MvvmLight.Command;
using SharedClientServer;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Diagnostics;
using System.Windows;
using System.Windows.Input;
using System.Windows.Media;
@@ -18,10 +19,14 @@ namespace Client.ViewModels
private GameWindow window;
private Point currentPoint = new Point();
private Color color;
private dynamic _payload;
private string _username;
private string _message;
public static ObservableCollection<string> Messages { get; } = new ObservableCollection<string>();
private dynamic _payload;
public string _username;
public string _message;
public string Message
{
get
@@ -150,6 +155,19 @@ namespace Client.ViewModels
data.Client.SendMessage(JSONConvert.GetMessageToSend(JSONConvert.MESSAGE, _payload));
}
public static void HandleIncomingMsg(string username, string message)
{
Application.Current.Dispatcher.Invoke(delegate
{
Messages.Add($"{username}: {message}");
});
}
public void LeaveGame(object sender, System.ComponentModel.CancelEventArgs e)
{
Debug.WriteLine("Leaving...");
data.Client.SendMessage(JSONConvert.ConstructLobbyLeaveMessage(data.Lobby.ID));
}
}
}