Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking

# Conflicts:
#	include/Game/Game.h

include/Game/Game.h

@@ -8,6 +8,7 @@
 #include "Core/InputManager.h"
 #include "GUI/Frame.h"
 #include "Core/World.h"
+#include "Rendering/RenderQueueFactory.h"
 // Network
 #include <boost/thread.hpp>
 #include "Network/Client.h"
@@ -29,7 +30,8 @@ private:
 	InputManager* m_InputManager;
 	GUI::Frame* m_FrameStack;
     World* m_World;
-    // Network viriables
+    RenderQueueFactory* m_RenderQueueFactory;
+    // Network variables
     boost::thread m_NetworkThread;
     Client m_Client;
 

include/Game/HardcodedTestWorld.h

@@ -19,6 +19,7 @@ private:
     void registerTestComponents()
     {
         ComponentWrapperFactory f;
+            
 
         f = ComponentWrapperFactory("Test");
         f.AddProperty("TestInteger", 1337);
@@ -79,5 +80,31 @@ private:
             ComponentWrapper debug = world.GetComponent(transform.EntityID, "Debug");
             std::cout << "Name: " << (std::string)debug["Name"] << std::endl;
         }
+        
+        //Create some test widgets
+        {
+            EntityID entityScaleWidget = world.CreateEntity();
+            ComponentWrapper transform = world.AttachComponent(entityScaleWidget, "Transform");
+            transform["Position"] = glm::vec3(-1.5f, 0.f, 0.f);
+            ComponentWrapper model = world.AttachComponent(entityScaleWidget, "Model");
+            model["Resource"] = "Models/ScaleWidget.obj";
+        }
+        {
+            EntityID entityRotationWidget = world.CreateEntity();
+            ComponentWrapper transform = world.AttachComponent(entityRotationWidget, "Transform");
+            transform["Position"] = glm::vec3(1.5f, 0.f, 0.f);
+            ComponentWrapper model = world.AttachComponent(entityRotationWidget, "Model");
+            model["Resource"] = "Models/RotationWidget.obj";
+        }
+        {
+            EntityID entityDummyScene = world.CreateEntity();
+            ComponentWrapper transform = world.AttachComponent(entityDummyScene, "Transform");
+            transform["Position"] = glm::vec3(0, 0.f, 0.f);
+            ComponentWrapper model = world.AttachComponent(entityDummyScene, "Model");
+            model["Resource"] = "Models/DummyScene.obj";
+        }
+
+
+
     }
 };