merge Setup branch into develop #1

Merged
SemvdH merged 71 commits from setupBranch into master 2020-10-21 18:59:02 +00:00
Showing only changes of commit 4f07eeb95a - Show all commits

View File

@@ -1,67 +1,67 @@
using Client.Views; using Client.Views;
using SharedClientServer; using SharedClientServer;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.ComponentModel; using System.ComponentModel;
using System.Windows; using System.Windows;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Shapes; using System.Windows.Shapes;
namespace Client.ViewModels namespace Client.ViewModels
{ {
class ViewModelGame : INotifyPropertyChanged class ViewModelGame : INotifyPropertyChanged
{ {
private ClientData data = ClientData.Instance; private ClientData data = ClientData.Instance;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
private Point currentPoint = new Point(); private Point currentPoint = new Point();
private Color color; private Color color;
public void Canvas_MouseDown(MouseButtonEventArgs e, GameWindow window) public void Canvas_MouseDown(MouseButtonEventArgs e, GameWindow window)
{ {
if (e.ButtonState == MouseButtonState.Pressed) if (e.ButtonState == MouseButtonState.Pressed)
{ {
currentPoint = e.GetPosition(window.CanvasForPaint); currentPoint = e.GetPosition(window.CanvasForPaint);
} }
} }
public void Canvas_MouseMove(MouseEventArgs e, GameWindow window) public void Canvas_MouseMove(MouseEventArgs e, GameWindow window)
{ {
if (e.LeftButton == MouseButtonState.Pressed) if (e.LeftButton == MouseButtonState.Pressed)
{ {
double[] coordinates = new double[4]; double[] coordinates = new double[4];
Line line = new Line(); Line line = new Line();
line.Stroke = new SolidColorBrush(color); line.Stroke = new SolidColorBrush(color);
//line.Stroke = SystemColors.WindowFrameBrush; //line.Stroke = SystemColors.WindowFrameBrush;
line.X1 = currentPoint.X; line.X1 = currentPoint.X;
line.Y1 = currentPoint.Y; line.Y1 = currentPoint.Y;
line.X2 = e.GetPosition(window.CanvasForPaint).X; line.X2 = e.GetPosition(window.CanvasForPaint).X;
line.Y2 = e.GetPosition(window.CanvasForPaint).Y; line.Y2 = e.GetPosition(window.CanvasForPaint).Y;
coordinates[0] = line.X1; coordinates[0] = line.X1;
coordinates[1] = line.Y1; coordinates[1] = line.Y1;
coordinates[2] = line.X2; coordinates[2] = line.X2;
coordinates[3] = line.Y2; coordinates[3] = line.Y2;
currentPoint = e.GetPosition(window.CanvasForPaint); currentPoint = e.GetPosition(window.CanvasForPaint);
window.CanvasForPaint.Children.Add(line); window.CanvasForPaint.Children.Add(line);
data.Client.SendMessage(JSONConvert.GetMessageToSend(0x04, coordinates)); data.Client.SendMessage(JSONConvert.GetMessageToSend(0x04, coordinates));
} }
} }
public void Color_Picker(RoutedPropertyChangedEventArgs<Color?> e, GameWindow window) public void Color_Picker(RoutedPropertyChangedEventArgs<Color?> e, GameWindow window)
{ {
Color colorSelected = new Color(); Color colorSelected = new Color();
colorSelected.A = 255; colorSelected.A = 255;
colorSelected.R = window.ClrPcker_Background.SelectedColor.Value.R; colorSelected.R = window.ClrPcker_Background.SelectedColor.Value.R;
colorSelected.G = window.ClrPcker_Background.SelectedColor.Value.G; colorSelected.G = window.ClrPcker_Background.SelectedColor.Value.G;
colorSelected.B = window.ClrPcker_Background.SelectedColor.Value.B; colorSelected.B = window.ClrPcker_Background.SelectedColor.Value.B;
color = colorSelected; color = colorSelected;
} }
} }
} }