merge Develop into master #2

Merged
SemvdH merged 81 commits from develop into master 2020-09-18 14:44:28 +00:00
Showing only changes of commit 4a745ace75 - Show all commits

View File

@@ -139,6 +139,10 @@ namespace RH_Engine
//Console.WriteLine(ReadPrefMessage(stream));
//add monkey head
//WriteTextMessage(stream, createGraphics.AddModel("Face", "data\\vrlib\\rendermodels\\face\\face.obj", new float[] { 0, 3, 0 }, 10, new float[] { 0, 0, 0 }));
//string headUuid = getUUIDFormResponse(ReadPrefMessage(stream));
}
@@ -201,6 +205,12 @@ namespace RH_Engine
}
public static string getUUIDFromResponse(string response)
{
dynamic JSON = JsonConvert.DeserializeObject(response);
return JSON.data.data.data.uuid;
}
}
/// <summary>