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

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

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-09-18 12:53:17 +02:00
parent c82f1e9537 178bbb030c
commit 8fd3322c63
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
RH-Engine/CreateGraphics.cs
View File

@@ -16,8 +16,8 @@ namespace RH_Engine
string tunnelID;
string tunnelID;
public CreateGraphics(string tunnelID)
{
this.tunnelID = tunnelID;
@@ -53,12 +53,12 @@ namespace RH_Engine
data = new
{
id = uuid,
}
};
return JsonConvert.SerializeObject(Payload(payload));
}
public string ModelCommand()
@@ -74,10 +74,10 @@ namespace RH_Engine
{
model = new
{
file = "\\data\\NetworkEngine\\models\\bike\\bikee.fbx",
file = "data\\NetworkEngine\\models\\bike\\bike.fbx",
cullbackfaces = true,
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));
}
public string RouteCommand()
{
return "";
@@ -132,10 +133,11 @@ namespace RH_Engine
dynamic payload = new
{
id = "scene/skybox/settime",
data = new {
data = new
{
time = timeToSet
}
};
return JsonConvert.SerializeObject(Payload(payload));
@@ -154,7 +156,7 @@ namespace RH_Engine
};
}
}
}

27
RH-Engine/Program.cs
View File

@@ -13,12 +13,13 @@ namespace RH_Engine
internal class Program
{
private static PC[] PCs = {
new PC("DESKTOP-M2CIH87", "Fabian"),
//new PC("DESKTOP-M2CIH87", "Fabian"),
new PC("T470S", "Shinichi"),
new PC("DESKTOP-DHS478C", "semme"),
new PC("DESKTOP-TV73FKO", "Wouter"),
new PC("NA", "Ralf"),
new PC("NA", "Bart") };
//new PC("DESKTOP-DHS478C", "semme"),
//new PC("DESKTOP-TV73FKO", "Wouter"),
//new PC("NA", "Ralf"),
//new PC("NA", "Bart")
};
private static void Main(string[] args)
{
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 groundId = GetId(CreateGraphics.STANDARD_SUN, stream, createGraphics);
Console.WriteLine("id: " + groundId);
string command = createGraphics.DeleteGroundPaneCommand(groundId);
string groundId = GetId("GroundPlane", stream, createGraphics);
Console.WriteLine("ground id: " + groundId);
string command;
//command = createGraphics.DeleteGroundPaneCommand(groundId);
//string command = createGraphics.ResetScene();
command = createGraphics.SkyboxCommand(DateTime.Now.Millisecond % 24);
Console.WriteLine("tunnelID is: " + tunnelID);
WriteTextMessage(stream, command);
Console.WriteLine(ReadPrefMessage(stream));
command = createGraphics.ModelCommand();
WriteTextMessage(stream, command);
Console.WriteLine(ReadPrefMessage(stream));
}
/// <summary>