Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop

This commit is contained in:
Sem van der Hoeven
2020-09-18 12:53:17 +02:00
2 changed files with 31 additions and 18 deletions

View File

@@ -74,10 +74,10 @@ namespace RH_Engine
{ {
model = new model = new
{ {
file = "\\data\\NetworkEngine\\models\\bike\\bikee.fbx", file = "data\\NetworkEngine\\models\\bike\\bike.fbx",
cullbackfaces = true, cullbackfaces = true,
animated = false, animated = false,
animation = "\\data\\NetworkEngine\\models\\bike\\bike_anim.fbx" animation = "data\\NetworkEngine\\models\\bike\\bike_anim.fbx"
}, },
} }
} }
@@ -86,6 +86,7 @@ namespace RH_Engine
return JsonConvert.SerializeObject(Payload(payload)); return JsonConvert.SerializeObject(Payload(payload));
} }
public string RouteCommand() public string RouteCommand()
{ {
return ""; return "";
@@ -132,7 +133,8 @@ namespace RH_Engine
dynamic payload = new dynamic payload = new
{ {
id = "scene/skybox/settime", id = "scene/skybox/settime",
data = new { data = new
{
time = timeToSet time = timeToSet
} }

View File

@@ -13,12 +13,13 @@ namespace RH_Engine
internal class Program internal class Program
{ {
private static PC[] PCs = { private static PC[] PCs = {
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("DESKTOP-TV73FKO", "Wouter"), //new PC("DESKTOP-TV73FKO", "Wouter"),
new PC("NA", "Ralf"), //new PC("NA", "Ralf"),
new PC("NA", "Bart") }; //new PC("NA", "Bart")
};
private static void Main(string[] args) private static void Main(string[] args)
{ {
TcpClient client = new TcpClient("145.48.6.10", 6666); TcpClient client = new TcpClient("145.48.6.10", 6666);
@@ -95,15 +96,25 @@ namespace RH_Engine
//string command = createGraphics.TerrainCommand(new int[] { 256, 256 }, heigths); //string command = createGraphics.TerrainCommand(new int[] { 256, 256 }, heigths);
string groundId = GetId(CreateGraphics.STANDARD_SUN, stream, createGraphics); string groundId = GetId("GroundPlane", stream, createGraphics);
Console.WriteLine("id: " + groundId); Console.WriteLine("ground id: " + groundId);
string command = createGraphics.DeleteGroundPaneCommand(groundId); string command;
//command = createGraphics.DeleteGroundPaneCommand(groundId);
//string command = createGraphics.ResetScene(); //string command = createGraphics.ResetScene();
command = createGraphics.SkyboxCommand(DateTime.Now.Millisecond % 24);
Console.WriteLine("tunnelID is: " + tunnelID); Console.WriteLine("tunnelID is: " + tunnelID);
WriteTextMessage(stream, command); WriteTextMessage(stream, command);
Console.WriteLine(ReadPrefMessage(stream)); Console.WriteLine(ReadPrefMessage(stream));
command = createGraphics.ModelCommand();
WriteTextMessage(stream, command);
Console.WriteLine(ReadPrefMessage(stream));
} }
/// <summary> /// <summary>