From a655646e80988383cd0bc5d43b0ca48f1c4e4dda Mon Sep 17 00:00:00 2001 From: "DESKTOP-TV73FK0\\woute" Date: Fri, 18 Sep 2020 12:30:57 +0200 Subject: [PATCH 1/3] idk --- RH-Engine/CreateGraphics.cs | 17 ++++++++++++++++- RH-Engine/Program.cs | 13 +++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/RH-Engine/CreateGraphics.cs b/RH-Engine/CreateGraphics.cs index 0a3f127..95e63e7 100644 --- a/RH-Engine/CreateGraphics.cs +++ b/RH-Engine/CreateGraphics.cs @@ -32,7 +32,22 @@ namespace RH_Engine public string AddNodeCommand() { - return ""; + dynamic payload = new + { + id = "scene/node/add", + data = new + { + name = "newNode", + components = new + { + terrain = new + { + smoothnormals = true + } + } + } + }; + return JsonConvert.SerializeObject(Payload(payload)); } public string DeleteGroundPaneCommand() diff --git a/RH-Engine/Program.cs b/RH-Engine/Program.cs index 1a6577e..0091f3b 100644 --- a/RH-Engine/Program.cs +++ b/RH-Engine/Program.cs @@ -12,10 +12,10 @@ namespace RH_Engine internal class Program { private static PC[] PCs = { - new PC("DESKTOP-M2CIH87", "Fabian"), - new PC("T470S", "Shinichi"), - new PC("DESKTOP-DHS478C", "semme"), - new PC("DESKTOP-TV73FKO", "Wouter"), + new PC("DESKTOP-TV73FK0", "woute"), + //new PC("DESKTOP-M2CIH87", "Fabian"), + //new PC("T470S", "Shinichi"), + //new PC("DESKTOP-DHS478C", "semme"), new PC("NA", "Ralf"), new PC("NA", "Bart") }; private static void Main(string[] args) @@ -86,14 +86,15 @@ namespace RH_Engine } CreateGraphics createGraphics = new CreateGraphics(tunnelID); - string command = createGraphics.SkyboxCommand(2); Console.WriteLine("tunnelID is: " + tunnelID); - WriteTextMessage(stream, command); + WriteTextMessage(stream, createGraphics.TerrainCommand(new int[] { 2, 2 }, new int[] { 1, 1, 1, 1 })); Console.WriteLine(ReadPrefMessage(stream)); + WriteTextMessage(stream, createGraphics.AddNodeCommand()); + Console.WriteLine(ReadPrefMessage(stream)); } } From bc99bfd46bbe1711d0a11d2247999c7c8df8fec7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-TV73FK0\\woute" Date: Fri, 18 Sep 2020 14:16:41 +0200 Subject: [PATCH 2/3] addlayer(not finished) --- RH-Engine/CreateGraphics.cs | 30 +++++++++++++++++++++++++++++- RH-Engine/Program.cs | 24 ++++++++++-------------- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/RH-Engine/CreateGraphics.cs b/RH-Engine/CreateGraphics.cs index 96d2eca..6b37350 100644 --- a/RH-Engine/CreateGraphics.cs +++ b/RH-Engine/CreateGraphics.cs @@ -37,7 +37,35 @@ namespace RH_Engine }; return JsonConvert.SerializeObject(Payload(payload)); } - + public string AddLayer(string uid, string texture) + { + dynamic payload = new + { + id = "scene/node/addlayer", + data = new + { + id = uid, + diffuse = @"C:\Users\woute\Downloads\NetworkEngine.18.10.10.1\NetworkEngine\data\NetworkEngine\textures\terrain\adesert_cracks_d.jpg", + normal = @"C:\Users\woute\Downloads\NetworkEngine.18.10.10.1\NetworkEngine\data\NetworkEngine\textures\terrain\adesert_mntn_d.jpg", + minHeight = 0, + maxHeight = 10, + fadeDist = 1 + } + }; + return JsonConvert.SerializeObject(Payload(payload)); + } + public string UpdateTerrain() + { + dynamic payload = new + { + id = "scene/terrain/update", + data = new + { + + } + }; + return JsonConvert.SerializeObject(Payload(payload)); + } public string AddNodeCommand() { diff --git a/RH-Engine/Program.cs b/RH-Engine/Program.cs index 87be7ad..aafdbee 100644 --- a/RH-Engine/Program.cs +++ b/RH-Engine/Program.cs @@ -87,30 +87,26 @@ namespace RH_Engine } CreateGraphics createGraphics = new CreateGraphics(tunnelID); -<<<<<<< HEAD - -======= - //int[] heigths = new int[65536]; - //for(int i =0; i < heigths.Length; i++) - //{ - // heigths[i] = 0; - //} - - //string command = createGraphics.TerrainCommand(new int[] { 256, 256 }, heigths); string groundId = GetId("GroundPlane", stream, createGraphics); Console.WriteLine("ground id: " + groundId); string command = createGraphics.DeleteGroundPaneCommand(groundId); - //string command = createGraphics.ResetScene(); ->>>>>>> 0e2ee807e147b30f2517a1be463f08da41a799fd + Console.WriteLine("tunnelID is: " + tunnelID); - WriteTextMessage(stream, createGraphics.TerrainCommand(new int[] { 2, 2 }, new int[] { 1, 1, 1, 1 })); - + WriteTextMessage(stream, createGraphics.TerrainCommand(new int[] { 256, 256 }, null)); Console.WriteLine(ReadPrefMessage(stream)); + WriteTextMessage(stream, createGraphics.AddNodeCommand()); Console.WriteLine(ReadPrefMessage(stream)); + + /*String tempID = GetId("newNode", stream, createGraphics); + WriteTextMessage(stream, createGraphics.AddLayer(tempID, "")); + Console.WriteLine(ReadPrefMessage(stream)); + + WriteTextMessage(stream, createGraphics.UpdateTerrain()); + Console.WriteLine(ReadPrefMessage(stream));*/ } public static string GetId(string name, NetworkStream stream, CreateGraphics createGraphics) From 1cda95525432a4e765e35620c0dd5a13e1dc1ece Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Fri, 18 Sep 2020 14:21:33 +0200 Subject: [PATCH 3/3] pc stuff --- RH-Engine/Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RH-Engine/Program.cs b/RH-Engine/Program.cs index 2d4b2a0..077a311 100644 --- a/RH-Engine/Program.cs +++ b/RH-Engine/Program.cs @@ -14,8 +14,8 @@ namespace RH_Engine { private static PC[] PCs = { //new PC("DESKTOP-M2CIH87", "Fabian"), - new PC("T470S", "Shinichi"), - //new PC("DESKTOP-DHS478C", "semme"), + //new PC("T470S", "Shinichi"), + new PC("DESKTOP-DHS478C", "semme"), //new PC("DESKTOP-TV73FKO", "Wouter"), //new PC("NA", "Ralf"), //new PC("NA", "Bart")