sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
Conversation 0 Commits 229 Files Changed 107 +4 -3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f31cdeb467 - Show all commits

3
Client/Client.cs
View File

@@ -103,14 +103,17 @@ namespace Client
} }
break; break;
case DataParser.START_SESSION: case DataParser.START_SESSION:
Console.WriteLine("Start session identifier");
this.sessionRunning = true; this.sessionRunning = true;
sendMessage(DataParser.getStartSessionJson()); sendMessage(DataParser.getStartSessionJson());
break; break;
case DataParser.STOP_SESSION: case DataParser.STOP_SESSION:
Console.WriteLine("Stop session identifier");
this.sessionRunning = false; this.sessionRunning = false;
sendMessage(DataParser.getStopSessionJson()); sendMessage(DataParser.getStopSessionJson());
break; break;
case DataParser.SET_RESISTANCE: case DataParser.SET_RESISTANCE:
Console.WriteLine("Set resistance identifier");
if (this.handler == null) if (this.handler == null)
{ {
Console.WriteLine("handler is null"); Console.WriteLine("handler is null");

4
RH-Engine/Program.cs
View File

@@ -226,7 +226,6 @@ namespace RH_Engine
<<<<<<< HEAD
//Console.WriteLine("id of head " + GetId(Command.STANDARD_HEAD, stream, mainCommand)); //Console.WriteLine("id of head " + GetId(Command.STANDARD_HEAD, stream, mainCommand));
//command = mainCommand.AddModel("car", "data\\customModels\\TeslaRoadster.fbx"); //command = mainCommand.AddModel("car", "data\\customModels\\TeslaRoadster.fbx");
@@ -245,9 +244,8 @@ namespace RH_Engine
// Console.WriteLine("Color panel: " + ReadPrefMessage(stream)); // Console.WriteLine("Color panel: " + ReadPrefMessage(stream));
// WriteTextMessage(stream, mainCommand.SwapPanel(uuidPanel)); // WriteTextMessage(stream, mainCommand.SwapPanel(uuidPanel));
// Console.WriteLine("Swap panel: " + ReadPrefMessage(stream)); // Console.WriteLine("Swap panel: " + ReadPrefMessage(stream));
=======
Console.WriteLine("id of head " + GetId(Command.STANDARD_HEAD, stream, mainCommand)); Console.WriteLine("id of head " + GetId(Command.STANDARD_HEAD, stream, mainCommand));
>>>>>>> develop
} }
/// <summary> /// <summary>