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

[FIX] fixed the panel not showing, it was because of the animation. removed it for now and it works

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-10-29 17:09:20 +01:00
parent 1c7f9cf70a
commit 1f163325cf
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ClientApp/Utils/EngineConnection.cs
View File

@@ -236,7 +236,7 @@ namespace ClientApp.Utils
Write("Starting route follow..."); Write("Starting route follow...");
FollowingRoute = true; FollowingRoute = true;
SendMessageAndOnResponse(mainCommand.AddBikeModelAnim("bikeID", 0.01f), "bikeID", SendMessageAndOnResponse(mainCommand.AddBikeModel("bikeID"), "bikeID",
(message) => (message) =>
{ {
bikeId = JSONParser.GetResponseUuid(message); bikeId = JSONParser.GetResponseUuid(message);

2
RH-Engine/Command.cs
View File

@@ -124,11 +124,13 @@ namespace RH_Engine
position = new float[] position = new float[]
{ {
-1.5f, 1f, 0f -1.5f, 1f, 0f
//0f,0f,0f
}, },
scale = 1, scale = 1,
rotation = new int[] rotation = new int[]
{ {
-30, 90,0 -30, 90,0
//0,0,0
} }
}, },
panel = new panel = new

37
RH-Engine/Program.cs
View File

@@ -19,9 +19,9 @@ namespace RH_Engine
//new PC("DESKTOP-M2CIH87", "Fabian"), //new PC("DESKTOP-M2CIH87", "Fabian"),
//new PC("T470S", "Shinichi"), //new PC("T470S", "Shinichi"),
//new PC("DESKTOP-DHS478C", "semme"), //new PC("DESKTOP-DHS478C", "semme"),
//new PC("HP-ZBOOK-SEM", "Sem"), new PC("HP-ZBOOK-SEM", "Sem"),
//new PC("DESKTOP-TV73FKO", "Wouter"), //new PC("DESKTOP-TV73FKO", "Wouter"),
new PC("DESKTOP-SINMKT1", "Ralf van Aert"), //new PC("DESKTOP-SINMKT1", "Ralf van Aert"),
//new PC("NA", "Bart") //new PC("NA", "Bart")
}; };
@@ -94,7 +94,7 @@ namespace RH_Engine
if (serialResponses.ContainsKey(serial)) if (serialResponses.ContainsKey(serial))
{ {
serialResponses[serial].Invoke(message); serialResponses[serial].Invoke(message);
serialResponses.Remove(serial); //serialResponses.Remove(serial);
} }
} }
} }
@@ -181,39 +181,41 @@ namespace RH_Engine
//Force(stream, mainCommand.DeleteNode(handRightId, "deleteHandR"), "deleteHandR", (message) => Console.WriteLine("Right hand deleted")); //Force(stream, mainCommand.DeleteNode(handRightId, "deleteHandR"), "deleteHandR", (message) => Console.WriteLine("Right hand deleted"));
}); });
CreateTerrain(stream, mainCommand); //CreateTerrain(stream, mainCommand);
//Add route, bike and put camera and bike to follow route at same speed. //Add route, bike and put camera and bike to follow route at same speed.
SendMessageAndOnResponse(stream, mainCommand.RouteCommand("routeID"), "routeID", (message) => routeId = JSONParser.GetResponseUuid(message)); //SendMessageAndOnResponse(stream, mainCommand.RouteCommand("routeID"), "routeID", (message) => routeId = JSONParser.GetResponseUuid(message));
SendMessageAndOnResponse(stream, mainCommand.AddBikeModelAnim("bikeID",0.01f), "bikeID", SendMessageAndOnResponse(stream, mainCommand.AddBikeModelAnim("bikeID",0.01f), "bikeID",
(message) => (message) =>
{ {
bikeId = JSONParser.GetResponseUuid(message); bikeId = JSONParser.GetResponseUuid(message);
Console.WriteLine("got bike id " + bikeId);
SendMessageAndOnResponse(stream, mainCommand.addPanel("panelAdd", bikeId), "panelAdd", SendMessageAndOnResponse(stream, mainCommand.addPanel("panelAdd", bikeId), "panelAdd",
(message) => (message) =>
{ {
bool speedReplied = false; bool speedReplied = false;
bool moveReplied = true; bool moveReplied = true;
Console.WriteLine(message);
panelId = JSONParser.getPanelID(message); panelId = JSONParser.getPanelID(message);
Console.WriteLine("got panel id " + panelId);
showPanel(stream, mainCommand); showPanel(stream, mainCommand);
//while (!(speedReplied && moveReplied)) { } //while (!(speedReplied && moveReplied)) { }
while (cameraId == string.Empty) { } //while (cameraId == string.Empty) { }
SetFollowSpeed(5.0f, stream, mainCommand); //SetFollowSpeed(5.0f, stream, mainCommand);
WriteTextMessage(stream, mainCommand.RoadCommand(routeId, "road")); //WriteTextMessage(stream, mainCommand.RoadCommand(routeId, "road"));
WriteTextMessage(stream, mainCommand.ShowRoute("showRouteFalse", false)); //WriteTextMessage(stream, mainCommand.ShowRoute("showRouteFalse", false));
}); });
}); });
string groundplaneId = GetId("GroundPlane", stream, mainCommand); //string groundplaneId = GetId("GroundPlane", stream, mainCommand);
WriteTextMessage(stream, mainCommand.DeleteNode(groundplaneId, "none")); //WriteTextMessage(stream, mainCommand.DeleteNode(groundplaneId, "none"));
PlaceHouses(stream, mainCommand); //PlaceHouses(stream, mainCommand);
WriteTextMessage(stream, mainCommand.SkyboxCommand(DateTime.Now.Hour)); //WriteTextMessage(stream, mainCommand.SkyboxCommand(DateTime.Now.Hour));
} }
@@ -343,31 +345,36 @@ namespace RH_Engine
private static void showPanel(NetworkStream stream, Command mainCommand) private static void showPanel(NetworkStream stream, Command mainCommand)
{ {
WriteTextMessage(stream, mainCommand.ColorPanel(panelId)); //WriteTextMessage(stream, mainCommand.ColorPanel(panelId));
WriteTextMessage(stream, mainCommand.ClearPanel(panelId)); WriteTextMessage(stream, mainCommand.ClearPanel(panelId));
SendMessageAndOnResponse(stream, mainCommand.showBikespeed(panelId, "bikeSpeed", bikeSpeed), "bikeSpeed", SendMessageAndOnResponse(stream, mainCommand.showBikespeed(panelId, "bikeSpeed", bikeSpeed), "bikeSpeed",
(message) => (message) =>
{ {
Console.WriteLine(message);
// TODO check if is drawn // TODO check if is drawn
}); });
SendMessageAndOnResponse(stream, mainCommand.showHeartrate(panelId, "bpm", bpm), "bpm", SendMessageAndOnResponse(stream, mainCommand.showHeartrate(panelId, "bpm", bpm), "bpm",
(message) => (message) =>
{ {
Console.WriteLine(message);
// TODO check if is drawn // TODO check if is drawn
}); });
SendMessageAndOnResponse(stream, mainCommand.showPower(panelId, "power", power), "power", SendMessageAndOnResponse(stream, mainCommand.showPower(panelId, "power", power), "power",
(message) => (message) =>
{ {
Console.WriteLine(message);
// TODO check if is drawn // TODO check if is drawn
}); });
SendMessageAndOnResponse(stream, mainCommand.showResistance(panelId, "resistance", resistance), "resistance", SendMessageAndOnResponse(stream, mainCommand.showResistance(panelId, "resistance", resistance), "resistance",
(message) => (message) =>
{ {
Console.WriteLine(message);
// TODO check if is drawn // TODO check if is drawn
}); });
SendMessageAndOnResponse(stream, mainCommand.showMessage(panelId, "message", lastMessage), "message", SendMessageAndOnResponse(stream, mainCommand.showMessage(panelId, "message", lastMessage), "message",
(message) => (message) =>
{ {
Console.WriteLine(message);
// TODO check if is drawn // TODO check if is drawn
}); });