conflicts 2: the sequal

This commit is contained in:
Sem van der Hoeven
2020-09-18 14:26:24 +02:00
2 changed files with 29 additions and 9 deletions

View File

@@ -104,9 +104,25 @@ namespace RH_Engine
} }
public string ModelCommand() public string AddBikeModel()
{ {
string namename = "bike"; return AddModel("bike", "data\\NetworkEngine\\models\\bike\\bike.fbx", null);
}
public string AddModel(string nodeName, string fileLocation)
{
return AddModel(nodeName, fileLocation, null);
}
public string AddModel(string nodeName, string fileLocation, string animationLocation)
{
string namename = nodeName;
bool animatedBool = false;
if (animationLocation != null)
{
animatedBool = true;
}
dynamic payload = new dynamic payload = new
{ {
id = "scene/node/add", id = "scene/node/add",
@@ -117,10 +133,10 @@ namespace RH_Engine
{ {
model = new model = new
{ {
file = "data\\NetworkEngine\\models\\bike\\bike.fbx", file = fileLocation,
cullbackfaces = true, cullbackfaces = true,
animated = false, animated = animatedBool,
animation = "data\\NetworkEngine\\models\\bike\\bike_anim.fbx" animation = animationLocation
}, },
} }
} }

View File

@@ -13,15 +13,13 @@ namespace RH_Engine
internal class Program internal class Program
{ {
private static PC[] PCs = { private static PC[] PCs = {
new PC("DESKTOP-TV73FK0", "woute"), new PC("DESKTOP-TV73FK0", "woute"),
//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("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);
@@ -106,7 +104,13 @@ namespace RH_Engine
WriteTextMessage(stream, createGraphics.AddNodeCommand()); WriteTextMessage(stream, createGraphics.AddNodeCommand());
Console.WriteLine(ReadPrefMessage(stream)); Console.WriteLine(ReadPrefMessage(stream));
command = createGraphics.ModelCommand(); command = createGraphics.AddBikeModel();
WriteTextMessage(stream, command);
Console.WriteLine(ReadPrefMessage(stream));
command = createGraphics.AddModel("car", "data\\customModels\\TeslaRoadster.fbx");
WriteTextMessage(stream, command); WriteTextMessage(stream, command);