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

RH-Engine/CreateGraphics.cs

@@ -37,11 +37,54 @@ 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()
         {
-            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(string uuid)

RH-Engine/Program.cs

@@ -13,6 +13,14 @@ namespace RH_Engine
     internal class Program
     {
         private static PC[] PCs = {
+<<<<<<< HEAD
+            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") };
+=======
             //new PC("DESKTOP-M2CIH87", "Fabian"),
             //new PC("T470S", "Shinichi"),
             new PC("DESKTOP-DHS478C", "semme"),
@@ -20,6 +28,7 @@ namespace RH_Engine
             //new PC("NA", "Ralf"),
             //new PC("NA", "Bart") 
         };
+>>>>>>> 8fd3322c63830c7f5cc7668ffd49e8203dbe1a95
         private static void Main(string[] args)
         {
             TcpClient client = new TcpClient("145.48.6.10", 6666);
@@ -88,24 +97,20 @@ namespace RH_Engine
             }
 
             CreateGraphics createGraphics = new CreateGraphics(tunnelID);
-            //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;
-            //command = createGraphics.DeleteGroundPaneCommand(groundId);
-            //string command = createGraphics.ResetScene();
             command = createGraphics.SkyboxCommand(DateTime.Now.Millisecond % 24);
+
             Console.WriteLine("tunnelID is: " + tunnelID);
 
-            WriteTextMessage(stream, command);
+            WriteTextMessage(stream, createGraphics.TerrainCommand(new int[] { 256, 256 }, null));
+            Console.WriteLine(ReadPrefMessage(stream));
 
+            WriteTextMessage(stream, createGraphics.AddNodeCommand());
             Console.WriteLine(ReadPrefMessage(stream));
 
             command = createGraphics.ModelCommand();
@@ -115,6 +120,7 @@ namespace RH_Engine
             Console.WriteLine(ReadPrefMessage(stream));
 
 
+
         }
 
         /// <summary>