Merge remote-tracking branch 'origin/master' into Networking

NOTE (in config file):
[Debug]
LoadMap=Schema/Entities/Test.xml

# Conflicts:
#	include/Game/Game.h
#	src/Game/Game.cpp

include/Game/Game.h

@@ -9,6 +9,10 @@
 #include "GUI/Frame.h"
 #include "Core/World.h"
 #include "Rendering/RenderQueueFactory.h"
+#include "Core/EKeyDown.h"
+#include "Core/EntityXMLFile.h"
+#include "Core/SystemPipeline.h"
+#include "RaptorCopterSystem.h"
 
 // Network
 #include <boost/thread.hpp>
@@ -33,13 +37,19 @@ private:
 	InputManager* m_InputManager;
 	GUI::Frame* m_FrameStack;
     World* m_World;
+    SystemPipeline* m_SystemPipeline;
     RenderQueueFactory* m_RenderQueueFactory;
     // Network variables
     boost::thread m_NetworkThread;
 
     // Network methods
     void NetworkFunction();
-	// Network events
+
+    EventRelay<Game, Events::KeyUp> m_EKeyUp;
+    bool testOnKeyUp(const Events::KeyUp& e);
+
+    void testIntialize();
+    void testTick(double dt);
 	EventRelay<Client, Events::KeyDown> m_EKeyDown;
 
 };

include/Game/HardcodedTestWorld.h

@@ -1,110 +0,0 @@
-#include <list>
-#include <tuple>
-#include <boost/any.hpp>
-#include "GLM.h"
-#include "Core/World.h"
-#include "Core/Util/Any.h"
-
-class HardcodedTestWorld : public World
-{
-public:
-    HardcodedTestWorld()
-        : World()
-    {
-        registerTestComponents();
-        createTestEntities();
-    }
-
-private:
-    void registerTestComponents()
-    {
-        ComponentWrapperFactory f;
-            
-
-        f = ComponentWrapperFactory("Test");
-        f.AddProperty("TestInteger", 1337);
-        f.AddProperty("TestFloat", 13.37f);
-        f.AddProperty("TestString", std::string("Carlito"));
-        RegisterComponent(f);
-
-        f = ComponentWrapperFactory("Debug");
-        f.AddProperty("Name", std::string("Unnamed"));
-        RegisterComponent(f);
-
-        f = ComponentWrapperFactory("Transform");
-        f.AddProperty("Position", glm::vec3(0.f, 0.f, 0.f));
-        f.AddProperty("Orientation", glm::quat());
-        f.AddProperty("Scale", glm::vec3(1.f, 1.f, 1.f));
-        RegisterComponent(f);
-
-        f = ComponentWrapperFactory("Model");
-        f.AddProperty("Resource", std::string());
-        f.AddProperty("Color", glm::vec4(1.f, 1.f, 1.f, 1.f));
-        f.AddProperty("Visible", true);
-        RegisterComponent(f);
-    }
-
-    void createTestEntities()
-    {
-        World& world = *this;
-
-        // Create an entity
-        EntityID e = world.CreateEntity();
-
-        // Attach a Debug component
-        ComponentWrapper debug = world.AttachComponent(e, "Debug");
-        // Set the Name field of the Debug component using subscript operator
-        debug["Name"] = "Carlito";
-
-        // Attach a Transform component
-        world.AttachComponent(e, "Transform");
-        // Fetch the component based on EntityID and component type
-        ComponentWrapper transform = world.GetComponent(e, "Transform");
-        // Set the fields of the Transform component
-        transform["Position"] = glm::vec3(0.f, 0.f, 0.f);
-        transform["Scale"] = glm::vec3(1.f, 1.f, 1.f);
-
-        // Move on the X axis by fetching field as reference
-        ((glm::vec3&)transform["Position"]).x += 10.f;
-        // Shrink by a factor of 100
-        ((glm::vec3&)transform["Scale"]) /= 100.f;
-
-        // Loop through all Transform components and print them
-        for (auto& transform : world.GetComponents("Transform")) {
-            glm::vec3 pos = transform["Position"];
-            std::cout << "Position: " << pos.x << " " << pos.y << " " << pos.z << std::endl;
-            glm::vec3 scale = transform["Scale"];
-            std::cout << "Scale: " << scale.x << " " << scale.y << " " << scale.z << std::endl;
-
-            // Fetch the Debug component also present in this entity
-            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";
-        }
-
-
-
-    }
-};

include/Game/RaptorCopterSystem.h

@@ -0,0 +1,16 @@
+#include "Common.h"
+#include "Core/System.h"
+
+class RaptorCopterSystem : public System
+{
+public:
+    RaptorCopterSystem(const EventBroker* eventBroker)
+        : System(eventBroker, "RaptorCopter")
+    { }
+
+    virtual void Update(World* world, ComponentWrapper& raptorCopter, double dt) override
+    {
+        ComponentWrapper& transform = world->GetComponent(raptorCopter.EntityID, "Transform");
+        (glm::vec3&)transform["Orientation"] += (float)(double)raptorCopter["Speed"] * (float)dt * (glm::vec3)raptorCopter["Axis"];
+    }
+};