From 36a01772703f64bd7a4a3dd3c6525684e4fb4206 Mon Sep 17 00:00:00 2001 From: Logophilist Date: Fri, 18 Sep 2020 14:54:13 +0200 Subject: [PATCH 1/2] routecommand attempt1 --- RH-Engine/CreateGraphics.cs | 56 +++++++++++++++++++++++++++++++++++-- RH-Engine/Program.cs | 8 +++--- RH-Engine/RH-Engine.csproj | 1 + 3 files changed, 59 insertions(+), 6 deletions(-) diff --git a/RH-Engine/CreateGraphics.cs b/RH-Engine/CreateGraphics.cs index 062908c..b33c3f8 100644 --- a/RH-Engine/CreateGraphics.cs +++ b/RH-Engine/CreateGraphics.cs @@ -1,8 +1,10 @@ -using Newtonsoft.Json; +using LibNoise.Primitive; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.IO; using System.Text; +using System.Threading; namespace RH_Engine { @@ -148,7 +150,57 @@ namespace RH_Engine public string RouteCommand() { - return ""; + ImprovedPerlin improvedPerlin = new ImprovedPerlin(0, LibNoise.NoiseQuality.Best); + + dynamic payload = new + { + id = "route/add", + data = new + { + nodes = new dynamic[] + { + new + { + pos = GetPos(0, improvedPerlin), + dir = GetDir() + }, + new + { + pos = GetPos(1, improvedPerlin), + dir = GetDir() + }, + new + { + pos = GetPos(2, improvedPerlin), + dir = GetDir() + }, + new + { + pos = GetPos(3, improvedPerlin), + dir = GetDir() + }, + new + { + pos = GetPos(4, improvedPerlin), + dir = GetDir() + } + } + } + }; + Console.WriteLine(JsonConvert.SerializeObject(Payload(payload))); + return JsonConvert.SerializeObject(Payload(payload)); + } + + private int[] GetPos(int n, ImprovedPerlin improvedPerlin) + { + return new int[] { (int)improvedPerlin.GetValue(n) * 50 * n, 0, (int)improvedPerlin.GetValue(n) * 50 }; + } + + private int[] GetDir() + { + Random rng = new Random(); + int[] dir = {rng.Next(5), rng.Next(5), rng.Next(5)}; + return dir; } public string FollowRouteCommand() diff --git a/RH-Engine/Program.cs b/RH-Engine/Program.cs index fe8a35f..81199ab 100644 --- a/RH-Engine/Program.cs +++ b/RH-Engine/Program.cs @@ -13,11 +13,11 @@ namespace RH_Engine internal class Program { private static PC[] PCs = { - //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("T470S", "Shinichi"), + new PC("DESKTOP-DHS478C", "semme"), + //new PC("DESKTOP-TV73FKO", "Wouter"), + new PC("DESKTOP-SINMKT1", "Ralf"), new PC("NA", "Bart") }; private static void Main(string[] args) { diff --git a/RH-Engine/RH-Engine.csproj b/RH-Engine/RH-Engine.csproj index 7d2f521..bb56f7b 100644 --- a/RH-Engine/RH-Engine.csproj +++ b/RH-Engine/RH-Engine.csproj @@ -7,6 +7,7 @@ + From 6eb2ac1a8289b4cf1834455ccdb4774ff97a3648 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Fri, 18 Sep 2020 15:33:04 +0200 Subject: [PATCH 2/2] added route --- RH-Engine/CreateGraphics.cs | 37 +++++++++++++++++++++---------------- RH-Engine/Program.cs | 34 +++++++++++++++++----------------- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/RH-Engine/CreateGraphics.cs b/RH-Engine/CreateGraphics.cs index b33c3f8..a76fd1b 100644 --- a/RH-Engine/CreateGraphics.cs +++ b/RH-Engine/CreateGraphics.cs @@ -150,8 +150,8 @@ namespace RH_Engine public string RouteCommand() { - ImprovedPerlin improvedPerlin = new ImprovedPerlin(0, LibNoise.NoiseQuality.Best); - + ImprovedPerlin improvedPerlin = new ImprovedPerlin(4325, LibNoise.NoiseQuality.Best); + Random r = new Random(); dynamic payload = new { id = "route/add", @@ -161,45 +161,50 @@ namespace RH_Engine { new { - pos = GetPos(0, improvedPerlin), - dir = GetDir() + /*pos = GetPos(0.6f, improvedPerlin)*/ + pos = new int[] {0,0,5 }, + dir = new int[] { r.Next(20,100),0,-r.Next(20, 100) } }, new { - pos = GetPos(1, improvedPerlin), - dir = GetDir() + //pos = GetPos(1.6f, improvedPerlin), + pos = new int[] {50,0,0 }, + dir = new int[] { r.Next(20, 100),0,r.Next(20, 100) } }, new { - pos = GetPos(2, improvedPerlin), - dir = GetDir() + //pos = GetPos(2.654f, improvedPerlin), + pos = new int[] {20,0,20 }, + dir = new int[] { r.Next(20, 100),0,r.Next(20, 100) } }, new { - pos = GetPos(3, improvedPerlin), - dir = GetDir() + //pos = GetPos(3.6543f, improvedPerlin), + pos = new int[] {10,0,50 }, + dir = new int[] { -r.Next(3,7),0,r.Next(3,7) } }, new { - pos = GetPos(4, improvedPerlin), - dir = GetDir() + pos = new int[] {0,0,50 }, + dir = new int[] { -r.Next(20, 50),0,-r.Next(20, 50) } } } } }; - Console.WriteLine(JsonConvert.SerializeObject(Payload(payload))); + Console.WriteLine("route command: " + JsonConvert.SerializeObject(Payload(payload))); return JsonConvert.SerializeObject(Payload(payload)); } - private int[] GetPos(int n, ImprovedPerlin improvedPerlin) + private float[] GetPos(float n, ImprovedPerlin improvedPerlin) { - return new int[] { (int)improvedPerlin.GetValue(n) * 50 * n, 0, (int)improvedPerlin.GetValue(n) * 50 }; + float[] res = new float[] { improvedPerlin.GetValue(n) * 50, 0, improvedPerlin.GetValue(n) * 50 }; + return res; } private int[] GetDir() { Random rng = new Random(); - int[] dir = {rng.Next(5), rng.Next(5), rng.Next(5)}; + int[] dir = {rng.Next(50), 0, rng.Next(50)}; return dir; } diff --git a/RH-Engine/Program.cs b/RH-Engine/Program.cs index 81199ab..a3f054a 100644 --- a/RH-Engine/Program.cs +++ b/RH-Engine/Program.cs @@ -107,31 +107,31 @@ namespace RH_Engine Console.WriteLine(ReadPrefMessage(stream)); + WriteTextMessage(stream, createGraphics.RouteCommand()); + //string groundId = GetId("GroundPlane", stream, createGraphics); + //Console.WriteLine("ground id: " + groundId); - string groundId = GetId("GroundPlane", stream, createGraphics); - Console.WriteLine("ground id: " + groundId); + //WriteTextMessage(stream, createGraphics.SkyboxCommand(DateTime.Now.Millisecond % 24)); - WriteTextMessage(stream, createGraphics.SkyboxCommand(DateTime.Now.Millisecond % 24)); - - Console.WriteLine(ReadPrefMessage(stream)); + //Console.WriteLine(ReadPrefMessage(stream)); - Console.WriteLine("tunnelID is: " + tunnelID); + //Console.WriteLine("tunnelID is: " + tunnelID); - float[] heights = new float[65536]; - Random random = new Random(); - for (int i = 0; i < heights.Length; i++) - { - heights[i] = (float)random.NextDouble(); - } + //float[] heights = new float[65536]; + //Random random = new Random(); + //for (int i = 0; i < heights.Length; i++) + //{ + // heights[i] = (float)random.NextDouble(); + //} - WriteTextMessage(stream, createGraphics.TerrainCommand(new int[] { 256, 256 }, heights)); - Console.WriteLine(ReadPrefMessage(stream)); + //WriteTextMessage(stream, createGraphics.TerrainCommand(new int[] { 256, 256 }, heights)); + //Console.WriteLine(ReadPrefMessage(stream)); - WriteTextMessage(stream, createGraphics.AddNodeCommand()); - Console.WriteLine(ReadPrefMessage(stream)); + //WriteTextMessage(stream, createGraphics.AddNodeCommand()); + //Console.WriteLine(ReadPrefMessage(stream)); - WriteTextMessage(stream, createGraphics.AddBikeModel()); + //WriteTextMessage(stream, createGraphics.AddBikeModel()); //Console.WriteLine(ReadPrefMessage(stream));