From 6e09b87f60aa9e4851804ad2d49557c6078c1eb7 Mon Sep 17 00:00:00 2001
From: shinichi <shinichi@hotmail.nl>
Date: Fri, 18 Sep 2020 14:23:43 +0200
Subject: [PATCH 1/2] added method overloading and custom models

---
 RH-Engine/CreateGraphics.cs | 26 +++++++++++++++++++++-----
 RH-Engine/Program.cs        |  8 +++++++-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/RH-Engine/CreateGraphics.cs b/RH-Engine/CreateGraphics.cs
index ceda29c..76cb809 100644
--- a/RH-Engine/CreateGraphics.cs
+++ b/RH-Engine/CreateGraphics.cs
@@ -61,9 +61,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
             {
                 id = "scene/node/add",
@@ -74,10 +90,10 @@ namespace RH_Engine
                     {
                         model = new
                         {
-                            file = "data\\NetworkEngine\\models\\bike\\bike.fbx",
+                            file = fileLocation,
                             cullbackfaces = true,
-                            animated = false,
-                            animation = "data\\NetworkEngine\\models\\bike\\bike_anim.fbx"
+                            animated = animatedBool,
+                            animation = animationLocation
                         },
                     }
                 }
diff --git a/RH-Engine/Program.cs b/RH-Engine/Program.cs
index 2d4b2a0..bc8dc89 100644
--- a/RH-Engine/Program.cs
+++ b/RH-Engine/Program.cs
@@ -108,7 +108,13 @@ namespace RH_Engine
 
             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);
 

From 1e7d679fc2219e51f169db6d8eb386f2dff3581e Mon Sep 17 00:00:00 2001
From: fabjuuuh <f.degroot1@student.avans.nl>
Date: Fri, 18 Sep 2020 14:24:55 +0200
Subject: [PATCH 2/2] Yeet

---
 RH-Engine/Program.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/RH-Engine/Program.cs b/RH-Engine/Program.cs
index 5099892..4f60804 100644
--- a/RH-Engine/Program.cs
+++ b/RH-Engine/Program.cs
@@ -13,14 +13,12 @@ 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("NA", "Bart"),
             //new PC("DESKTOP-M2CIH87", "Fabian"),
             //new PC("T470S", "Shinichi"),
             new PC("DESKTOP-DHS478C", "semme"),
@@ -28,7 +26,6 @@ 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);