diff --git a/ClientApp/Models/Info.cs b/ClientApp/Models/Info.cs index 350d6e8..262032d 100644 --- a/ClientApp/Models/Info.cs +++ b/ClientApp/Models/Info.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Text; +using Util; namespace ClientApp.Models { diff --git a/ClientApp/Utils/Client.cs b/ClientApp/Utils/Client.cs index 3d74c8b..16527fd 100644 --- a/ClientApp/Utils/Client.cs +++ b/ClientApp/Utils/Client.cs @@ -5,6 +5,7 @@ using System.Net.Sockets; using System.Text; using ClientApp.ViewModels; using ProftaakRH; +using Util; namespace ClientApp.Utils { @@ -265,10 +266,10 @@ namespace ClientApp.Utils /// public void tryLogin(string username, string password) { - string hashUser = Hashing.Hasher.HashString(username); - string hashPassword = Hashing.Hasher.HashString(password); + + string hashPassword = Util.Hasher.HashString(password); - byte[] message = DataParser.getJsonMessage(DataParser.GetLoginJson(hashUser, hashPassword)); + byte[] message = DataParser.getJsonMessage(DataParser.GetLoginJson(username, hashPassword)); this.stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null); diff --git a/ClientApp/Utils/EngineConnection.cs b/ClientApp/Utils/EngineConnection.cs index bc7781f..ea699a3 100644 --- a/ClientApp/Utils/EngineConnection.cs +++ b/ClientApp/Utils/EngineConnection.cs @@ -3,6 +3,9 @@ using System.Collections.Generic; using System.Text; using RH_Engine; using System.Net.Sockets; +using Newtonsoft.Json.Linq; +using System.Diagnostics; +using LibNoise.Primitive; namespace ClientApp.Utils { @@ -37,6 +40,8 @@ namespace ClientApp.Utils private static string panelId = string.Empty; private static string bikeId = string.Empty; private static string headId = string.Empty; + private static string groundPlaneId = string.Empty; + private static string terrainId = string.Empty; public float BikeSpeed { get; set; } public float BikePower { get; set; } @@ -191,8 +196,11 @@ namespace ClientApp.Utils string headId = JSONParser.GetIdSceneInfoChild(message, "Head"); string handLeftId = JSONParser.GetIdSceneInfoChild(message, "LeftHand"); string handRightId = JSONParser.GetIdSceneInfoChild(message, "RightHand"); + groundPlaneId = JSONParser.GetIdSceneInfoChild(message, "GroundPlane"); + Write("--- Ground plane id is " + groundPlaneId); }); // add the route and set the route id + CreateTerrain(); SendMessageAndOnResponse(mainCommand.RouteCommand("routeID"), "routeID", (message) => routeId = JSONParser.GetResponseUuid(message)); } @@ -217,8 +225,45 @@ namespace ClientApp.Utils while (cameraId == string.Empty) { } SetFollowSpeed(5.0f); + WriteTextMessage(mainCommand.RoadCommand(routeId, "road")); + WriteTextMessage(mainCommand.ShowRoute("showRouteFalse", false)); }); }); + setEnvironment(); + + + } + + private void setEnvironment() + { + Write("Setting environment"); + WriteTextMessage(mainCommand.DeleteNode(groundPlaneId, "none")); + + PlaceHouses(); + + WriteTextMessage(mainCommand.SkyboxCommand(DateTime.Now.Hour)); + } + + private void PlaceHouses() + { + PlaceHouse(2, new float[] { 10f, 1f, 30f }, 1); + PlaceHouse(1, new float[] { 42f, 1f, 22f }, new float[] { 0f, 90f, 0f }, 2); + PlaceHouse(11, new float[] { -20f, 1f, 0f }, new float[] { 0f, -35f, 0f }, 3); + PlaceHouse(7, new float[] { -15f, 1f, 50f }, new float[] { 0f, -50f, 0f }, 4); + PlaceHouse(24, new float[] { 40f, 1f, 40f }, new float[] { 0f, 75f, 0f }, 5); + PlaceHouse(22, new float[] { 34f, 1f, -20f }, 6); + PlaceHouse(14, new float[] { 0f, 1f, -20f }, new float[] { 0f, 210f, 0f }, 7); + } + + private void PlaceHouse(int numberHousemodel, float[] position, int serialNumber) + { + PlaceHouse(numberHousemodel, position, new float[] { 0f, 0f, 0f }, serialNumber); + } + + private void PlaceHouse(int numberHousemodel, float[] position, float[] rotation, int serialNumber) + { + string folderHouses = @"data\NetworkEngine\models\houses\set1\"; + SendMessageAndOnResponse(mainCommand.AddModel("House1", "housePlacement" + serialNumber, folderHouses + "house" + numberHousemodel + ".obj", position, 4, rotation), "housePlacement" + serialNumber, (message) => Console.WriteLine(message)); } public void UpdateInfoPanel() @@ -264,6 +309,41 @@ namespace ClientApp.Utils WriteTextMessage(mainCommand.RouteFollow(routeId, cameraId, speed)); } + public void CreateTerrain() + { + float x = 0f; + float[] height = new float[256 * 256]; + ImprovedPerlin improvedPerlin = new ImprovedPerlin(0, LibNoise.NoiseQuality.Best); + for (int i = 0; i < 256 * 256; i++) + { + height[i] = improvedPerlin.GetValue(x /10, x / 10, x * 100) / 3.5f + 1; + + //if (height[i] > 1.1f) + //{ + // height[i] = height[i] * 0.8f; + //} + //else if (height[i] < 0.9f) + //{ + // height[i] = height[i] * 1.2f; + //} + x += 0.001f; + } + + SendMessageAndOnResponse(mainCommand.TerrainAdd(new int[] { 256, 256 }, height, "terrain"), "terrain", + (message) => + { + + SendMessageAndOnResponse(mainCommand.renderTerrain("renderTerrain"), "renderTerrain", + (message) => + { + terrainId = JSONParser.GetTerrainID(message); + string addLayerMsg = mainCommand.AddLayer(terrainId, "addLayer"); + SendMessageAndOnResponse(addLayerMsg, "addLayer", (message) => Console.WriteLine("")); + + }); + }); + } + #endregion #region message send/receive @@ -315,7 +395,7 @@ namespace ClientApp.Utils } public void Write(string msg) { - Console.WriteLine("[ENGINECONNECT] " + msg); + Debug.WriteLine("[ENGINECONNECT] " + msg); } } diff --git a/ClientApp/ViewModels/LoginViewModel.cs b/ClientApp/ViewModels/LoginViewModel.cs index 7adccd1..1179ec2 100644 --- a/ClientApp/ViewModels/LoginViewModel.cs +++ b/ClientApp/ViewModels/LoginViewModel.cs @@ -7,6 +7,7 @@ using System.Windows.Controls; using System.Windows.Input; using ClientApp.Utils; using GalaSoft.MvvmLight.Command; +using Util; namespace ClientApp.ViewModels { diff --git a/ClientApp/ViewModels/MainViewModel.cs b/ClientApp/ViewModels/MainViewModel.cs index d609e9a..0e5d601 100644 --- a/ClientApp/ViewModels/MainViewModel.cs +++ b/ClientApp/ViewModels/MainViewModel.cs @@ -1,14 +1,15 @@ using ClientApp.Models; using ClientApp.Utils; using GalaSoft.MvvmLight.Command; +using System.Diagnostics; using System.Windows.Input; +using Util; namespace ClientApp.ViewModels { class MainViewModel : ObservableObject { public ICommand RetryServerCommand { get; set; } - public ICommand RetryVREngineCommand { get; set; } public MainWindowViewModel MainWindowViewModel { get; set; } private Client client; @@ -24,15 +25,6 @@ namespace ClientApp.ViewModels //try connect server this.MainWindowViewModel.InfoModel.ConnectedToServer = true; }); - this.RetryVREngineCommand = new RelayCommand(() => - { - //try connect vr-engine - - this.MainWindowViewModel.InfoModel.ConnectedToVREngine = true; - this.MainWindowViewModel.InfoModel.CanConnectToVR = false; - client.engineConnection.CreateConnection(); - - }); } private void retryEngineConnection() diff --git a/ClientApp/ViewModels/MainWindowViewModel.cs b/ClientApp/ViewModels/MainWindowViewModel.cs index c46eb38..56b98c1 100644 --- a/ClientApp/ViewModels/MainWindowViewModel.cs +++ b/ClientApp/ViewModels/MainWindowViewModel.cs @@ -6,6 +6,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Text; +using Util; using System.Windows; using System.Windows.Input; diff --git a/ClientApp/Views/MainView.xaml b/ClientApp/Views/MainView.xaml index 12d31f9..8657aa0 100644 --- a/ClientApp/Views/MainView.xaml +++ b/ClientApp/Views/MainView.xaml @@ -40,12 +40,6 @@ - - diff --git a/DoctorApp/App.xaml b/DoctorApp/App.xaml new file mode 100644 index 0000000..1fcbd5c --- /dev/null +++ b/DoctorApp/App.xaml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + diff --git a/DoctorApp/App.xaml.cs b/DoctorApp/App.xaml.cs new file mode 100644 index 0000000..018bc45 --- /dev/null +++ b/DoctorApp/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace DoctorApp +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + } +} diff --git a/DoctorApp/AssemblyInfo.cs b/DoctorApp/AssemblyInfo.cs new file mode 100644 index 0000000..8b5504e --- /dev/null +++ b/DoctorApp/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/DoctorApp/DoctorApp.csproj b/DoctorApp/DoctorApp.csproj new file mode 100644 index 0000000..1dd8012 --- /dev/null +++ b/DoctorApp/DoctorApp.csproj @@ -0,0 +1,21 @@ + + + + WinExe + netcoreapp3.1 + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DoctorApp/FodyWeavers.xml b/DoctorApp/FodyWeavers.xml new file mode 100644 index 0000000..d5abfed --- /dev/null +++ b/DoctorApp/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/DoctorApp/FodyWeavers.xsd b/DoctorApp/FodyWeavers.xsd new file mode 100644 index 0000000..69dbe48 --- /dev/null +++ b/DoctorApp/FodyWeavers.xsd @@ -0,0 +1,74 @@ + + + + + + + + + + + Used to control if the On_PropertyName_Changed feature is enabled. + + + + + Used to control if the Dependent properties feature is enabled. + + + + + Used to control if the IsChanged property feature is enabled. + + + + + Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form. + + + + + Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project. + + + + + Used to control if equality checks should use the Equals method resolved from the base class. + + + + + Used to control if equality checks should use the static Equals method resolved from the base class. + + + + + Used to turn off build warnings from this weaver. + + + + + Used to turn off build warnings about mismatched On_PropertyName_Changed methods. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/DoctorApp/Models/Info.cs b/DoctorApp/Models/Info.cs new file mode 100644 index 0000000..0d39258 --- /dev/null +++ b/DoctorApp/Models/Info.cs @@ -0,0 +1,17 @@ +using DoctorApp.Utils; +using System; +using System.Collections.Generic; +using System.Text; +using Util; + +namespace DoctorApp.Models +{ + class Info : ObservableObject + { + public bool ConnectedToServer { get; set; } + public bool ConnectedToVREngine { get; set; } + public bool DoctorConnected { get; set; } + + public bool CanConnectToVR { get; set; } + } +} diff --git a/DoctorApp/Utils/Client.cs b/DoctorApp/Utils/Client.cs new file mode 100644 index 0000000..da77925 --- /dev/null +++ b/DoctorApp/Utils/Client.cs @@ -0,0 +1,270 @@ +using System; +using System.Diagnostics; +using System.Linq; +using System.Net.Sockets; +using System.Text; +using DoctorApp.ViewModels; +using ProftaakRH; +using Util; + +namespace DoctorApp.Utils +{ + public delegate void EngineCallback(); + public class Client : IDataReceiver + { + private TcpClient client; + private NetworkStream stream; + private byte[] buffer = new byte[1024]; + private bool connected; + private byte[] totalBuffer = new byte[1024]; + private int totalBufferReceived = 0; + private bool sessionRunning = false; + private IHandler handler = null; + private LoginViewModel LoginViewModel; + private MainViewModel MainViewModel; + private ClientInfoViewModel ClientInfoViewModel; + + + public Client() : this("localhost", 5555) + { + + } + + public Client(string adress, int port) + { + this.client = new TcpClient(); + this.connected = false; + client.BeginConnect(adress, port, new AsyncCallback(OnConnect), null); + } + + /// + /// callback method for when the TCP client is connected + /// + /// the result of the async read + private void OnConnect(IAsyncResult ar) + { + this.client.EndConnect(ar); + Console.WriteLine("TCP client Verbonden!"); + + this.stream = this.client.GetStream(); + + this.stream.BeginRead(this.buffer, 0, this.buffer.Length, new AsyncCallback(OnRead), null); + } + + /// + /// callback method for when there is a message read + /// + /// the result of the async read + private void OnRead(IAsyncResult ar) + { + int receivedBytes = this.stream.EndRead(ar); + + if (totalBufferReceived + receivedBytes > 1024) + { + throw new OutOfMemoryException("buffer too small"); + } + Array.Copy(buffer, 0, totalBuffer, totalBufferReceived, receivedBytes); + totalBufferReceived += receivedBytes; + + int expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0); + while (totalBufferReceived >= expectedMessageLength) + { + //volledig packet binnen + byte[] messageBytes = new byte[expectedMessageLength]; + Array.Copy(totalBuffer, 0, messageBytes, 0, expectedMessageLength); + + + byte[] payloadbytes = new byte[BitConverter.ToInt32(messageBytes, 0) - 5]; + + Array.Copy(messageBytes, 5, payloadbytes, 0, payloadbytes.Length); + + string identifier; + bool isJson = DataParser.getJsonIdentifier(messageBytes, out identifier); + if (isJson) + { + switch (identifier) + { + case DataParser.LOGIN_RESPONSE: + string responseStatus = DataParser.getResponseStatus(payloadbytes); + if (responseStatus == "OK") + { + Debug.WriteLine("Username and password correct!"); + this.LoginViewModel.setLoginStatus(true); + this.connected = true; + + } + else + { + this.LoginViewModel.setLoginStatus(false); + Debug.WriteLine($"login failed \"{responseStatus}\""); + } + break; + case DataParser.START_SESSION: + Console.WriteLine("Session started!"); + this.sessionRunning = true; + sendMessage(DataParser.getStartSessionJson()); + break; + case DataParser.STOP_SESSION: + Console.WriteLine("Stop session identifier"); + this.sessionRunning = false; + sendMessage(DataParser.getStopSessionJson()); + break; + case DataParser.SET_RESISTANCE: + Console.WriteLine("Set resistance identifier"); + if (this.handler == null) + { + Console.WriteLine("handler is null"); + sendMessage(DataParser.getSetResistanceResponseJson(false)); + } + else + { + this.handler.setResistance(DataParser.getResistanceFromJson(payloadbytes)); + sendMessage(DataParser.getSetResistanceResponseJson(true)); + } + break; + case DataParser.NEW_CONNECTION: + this.MainViewModel.NewConnectedUser(DataParser.getUsernameFromResponseJson(payloadbytes)); + break; + case DataParser.DISCONNECT: + this.MainViewModel.NewConnectedUser(DataParser.getUsernameFromResponseJson(payloadbytes)); + break; + default: + Console.WriteLine($"Received json with identifier {identifier}:\n{Encoding.ASCII.GetString(payloadbytes)}"); + break; + } + } + else if (DataParser.isRawData(messageBytes)) + { + Console.WriteLine($"Received data: {BitConverter.ToString(payloadbytes)}"); + } + + totalBufferReceived -= expectedMessageLength; + expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0); + } + + this.stream.BeginRead(this.buffer, 0, this.buffer.Length, new AsyncCallback(OnRead), null); + + } + + /// + /// starts sending a message to the server + /// + /// the message to send + private void sendMessage(byte[] message) + { + stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null); + } + + /// + /// callback method for when a message is fully written to the server + /// + /// the async result representing the asynchronous call + private void OnWrite(IAsyncResult ar) + { + this.stream.EndWrite(ar); + } + + #region interface + //maybe move this to other place + /// + /// bpm method for receiving the BPM value from the bluetooth bike or the simulation + /// + /// the message + public void BPM(byte[] bytes) + { + if (!sessionRunning) + { + return; + } + if (bytes == null) + { + throw new ArgumentNullException("no bytes"); + } + byte[] message = DataParser.GetRawDataMessage(bytes); + + + this.stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null); + } + + /// + /// method for receiving the bike message from the bluetooth bike or the simulation + /// + /// the message + public void Bike(byte[] bytes) + { + + if (!sessionRunning) + { + return; + } + if (bytes == null) + { + throw new ArgumentNullException("no bytes"); + } + byte[] message = DataParser.GetRawDataMessage(bytes); + + /* switch (bytes[0]) + { + + case 0x10: + + if (canSendToEngine) engineConnection.BikeSpeed = (bytes[4] | (bytes[5] << 8)) * 0.01f; + break; + case 0x19: + if (canSendToEngine) engineConnection.BikePower = (bytes[5]) | (bytes[6] & 0b00001111) << 8; + break; + }*/ + + + this.stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null); + } + + #endregion + + /// + /// wether or not the client stream is connected + /// + /// true if it's connected, false if not + public bool IsConnected() + { + return this.connected; + } + /// + /// tries to log in to the server by asking for a username and password + /// + public void tryLogin(string username, string password) + { + + string hashPassword = Util.Hasher.HashString(password); + + byte[] message = DataParser.getJsonMessage(DataParser.LoginAsDoctor(username, hashPassword)); + + + this.stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null); + } + + /// + /// sets the handler for the client, so either the bike simulator or the bluetooth bike handler + /// + /// + public void SetHandler(IHandler handler) + { + this.handler = handler; + } + + internal void SetLoginViewModel(LoginViewModel loginViewModel) + { + this.LoginViewModel = loginViewModel; + } + + internal void SetMainViewModel(MainViewModel mainViewModel) + { + this.MainViewModel = mainViewModel; + } + + internal void SetClientInfoViewModel(ClientInfoViewModel clientInfoViewModel) + { + this.ClientInfoViewModel = clientInfoViewModel; + } + } +} diff --git a/DoctorApp/ViewModels/ClientInfoViewModel.cs b/DoctorApp/ViewModels/ClientInfoViewModel.cs new file mode 100644 index 0000000..54d2df0 --- /dev/null +++ b/DoctorApp/ViewModels/ClientInfoViewModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace DoctorApp.ViewModels +{ + + class ClientInfoViewModel + { + public string Username { get; set; } + public string TabName { get; set; } + } +} diff --git a/DoctorApp/ViewModels/LoginViewModel.cs b/DoctorApp/ViewModels/LoginViewModel.cs new file mode 100644 index 0000000..1c9e18a --- /dev/null +++ b/DoctorApp/ViewModels/LoginViewModel.cs @@ -0,0 +1,47 @@ + +using DoctorApp.Utils; +using GalaSoft.MvvmLight.Command; +using System; +using System.Collections.Generic; +using System.Text; +using System.Windows.Controls; +using System.Windows.Input; +using Util; + +namespace DoctorApp.ViewModels +{ + class LoginViewModel : ObservableObject + { + public string Username { get; set; } + public ICommand LoginCommand { get; set; } + + public bool LoginStatus { get; set; } + + public bool InvertedLoginStatus { get; set; } + + private MainWindowViewModel mainWindowViewModel; + public LoginViewModel(MainWindowViewModel mainWindowViewModel) + { + this.mainWindowViewModel = mainWindowViewModel; + LoginCommand = new RelayCommand((parameter) => + { + //TODO send username and password to server + this.mainWindowViewModel.client.tryLogin(Username, ((PasswordBox)parameter).Password); + }); + } + + + + internal void setLoginStatus(bool status) + { + this.mainWindowViewModel.InfoModel.ConnectedToServer = status; + this.InvertedLoginStatus = !status; + if (status) + { + MainViewModel mainViewModel = new MainViewModel(mainWindowViewModel); + this.mainWindowViewModel.client.SetMainViewModel(mainViewModel); + this.mainWindowViewModel.SelectedViewModel = mainViewModel; + } + } + } +} diff --git a/DoctorApp/ViewModels/MainViewModel.cs b/DoctorApp/ViewModels/MainViewModel.cs new file mode 100644 index 0000000..2b34b32 --- /dev/null +++ b/DoctorApp/ViewModels/MainViewModel.cs @@ -0,0 +1,46 @@ +using DoctorApp.Utils; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel; +using System.Text; +using System.Windows.Controls; +using Util; + +namespace DoctorApp.ViewModels +{ + class MainViewModel : ObservableObject + { + public ObservableCollection Tabs { get; set; } + public int Selected { get; set; } + public MainWindowViewModel MainWindowViewModel { get; set; } + + Client client; + + public MainViewModel(MainWindowViewModel mainWindowViewModel) + { + this.MainWindowViewModel = mainWindowViewModel; + client = this.MainWindowViewModel.client; + Tabs= new ObservableCollection(); + } + + public void NewConnectedUser(string username) + { + App.Current.Dispatcher.Invoke((Action)delegate + { + Tabs.Add(new ClientInfoViewModel + { + Username = username, + TabName = username + }); + }); + } + + public void DisconnectedUser(string username) + { + + } + } + + +} diff --git a/DoctorApp/ViewModels/MainWindowViewModel.cs b/DoctorApp/ViewModels/MainWindowViewModel.cs new file mode 100644 index 0000000..fa7a982 --- /dev/null +++ b/DoctorApp/ViewModels/MainWindowViewModel.cs @@ -0,0 +1,26 @@ +using DoctorApp.Models; +using DoctorApp.Utils; +using System; +using System.Collections.Generic; +using System.Text; +using Util; + +namespace DoctorApp.ViewModels +{ + class MainWindowViewModel : ObservableObject + { + public Info InfoModel { get; set; } + + public ObservableObject SelectedViewModel { get; set; } + public Client client { get; } + + public MainWindowViewModel(Client client) + { + this.InfoModel = new Info(); + this.client = client; + LoginViewModel loginViewModel = new LoginViewModel(this); + SelectedViewModel = loginViewModel; + this.client.SetLoginViewModel(loginViewModel); + } + } +} diff --git a/DoctorApp/Views/ClientInfoView.xaml b/DoctorApp/Views/ClientInfoView.xaml new file mode 100644 index 0000000..29eda51 --- /dev/null +++ b/DoctorApp/Views/ClientInfoView.xaml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +