Merge branch 'master' into Forward+

This reverts commit bd62b5873d.

README.md

@@ -1,19 +1,22 @@
 #### Bundled libraries
 Libraries bundled along with binaries for Windows (MSVC14), available as a submodule in the *deps* directory of the source tree.
 
-| Project                                                       | Version      | License                                                                                                                                                                            |
+| Project                                                          | Version      | License                                                                                                                                                                            |
-| ------------------------------------------------------------- | ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| ---------------------------------------------------------------- | ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **[GLFW](http://www.glfw.org)**                               | 3.1.2        | [zlib/libpng License](http://www.glfw.org/license.html)                                                                                                                            |
+| **[GLFW](http://www.glfw.org)**                                  | 3.1.2        | [zlib/libpng License](http://www.glfw.org/license.html)                                                                                                                            |
-| **[GLM](http://glm.g-truc.net/0.9.5/index.html)**             | 0.9.7.1      | [MIT License](http://glm.g-truc.net/copying.txt)                                                                                                                                   |
+| **[GLM](http://glm.g-truc.net/0.9.5/index.html)**                | 0.9.7.1      | [MIT License](http://glm.g-truc.net/copying.txt)                                                                                                                                   |
-| **[GLEW](http://glew.sourceforge.net)**                       | 1.13.0       | [Modified BSD License](http://glew.sourceforge.net/glew.txt), [Mesa 3-D License](http://glew.sourceforge.net/mesa.txt), [Khronos License](http://glew.sourceforge.net/khronos.txt) |
+| **[GLEW](http://glew.sourceforge.net)**                          | 1.13.0       | [Modified BSD License](http://glew.sourceforge.net/glew.txt), [Mesa 3-D License](http://glew.sourceforge.net/mesa.txt), [Khronos License](http://glew.sourceforge.net/khronos.txt) |
-| **[Assimp](http://assimp.sourceforge.net)**                   | 3.1.1        | [BSD 3-Clause License](http://assimp.sourceforge.net/main_license.html)                                                                                                            |
+| **[Assimp](http://assimp.sourceforge.net)**                      | 3.1.1        | [BSD 3-Clause License](http://assimp.sourceforge.net/main_license.html)                                                                                                            |
-| **[zlib](http://www.zlib.net)**                               | 1.28         | [zlib License](http://www.zlib.net/zlib_license.html)                                                                                                                              |
+| **[zlib](http://www.zlib.net)**                                  | 1.28         | [zlib License](http://www.zlib.net/zlib_license.html)                                                                                                                              |
-| **[libpng](http://www.libpng.org/pub/png/libpng.html)**       | 1.6.19       | [libpng License](http://www.libpng.org/pub/png/src/libpng-LICENSE.txt)                                                                                                             |
+| **[libpng](http://www.libpng.org/pub/png/libpng.html)**          | 1.6.19       | [libpng License](http://www.libpng.org/pub/png/src/libpng-LICENSE.txt)                                                                                                             |
-| **[Xerces-C++](https://xerces.apache.org/xerces-c)**          | 3.1.2        | [Apache License Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)                                                                                                          |
+| **[Xerces-C++](https://xerces.apache.org/xerces-c)**             | 3.1.2        | [Apache License Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)                                                                                                          |
+| **[ImGui](https://github.com/ocornut/imgui)**                    | 2015-12-12   | [MIT License](https://github.com/ocornut/imgui/blob/de3a154f3801de22c8e0bd2aeabf663a70c05972/LICENSE)                                                                              |
+| **[nativefiledialog](https://github.com/mlabbe/nativefiledialog)** | 2016-01-08   | [nativefiledialog Licence](https://github.com/mlabbe/nativefiledialog/blob/master/LICENSE)                                                                                                              |
+| **[OpenAL](https://www.openal.org/)**                            | 1.1          | [OpenAL License](resources/Licenses/OpenAL.txt)
 
 #### External libraries
 Libraries that are too big to be bundled with the project.
 
 | Project                                                    | Version     | License                                                                     | Root folder environment variable (Windows) |
 | ---------------------------------------------------------- | ----------- | --------------------------------------------------------------------------- | ------------------------------------------ |
-| **[Boost](http://www.boost.org)**                          | 1.59.0+     | [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt) | BOOST_ROOT                                 |
+| **[Boost](http://www.boost.org)**                          | 1.60.0+     | [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt) | BOOST_ROOT                                 |

include/Engine/Collision/CollidableOctreeSystem.h

@@ -0,0 +1,24 @@
+#ifndef CollidableOctreeSystem_h__
+#define CollidableOctreeSystem_h__
+
+#include "../Core/System.h"
+#include "../Core/Octree.h"
+#include "Collision.h"
+
+class CollidableOctreeSystem : public ImpureSystem, public PureSystem
+{
+public:
+    CollidableOctreeSystem(World* world, EventBroker* eventBroker, Octree<AABB>* octree)
+        : System(world, eventBroker)
+        , PureSystem("Collidable")
+        , m_Octree(octree)
+    { }
+
+    virtual void Update(double dt) override;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
+
+private:
+    Octree<AABB>* m_Octree;
+};
+
+#endif

include/Engine/Collision/Collision.h

@@ -0,0 +1,67 @@
+#ifndef Collision_h__
+#define Collision_h__
+
+//NOTE: Collision.h needs to be #included before <GLFW/glfw3.h>, 
+//because Collision #includes "RawModel.h", which has "Texture.h", which has "OpenGL.h" which must be #included first
+//or you will get "fatal error C1189: #error:  gl.h included before glew.h"
+
+#include <vector>
+#include <boost/optional.hpp>
+
+#include "../Core/Ray.h"
+#include "../Core/AABB.h"
+#include "../Rendering/RawModel.h"
+#include "../Core/Transform.h"
+#include "../Core/Entity.h"
+#include "../Core/EntityWrapper.h"
+
+class World;
+struct ComponentWrapper;
+
+namespace Collision
+{
+//Return true if the ray hits the box.
+bool RayAABBIntr(const Ray& ray, const AABB& box);
+bool RayVsAABB(const Ray& ray, const AABB& box);
+//Return true if the ray hits the box, also outputs distance from ray origin to intersection point in [outDistance].
+bool RayVsAABB(const Ray& ray, const AABB& box, float& outDistance);
+
+//Return true if the ray hits any of the triangles in the model. Stops checking when a hit is detected.
+bool RayVsModel(const Ray& ray, 
+    const std::vector<RawModel::Vertex>& modelVertices,
+    const std::vector<unsigned int>& modelIndices);
+//Return true if the ray hits any of the triangles in the model.
+//Also returns the position of the intersection point. Will loop through all the whole model indices.
+bool RayVsModel(const Ray& ray,
+    const std::vector<RawModel::Vertex>& modelVertices,
+    const std::vector<unsigned int>& modelIndices,
+    glm::vec3& outHitPosition);
+//Return true if the ray hits any of the triangles in the model.
+//Also returns the distance from the ray origin to the closest 
+//intersection point, and the barycentric u,v-coordinates. Will loop through all the whole model indices.
+bool RayVsModel(const Ray& ray,
+    const std::vector<RawModel::Vertex>& modelVertices,
+    const std::vector<unsigned int>& modelIndices,
+    float& outDistance,
+    float& outUCoord,
+    float& outVCoord);
+
+bool AABBvsTriangles(const AABB& box,
+    const std::vector<RawModel::Vertex>& modelVertices,
+    const std::vector<unsigned int>& modelIndices,
+    const glm::mat4& modelMatrix,
+    glm::vec3& outResolutionVector);
+
+//Return true if the boxes are intersecting.
+bool AABBVsAABB(const AABB& a, const AABB& b);
+//Return true if the boxes are intersecting.
+//Also outputs the minimum translation that box [a] would need in order to resolve collision.
+bool AABBVsAABB(const AABB& a, const AABB& b, glm::vec3& minimumTranslation);
+bool IsSameBoxProbably(const AABB& first, const AABB& second, const float epsilon = 0.0001f);
+
+// Calculates an absolute AABB from an entity AABB component
+boost::optional<AABB> EntityAbsoluteAABB(EntityWrapper& entity);
+
+}
+
+#endif

include/Engine/Collision/CollisionSystem.h

@@ -0,0 +1,36 @@
+#ifndef CollisionSystem_h__
+#define CollisionSystem_h__
+
+#include <GLFW/glfw3.h>
+#include <glm/common.hpp>
+
+#include "../Common.h"
+#include "../Core/System.h"
+#include "../Core/EventBroker.h"
+#include "../Core/EKeyUp.h"
+#include "../Core/Octree.h"
+
+class CollisionSystem : public PureSystem
+{
+public:
+    CollisionSystem(World* world, EventBroker* eventBroker, Octree<AABB>* octree)
+        : System(world, eventBroker)
+        , PureSystem("Collidable")
+        , m_Octree(octree)
+        , zPress(false)
+    {
+        //TODO: Debug stuff, remove later.
+        EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &CollisionSystem::OnKeyUp);
+    }
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
+
+private:
+    Octree<AABB>* m_Octree;
+    bool zPress;
+
+    EventRelay<CollisionSystem, Events::KeyUp> m_EKeyUp;
+    bool OnKeyUp(const Events::KeyUp &event);
+};
+
+#endif

include/Engine/Collision/ETrigger.h

@@ -0,0 +1,39 @@
+#ifndef Events_TriggerEnter_h__
+#define Events_TriggerEnter_h__
+
+#include "../Core/EventBroker.h"
+#include "../Core/Entity.h"
+
+namespace Events
+{
+
+/** Thrown once, when an entity is only touching a trigger. */
+struct TriggerTouch : Event
+{
+    /** The id of the entity that touches the trigger. */
+    EntityID Entity;
+    /** The id of the trigger entity. */
+    EntityID Trigger;
+};
+
+/** Thrown once, when an entity has completely left a trigger. */
+struct TriggerLeave : Event
+{
+    /** The id of the entity that left the trigger. */
+    EntityID Entity;
+    /** The id of the trigger entity. */
+    EntityID Trigger;
+};
+
+/** Thrown once, when an entity is completely contained inside a trigger. */
+struct TriggerEnter : Event
+{
+    /** The id of the entity that entered the trigger. */
+    EntityID Entity;
+    /** The id of the trigger entity. */
+    EntityID Trigger;
+};
+
+}
+
+#endif

include/Engine/Collision/TriggerSystem.h

@@ -0,0 +1,54 @@
+#ifndef TriggerSystem_h__
+#define TriggerSystem_h__
+
+#include <glm/common.hpp>
+#include <unordered_set>
+
+#include "../Core/System.h"
+#include "../Core/EventBroker.h"
+#include "../Core/Octree.h"
+#include "ETrigger.h"
+
+class AABB;
+
+class TriggerSystem : public PureSystem
+{
+public:
+    TriggerSystem(World* world, EventBroker* eventBroker, Octree<AABB>* octree)
+        : System(world, eventBroker)
+        , PureSystem("Trigger")
+        , m_Octree(octree)
+    {
+        EVENT_SUBSCRIBE_MEMBER(m_ETouch, &TriggerSystem::OnTouch);
+        EVENT_SUBSCRIBE_MEMBER(m_EEnter, &TriggerSystem::OnEnter);
+        EVENT_SUBSCRIBE_MEMBER(m_ELeave, &TriggerSystem::OnLeave);
+    }
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
+
+private:
+    Octree<AABB>* m_Octree;
+    std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesTouchingTrigger;
+    std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesCompletelyInTrigger;
+
+    //TODO: Only exists for debug purposes, remove later.
+    EventRelay<TriggerSystem, Events::TriggerEnter> m_EEnter;
+    bool OnEnter(const Events::TriggerEnter &event);
+    EventRelay<TriggerSystem, Events::TriggerTouch> m_ETouch;
+    bool OnTouch(const Events::TriggerTouch &event);
+    EventRelay<TriggerSystem, Events::TriggerLeave> m_ELeave;
+    bool OnLeave(const Events::TriggerLeave &event);
+
+    //True if leave event was thrown.
+    bool throwLeaveIfWasInTrigger(std::unordered_set<EntityID>& triggerSet, EntityID pId, EntityID tId);
+    template<typename Event>
+    void publish(EntityID pId, EntityID tId)
+    {
+        Event e;
+        e.Trigger = tId;
+        e.Entity = pId;
+        m_EventBroker->Publish(e);
+    }
+};
+
+#endif

include/Engine/Common.h

@@ -1,7 +1,10 @@
 #include <memory>
 #include <string>
+#include <sstream>
 #include <vector>
 #include <map>
 #include <unordered_map>
+#include <algorithm>
 
-#include "Core/Util/Logging.h"
+#include "Core/Util/Logging.h"
+#include "Core/Util/IfDebug.h"

include/Engine/Core/AABB.h

@@ -0,0 +1,29 @@
+#ifndef AABB_h__
+#define AABB_h__
+
+#include "../GLM.h"
+
+class AABB
+{
+public:
+    AABB() = default;
+    //No checks are made. Values in minPos must be less than values in maxPos, i.e. min.x < max.x, etc.
+    AABB(const glm::vec3& minPos, const glm::vec3& maxPos);
+    AABB(const glm::vec4& minPos, const glm::vec4& maxPos);
+    //No checks are made. Size must consist of non-negative numbers.
+    static AABB FromOriginSize(const glm::vec3& origin, const glm::vec3& size);
+    virtual ~AABB();
+
+    const glm::vec3& MinCorner() const { return m_MinCorner; }
+    const glm::vec3& MaxCorner() const { return m_MaxCorner; }
+    const glm::vec3& Origin() const { return m_Origin; }
+    const glm::vec3 Size() const { return 2.0f * m_HalfSize; }
+    const glm::vec3& HalfSize() const { return m_HalfSize; }
+private:
+    glm::vec3 m_MinCorner;
+    glm::vec3 m_MaxCorner;
+    glm::vec3 m_Origin;
+    glm::vec3 m_HalfSize;
+};
+
+#endif

include/Engine/Core/ComponentInfo.h

@@ -5,18 +5,30 @@
 
 struct ComponentInfo
 {
+    typedef int EnumType;
+
 	struct Meta_t
 	{
 		std::string Annotation;
 		unsigned int Allocation = 0;
-        unsigned int Stride = 0;
+        std::map<std::string, std::string> FieldAnnotations;
+        std::map<std::string, std::map<std::string, EnumType>> FieldEnumDefinitions;
 	};
 
+    struct Field_t
+    {
+        std::string Name;
+        std::string Type;
+        unsigned int Offset;
+        unsigned int Stride;
+    };
+
 	std::string Name;
-	std::unordered_map<std::string, std::string> FieldTypes;
+    std::unordered_map<std::string, Field_t> Fields;
-	std::unordered_map<std::string, unsigned int> FieldOffsets;
+    std::vector<std::string> FieldsInOrder;
-	Meta_t Meta;
+    unsigned int Stride = 0;
     std::shared_ptr<char> Defaults = nullptr;
+	std::shared_ptr<Meta_t> Meta = nullptr;
 };
 
 template<>

include/Engine/Core/ComponentPool.h

@@ -20,7 +20,7 @@ public:
 	~ComponentPoolForwardIterator() = default;
 	ComponentPoolForwardIterator& operator=(const ComponentPoolForwardIterator& other) = default;
 	ComponentPoolForwardIterator& operator++();
-	ComponentPoolForwardIterator& operator++(int);
+	ComponentPoolForwardIterator operator++(int);
 	bool operator!=(const ComponentPoolForwardIterator& other) const;
 	bool operator==(const ComponentPoolForwardIterator& other) const;
 	ComponentWrapper operator*() const;
@@ -43,7 +43,7 @@ public:
 
     ComponentPool(const ::ComponentInfo& ci) 
         : m_ComponentInfo(ci)
-        , m_Pool(ci.Meta.Allocation, sizeof(EntityID) + ci.Meta.Stride)
+        , m_Pool(ci.Meta->Allocation, sizeof(EntityID) + ci.Stride)
     { }
 	ComponentPool(const ComponentPool& other) = delete;
 	ComponentPool(const ComponentPool&& other) = delete;
@@ -54,11 +54,14 @@ public:
     ComponentWrapper Allocate(EntityID entity);
     // Get the component belonging to a specific entity
     ComponentWrapper GetByEntity(EntityID ent);
+    // Returns true if the pool contains a component for the specified entity
+    bool KnowsEntity(EntityID ent);
     // Delete a component and free its memory
     void Delete(ComponentWrapper& wrapper);
 
 	iterator begin() const;
 	iterator end() const;
+    size_t size() const;
 
 	//Dumps information about what the pool memory looks like right now 
 	//into an output stream (e.g. file/std::cout, anything that has an operator<<)

include/Engine/Core/ComponentWrapper.h

@@ -18,22 +18,32 @@ struct ComponentWrapper
     const ::EntityID EntityID;
     char* Data;
 
-    template <typename T>
+    ComponentInfo::EnumType Enum(const char* fieldName, const char* enumKey)
-    T& Property(std::string name)
     {
-        unsigned int offset = Info.FieldOffsets.at(name);
+        return Info.Meta->FieldEnumDefinitions.at(fieldName).at(enumKey);
-        return *reinterpret_cast<T*>(&Data[offset]);
     }
 
     template <typename T>
-    void SetProperty(std::string name, const T value) { Property<T>(name) = value; }
+    T& Field(std::string name)
+    {
+        const ComponentInfo::Field_t& field = Info.Fields.at(name);
+        if (sizeof(T) > field.Stride) {
+            std::stringstream message;
+            message << "Type size of \"" << typeid(T).name() << "\" doesn't match size of component field \"" << Info.Name << "." << name << "\"!";
+            throw new std::runtime_error(message.str().c_str());
+        } 
+        return *reinterpret_cast<T*>(&Data[field.Offset]);
+    }
+
+    template <typename T>
+    void SetField(std::string name, const T value) { Field<T>(name) = value; }
     //template <typename T>
-    //void SetProperty(std::string name, T& value) { Property<T>(name) = value; }
+    //void SetField(std::string name, T& value) { Field<T>(name) = value; }
 
     // Specialization for string literals
     template <std::size_t N>
-    void SetProperty(std::string name, const char(&value)[N]) { Property<std::string>(name) = std::string(value); }
+    void SetField(std::string name, const char(&value)[N]) { Field<std::string>(name) = std::string(value); }
-
+    
     struct SubscriptProxy
     {
         friend struct ComponentWrapper;
@@ -47,18 +57,21 @@ struct ComponentWrapper
         std::string m_PropertyName;
 
     public:
-        template <typename T>
+        // Return the integer value of an enum type key for this field
-        operator T&() { return m_Component->Property<T>(m_PropertyName); }
+        ComponentInfo::EnumType Enum(const char* enumKey) { return m_Component->Enum(m_PropertyName.c_str(), enumKey); }
 
         template <typename T>
-        void operator=(const T val) { m_Component->SetProperty<T>(m_PropertyName, val); }
+        operator T&() { return m_Component->Field<T>(m_PropertyName); }
+
+        template <typename T>
+        void operator=(const T val) { m_Component->SetField<T>(m_PropertyName, val); }
         // TODO: Pass by reference and rvalue (universal reference?)
         //template <typename T>
-        //void operator=(T& val) { m_Component->SetProperty<T>(m_PropertyName, val); }
+        //void operator=(T& val) { m_Component->SetField<T>(m_PropertyName, val); }
 
         // Specialization for string literals
-        template<std::size_t N>
+        template <std::size_t N>
-        void operator=(const char(&val)[N]) { m_Component->SetProperty<N>(m_PropertyName, val); }
+        void operator=(const char(&val)[N]) { m_Component->SetField<N>(m_PropertyName, val); }
     };
     SubscriptProxy operator[](std::string propertyName) { return SubscriptProxy(this, propertyName); }
 };
@@ -71,21 +84,22 @@ public:
     ComponentWrapperFactory(std::string componentTypeName, std::size_t allocation = 0)
     {
         m_ComponentInfo.Name = componentTypeName;
-        m_ComponentInfo.Meta.Allocation = allocation;
+        m_ComponentInfo.Meta->Allocation = allocation;
     }
 
     template <typename T>
     void AddProperty(std::string fieldName, T defaultValue)
     {
         m_DefaultValues.push_back(defaultValue);
-        m_ComponentInfo.FieldTypes[fieldName] = typeid(T).name();
+        m_ComponentInfo.Fields[fieldName].Type = typeid(T).name();
-        m_ComponentInfo.FieldOffsets[fieldName] = m_ComponentInfo.Meta.Stride;
+        m_ComponentInfo.Fields[fieldName].Offset = m_ComponentInfo.Stride;
-        m_ComponentInfo.Meta.Stride += sizeof(T);
+        m_ComponentInfo.Fields[fieldName].Stride = sizeof(T);
+        m_ComponentInfo.Stride += sizeof(T);
     }
     
     ComponentInfo& Finalize()
     {
-        m_ComponentInfo.Defaults = std::shared_ptr<char>(new char[m_ComponentInfo.Meta.Stride]);
+        m_ComponentInfo.Defaults = std::shared_ptr<char>(new char[m_ComponentInfo.Stride]);
         std::size_t offset = 0;
         for (auto& val : m_DefaultValues) {
             memcpy(m_ComponentInfo.Defaults.get() + offset, val.Data.get(), val.Size);

include/Engine/Core/ConfigFile.h

@@ -5,6 +5,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/ini_parser.hpp>
+#include <boost/lexical_cast.hpp>
 
 #include "../Common.h"
 #include "ResourceManager.h"
@@ -19,12 +20,14 @@ private:
 public:
 	template <typename T>
 	T Get(std::string key, T defaultValue);
+    template <typename T>
+    std::vector<std::pair<std::string, T>> GetAll(std::string key);
 	template <typename T>
 	void Set(std::string key, T value);
 
 	void SaveToDisk();
 
-	private:
+private:
 	boost::filesystem::path m_Path;
 	boost::property_tree::ptree m_PTreeDefaults;
 	boost::property_tree::ptree m_PTreeOverrides;
@@ -37,6 +40,21 @@ T ConfigFile::Get(std::string key, T defaultValue)
 	return m_PTreeMerged.get<T>(key, defaultValue);
 }
 
+template <typename T>
+std::vector<std::pair<std::string, T>> ConfigFile::GetAll(std::string key)
+{
+    std::vector<std::pair<std::string, T>> out;
+    auto parent = m_PTreeMerged.find(key);
+    if (parent == m_PTreeMerged.not_found()) {
+        return out;
+    }
+    for (auto& child : parent->second) {
+        T value = boost::lexical_cast<T>(child.second.data());
+        out.push_back(std::make_pair(child.first, value));
+    }
+    return out;
+}
+
 template <typename T>
 void ConfigFile::Set(std::string key, T value)
 {

include/Engine/Core/ECaptured.h

@@ -0,0 +1,20 @@
+#ifndef ECaptured_h__
+#define ECaptured_h__
+
+#include "EventBroker.h"
+#include "../Core/Entity.h"
+#include "Engine/GLM.h"
+
+namespace Events
+{
+
+    //triggers when a capturePoint has been taken over
+struct Captured : Event
+{
+    int TeamNumberThatCapturedCapturePoint;
+    EntityID CapturePointID;
+};
+
+}
+
+#endif

include/Engine/Core/EComponentAttached.h

@@ -0,0 +1,20 @@
+#ifndef EComponentAttached_h__
+#define EComponentAttached_h__
+
+#include "EventBroker.h"
+#include "World.h"
+#include "Entity.h"
+#include "ComponentWrapper.h"
+
+namespace Events
+{
+
+struct ComponentAttached : Event
+{
+    EntityWrapper Entity;
+    ComponentWrapper Component;
+};
+
+}
+
+#endif

include/Engine/Core/EFileDropped.h

@@ -0,0 +1,16 @@
+#ifndef EFileDropped_h__
+#define EFileDropped_h__
+
+#include "EventBroker.h"
+
+namespace Events
+{
+
+struct FileDropped : Event
+{
+    std::string Path;
+};
+
+}
+
+#endif

include/Engine/Core/EKeyDown.h

@@ -11,6 +11,9 @@ struct KeyDown : Event
 {
 	/** GLFW key code */
 	int KeyCode;
+    bool ModCtrl;
+    bool ModAlt;
+    bool ModShift;
 };
 
 }

include/Engine/Core/EKeyUp.h

@@ -11,6 +11,9 @@ struct KeyUp : Event
 {
 	/** GLFW key code */
 	int KeyCode;
+    bool ModCtrl;
+    bool ModAlt;
+    bool ModShift;
 };
 
 }

include/Engine/Core/EKeyboardChar.h

@@ -0,0 +1,17 @@
+#ifndef Events_KeyboardChar_h__
+#define Events_KeyboardChar_h__
+
+#include "EventBroker.h"
+
+namespace Events
+{
+
+struct KeyboardChar : Event
+{
+    double Timestamp = 0.f;
+	unsigned int Char = 0;
+};
+
+}
+
+#endif

include/Engine/Core/EMouseScroll.h

@@ -0,0 +1,17 @@
+#ifndef Events_MouseScroll_h__
+#define Events_MouseScroll_h__
+
+#include "EventBroker.h"
+
+namespace Events
+{
+
+struct MouseScroll : Event
+{
+    double DeltaX;
+    double DeltaY;
+};
+
+}
+
+#endif

include/Engine/Core/EPause.h

@@ -0,0 +1,22 @@
+#ifndef EPause_h__
+#define EPause_h__
+
+#include "EventBroker.h"
+#include "World.h"
+
+namespace Events
+{
+
+struct Pause : Event 
+{
+    ::World* World;
+};
+
+struct Resume : Event 
+{
+    ::World* World;
+};
+
+}
+
+#endif

include/Engine/Core/EPlayerDamage.h

@@ -0,0 +1,18 @@
+#ifndef EPlayerDamage_h__
+#define EPlayerDamage_h__
+
+#include "EventBroker.h"
+#include "../Core/Entity.h"
+
+namespace Events
+{
+
+struct PlayerDamage : Event
+{
+    double DamageAmount;
+    EntityID PlayerDamagedID;
+};
+
+}
+
+#endif

include/Engine/Core/EPlayerDeath.h

@@ -0,0 +1,20 @@
+#ifndef EPlayerDeath_h__
+#define EPlayerDeath_h__
+
+#include "EventBroker.h"
+#include "../Core/Entity.h"
+
+namespace Events
+{
+
+struct PlayerDeath : Event
+{
+    //KilledBy,KilledByWhat is optional for now. It might be used later in the playerlog-system
+    EntityID KilledBy;
+    EntityID PlayerID;
+    std::string KilledByWhat;
+};
+
+}
+
+#endif

include/Engine/Core/EPlayerHealthPickup.h

@@ -0,0 +1,18 @@
+#ifndef EPlayerHealthPickup_h__
+#define EPlayerHealthPickup_h__
+
+#include "EventBroker.h"
+#include "../Core/Entity.h"
+
+namespace Events
+{
+
+struct PlayerHealthPickup : Event
+{
+    double HealthAmount;
+    EntityID PlayerHealedID;
+};
+
+}
+
+#endif

include/Engine/Core/EShoot.h

@@ -0,0 +1,19 @@
+#ifndef EShoot_h__
+#define EShoot_h__
+
+#include "EventBroker.h"
+#include "../Core/Entity.h"
+#include "Engine/GLM.h"
+
+namespace Events
+{
+
+struct Shoot : Event
+{
+    //ID for who made the shot
+    EntityID shooter;
+};
+
+}
+
+#endif

include/Engine/Core/EWin.h

@@ -0,0 +1,20 @@
+#ifndef EWin_h__
+#define EWin_h__
+
+#include "EventBroker.h"
+#include "../Core/Entity.h"
+#include "Engine/GLM.h"
+
+namespace Events
+{
+
+    //triggers when a team has captured all capturePoints
+struct Win : Event
+{
+    //can be 0 = none, 1,2
+    int TeamThatWon;
+};
+
+}
+
+#endif

include/Engine/Core/Entity.h

@@ -2,5 +2,7 @@
 #define Entity_h__
 
 typedef unsigned int EntityID;
+const static unsigned int EntityID_Invalid = -1;
+
 
 #endif

include/Engine/Core/EntityFactory.h

@@ -285,7 +285,7 @@ private:
 
 					XSValue::Status status;
 					XSValue* val = XSValue::getActualValue(child->getNodeValue(), XSValue::dt_integer, status);
-					compInfo.Meta.Allocation += val->fData.fValue.f_int;
+					compInfo.Meta->Allocation += val->fData.fValue.f_int;
 				}
 
 				// Save documentation string
@@ -293,11 +293,11 @@ private:
 				if (documentationTags->getLength() != 0) {
 					auto child = documentationTags->item(0)->getFirstChild();
 					if (child != nullptr) {
-						compInfo.Meta.Annotation = XSTR(child->getNodeValue());
+						compInfo.Meta->Annotation = XSTR(child->getNodeValue());
 					}
 				}
 				// TODO: Parse annotation string XML
-				// compInfo.Meta.Allocation = ...
+				// compInfo.Meta->Allocation = ...
 			} else {
 				std::cout << "Warning: Component is missing an annotation!" << std::endl;
 			}
@@ -344,7 +344,7 @@ private:
 				fieldOffset += getTypeStride(type);
 			}
 
-            compInfo.Meta.Stride = fieldOffset;
+            compInfo.Stride = fieldOffset;
 			m_ComponentInfo[compInfo.Name] = compInfo;
 		}
 	}
@@ -367,14 +367,14 @@ private:
 
 			std::string componentName = XSTR(component->getLocalName());
 			auto& compInfo = m_ComponentInfo.at(componentName);
-			compInfo.Meta.Allocation += 1;
+			compInfo.Meta->Allocation += 1;
 		}
 
 		std::cout << "COMPONENT INFO" << std::endl;
 		for (auto& pair : m_ComponentInfo) {
 			ComponentInfo& ci = pair.second;
-			std::cout << "Component: " << ci.Name << " (" << ci.Meta.Annotation << ")" << std::endl;
+			std::cout << "Component: " << ci.Name << " (" << ci.Meta->Annotation << ")" << std::endl;
-			std::cout << "  Allocation: " << ci.Meta.Allocation << std::endl;
+			std::cout << "  Allocation: " << ci.Meta->Allocation << std::endl;
 			std::cout << "  Fields:" << std::endl;
 
 			// Calculate component size
@@ -393,7 +393,7 @@ private:
 			cs.ComponentName = ci.Name;
 			cs.Stride = stride;
 			cs.Info = ci;
-			cs.Data = new char[stride*ci.Meta.Allocation];
+			cs.Data = new char[stride*ci.Meta->Allocation];
 			m_ComponentStore[cs.ComponentName] = cs;
 		}
 	}

include/Engine/Core/EntityFile.h

@@ -0,0 +1,164 @@
+#ifndef EntityFile_h__
+#define EntityFile_h__
+
+#include <stack>
+#include <boost/lexical_cast.hpp>
+#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+#include <xercesc/sax2/SAX2XMLReader.hpp>
+#include <xercesc/sax2/XMLReaderFactory.hpp>
+#include <xercesc/sax2/DefaultHandler.hpp>
+#include <xercesc/sax2/Attributes.hpp>
+#include <xercesc/util/XMLString.hpp>
+#include <xercesc/util/XMLChar.hpp>
+#include <xercesc/sax2/DefaultHandler.hpp>
+#include <xercesc/framework/XMLDocumentHandler.hpp>
+#include <xercesc/framework/psvi/XSElementDeclaration.hpp>
+#include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
+#include <xercesc/framework/psvi/XSParticle.hpp>
+#include <xercesc/framework/psvi/XSModelGroup.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
+#include <xercesc/framework/psvi/XSValue.hpp>
+#include <xercesc/framework/XMLGrammarPoolImpl.hpp>
+#include <xercesc/dom/DOM.hpp>
+#include <xercesc/dom/DOMLSInput.hpp>
+#include <xercesc/dom/DOMElement.hpp>
+
+#include "../GLM.h"
+#include "Util/XercesString.h"
+#include "ResourceManager.h"
+#include "Entity.h"
+#include "ComponentInfo.h"
+
+class EntityFileHandler
+{
+    friend class EntityFileSAXHandler;
+public:
+    // @param EntityID The entity found
+    // @param EntityID The parent of the entity
+    typedef std::function<void(EntityID, EntityID, const std::string&)> OnStartEntityCallback;
+    void SetStartEntityCallback(OnStartEntityCallback c) { m_OnStartEntityCallback = c; }
+    // @param EntityID The entity the component corresponds to
+    // @param std::string Type name of the component
+    typedef std::function<void(EntityID, const std::string&)> OnStartComponentCallback;
+    void SetStartComponentCallback(OnStartComponentCallback c) { m_OnStartComponentCallback = c; }
+    // @param EntityID Entity 
+    // @param std::string Component name 
+    // @param std::string Field name
+    // @param std::map<std::string, std::string> Field attribute names and values
+    typedef std::function<void(EntityID, const std::string&, const std::string&, const std::map<std::string, std::string>&)> OnStartFieldCallback;
+    void SetStartFieldCallback(OnStartFieldCallback c) { m_OnStartFieldCallback = c; }
+    // @param EntityID Entity 
+    // @param std::string Component name 
+    // @param std::string Field name
+    // @param char* Field data
+    typedef std::function<void(EntityID, const std::string&, const std::string&, const char*)> OnStartFieldDataCallback;
+    void SetStartFieldDataCallback(OnStartFieldDataCallback c) { m_OnStartFieldDataCallback = c; }
+
+private:
+    OnStartEntityCallback m_OnStartEntityCallback = nullptr;
+    OnStartComponentCallback m_OnStartComponentCallback = nullptr;
+    OnStartFieldCallback m_OnStartFieldCallback = nullptr;
+    OnStartFieldDataCallback m_OnStartFieldDataCallback = nullptr;
+};
+
+class EntityFileSAXHandler : public xercesc::DefaultHandler
+{
+public:
+    enum class State
+    {
+        Unknown,
+        Entity,
+        Component,
+        ComponentField
+    };
+
+    EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader);
+
+    void startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs) override;
+    void characters(const XMLCh* const chars, const XMLSize_t length) override;
+    void endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname) override;
+
+    void warning(const xercesc::SAXParseException& e);
+    void error(const xercesc::SAXParseException& e);
+    void fatalError(const xercesc::SAXParseException& e);
+
+private:
+    const EntityFileHandler* m_Handler;
+    xercesc::XMLGrammarPool* m_GrammarPool;
+    xercesc::SAX2XMLReader* m_Reader;
+    //State m_CurrentScope = State::Unknown;
+    std::stack<State> m_StateStack;
+    unsigned int m_NextEntityID = 0;
+    std::stack<EntityID> m_EntityStack;
+    std::string m_CurrentComponent;
+    std::string m_CurrentField;
+    std::map<std::string, std::string> m_CurrentAttributes;
+
+    void onStartEntity(const xercesc::Attributes& attrs); 
+    void onEndEntity();
+    void onStartEntityRef(const xercesc::Attributes& attrs);
+    void onStartComponent(const std::string& name);
+    void onEndComponent(const std::string& name);
+    void onStartComponentField(const std::string& field, const xercesc::Attributes& attrs);
+    void onEndComponentField(const std::string& field);
+    void onFieldData(char* data);
+};
+
+class EntityFileXMLErrorHandler : public xercesc::ErrorHandler
+{
+public:
+	void warning(const xercesc::SAXParseException& e) override
+	{
+		reportParseException("Warning", e);
+	}
+	void error(const xercesc::SAXParseException& e) override
+	{
+		reportParseException("Error", e);
+	}
+	void fatalError(const xercesc::SAXParseException& e) override
+	{
+		reportParseException("FATAL ERROR", e);
+	}
+	void resetErrors() override { }
+
+private:
+	void reportParseException(std::string type, const xercesc::SAXParseException& e)
+	{
+		char* message = xercesc::XMLString::transcode(e.getMessage());
+		char* systemID = xercesc::XMLString::transcode(e.getSystemId());
+		std::cerr << systemID << ":" << e.getLineNumber() << ":" << e.getColumnNumber() << std::endl;
+		std::cerr << type << ": " << message << std::endl;
+		xercesc::XMLString::release(&systemID);
+		xercesc::XMLString::release(&message);
+	}
+};
+
+class EntityFile : public Resource
+{
+    friend class ResourceManager;
+    friend class EntityFileSAXHandler;
+private:
+    EntityFile(boost::filesystem::path path);
+    ~EntityFile();
+
+public:
+    static std::size_t GetTypeStride(std::string typeName);
+    static void WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map<std::string, std::string>& attributes);
+    static void WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData);
+
+    xercesc::XMLGrammarPool* GrammarPool() const { return m_GrammarPool; }
+
+    void Parse(const EntityFileHandler* handler) const;
+
+private:
+    boost::filesystem::path m_FilePath;
+    xercesc::XMLGrammarPool* m_GrammarPool;
+    xercesc::SAX2XMLReader* m_SAX2XMLReader;
+	//std::map<std::string, ::ComponentInfo> m_ComponentInfo;
+    //std::vector<std::string> m_EntityReferences;
+
+    static void setReaderFeatures(xercesc::SAX2XMLReader* reader);
+};
+
+#endif

include/Engine/Core/EntityFileParser.h

@@ -0,0 +1,29 @@
+#ifndef EntityFileParser_h__
+#define EntityFileParser_h__
+
+#include "EntityFile.h"
+#include "World.h"
+
+class EntityFileParser
+{
+public:
+    EntityFileParser(const EntityFile* entityFile);
+
+    EntityID MergeEntities(World* world, EntityID baseParent = EntityID_Invalid);
+
+private:
+    const EntityFile* m_EntityFile;
+    EntityFileHandler m_Handler;
+    World* m_World = nullptr;
+    EntityID m_FirstEntity = EntityID_Invalid;
+    // Maps EntityIDs local to the file to real IDs in the world after they've been 
+    // created in order to resolve parent-child relationships.
+    std::map<EntityID, EntityID> m_EntityIDMapper;
+
+    void onStartEntity(EntityID entity, EntityID parent, const std::string& name);
+    void onStartComponent(EntityID entity, const std::string& component);
+    void onStartComponentField(EntityID entity, const std::string& componentType, const std::string& fieldName, const std::map<std::string, std::string>& attributes);
+    void onFieldData(EntityID entity, const std::string& componentType, const std::string& fieldName, const char* fieldData);
+};
+
+#endif

include/Engine/Core/EntityFilePreprocessor.h

@@ -0,0 +1,38 @@
+#ifndef EntityFilePreprocessor_h__
+#define EntityFilePreprocessor_h__
+
+#include <xercesc/framework/psvi/XSElementDeclaration.hpp>
+#include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
+#include <xercesc/framework/psvi/XSParticle.hpp>
+#include <xercesc/framework/psvi/XSModelGroup.hpp>
+#include <xercesc/framework/psvi/XSModelGroupDefinition.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
+#include <xercesc/framework/psvi/XSValue.hpp>
+#include <xercesc/framework/MemBufFormatTarget.hpp>
+#include <xercesc/framework/MemBufInputSource.hpp>
+#include <xercesc/parsers/XercesDOMParser.hpp>
+
+#include "Util/XercesString.h"
+#include "ResourceManager.h"
+#include "World.h"
+#include "EntityFile.h"
+
+class EntityFilePreprocessor
+{
+public:
+    EntityFilePreprocessor(const EntityFile* entityFile);
+
+    void RegisterComponents(World* world);
+
+private:
+    const EntityFile* m_EntityFile;
+    std::map<std::string, unsigned int> m_ComponentCounts;
+	std::map<std::string, ComponentInfo> m_ComponentInfo;
+
+	void onStartComponent(EntityID entity, std::string type);
+    void parseComponentInfo();
+    void parseDefaults();
+    std::string parseAnnotationXML(const XMLCh* xml);
+};
+
+#endif

include/Engine/Core/EntityFileWriter.h

@@ -0,0 +1,39 @@
+#ifndef EntityFileWriter_h__
+#define EntityFileWriter_h__
+
+#include <boost/filesystem.hpp>
+#include <xercesc/dom/DOM.hpp>
+#include <xercesc/util/XMLString.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+#include <xercesc/framework/LocalFileFormatTarget.hpp>
+
+#include "Util/XercesString.h"
+#include "EntityFile.h"
+#include "World.h"
+
+class EntityFileWriter
+{
+public:
+    EntityFileWriter(boost::filesystem::path file)
+        : m_FilePath(file)
+    {
+        using namespace xercesc;
+        m_DOMImplementation = DOMImplementationRegistry::getDOMImplementation(XS::ToXMLCh("LS"));
+        m_DOMLSSerializer = static_cast<DOMImplementationLS*>(m_DOMImplementation)->createLSSerializer();
+        m_DOMLSSerializer->getDomConfig()->setParameter(XMLUni::fgDOMWRTDiscardDefaultContent, true);
+        m_DOMLSSerializer->getDomConfig()->setParameter(XMLUni::fgDOMWRTFormatPrettyPrint, true);
+    }
+
+    void WriteWorld(World* world);
+    void WriteEntity(World* world, EntityID entity);
+
+private:
+    boost::filesystem::path m_FilePath;
+    xercesc::DOMImplementation* m_DOMImplementation;
+    xercesc::DOMLSSerializer* m_DOMLSSerializer;
+
+    void appendEntityChildren(xercesc::DOMElement* parentElement, const World* world, EntityID entity);
+    void appentEntityComponents(xercesc::DOMElement* parentElemetn, const World* world, EntityID entity);
+};
+
+#endif

include/Engine/Core/EntityWrapper.h

@@ -0,0 +1,51 @@
+#ifndef EntityWrapper_h__
+#define EntityWrapper_h__
+
+#include <boost/optional.hpp>
+#include <boost/functional/hash.hpp>
+#include "ComponentWrapper.h"
+
+class World;
+struct EntityWrapper
+{
+    EntityWrapper()
+        : World(nullptr)
+        , ID(EntityID_Invalid)
+    { }
+
+    EntityWrapper(::World* world, EntityID id)
+        : World(world)
+        , ID(id)
+    { }
+
+    ::World* World;
+    EntityID ID;
+
+    static const EntityWrapper Invalid;
+
+    bool HasComponent(const std::string& componentName);
+    EntityWrapper Parent();
+    bool Valid();
+
+    ComponentWrapper operator[](const char* componentName);
+    bool operator==(const EntityWrapper& e) const;
+    bool operator!=(const EntityWrapper& e) const;
+    explicit operator EntityID() const;
+    operator bool();
+};
+
+namespace std
+{
+	template<> struct hash<EntityWrapper>
+	{
+		std::size_t operator()(const EntityWrapper& e) const
+		{
+            std::size_t seed = 0;
+            boost::hash_combine(seed, e.World);
+            boost::hash_combine(seed, e.ID);
+            return seed;
+		}
+	};
+}
+
+#endif

include/Engine/Core/EntityXMLFile.h

@@ -1,141 +0,0 @@
-#ifndef EntityXMLFile_h__
-#define EntityXMLFile_h__
-
-#include <sstream>
-
-#include "../Common.h"
-#include "../GLM.h"
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/dom/DOMLSInput.hpp>
-#include <xercesc/dom/DOMElement.hpp>
-#include <xercesc/framework/Wrapper4InputSource.hpp>
-#include <xercesc/framework/LocalFileInputSource.hpp>
-#include <xercesc/framework/LocalFileFormatTarget.hpp>
-#include <xercesc/framework/MemBufFormatTarget.hpp>
-#include <xercesc/framework/MemBufInputSource.hpp>
-#include <xercesc/sax/HandlerBase.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/util/XMLFloat.hpp>
-#include <xercesc/framework/XMLGrammarPoolImpl.hpp>
-#include <xercesc/parsers/XercesDOMParser.hpp>
-#include <xercesc/framework/psvi/XSElementDeclaration.hpp>
-#include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
-#include <xercesc/framework/psvi/XSParticle.hpp>
-#include <xercesc/framework/psvi/XSModelGroup.hpp>
-#include <xercesc/framework/psvi/XSAnnotation.hpp>
-#include <xercesc/framework/psvi/XSValue.hpp>
-#include <xercesc/framework/XMLValidator.hpp>
-
-#include "ResourceManager.h"
-#include "Entity.h"
-#include "ComponentInfo.h"
-class World;
-
-class EntityPreprocessorXMLErrorHandler : public xercesc::DOMErrorHandler
-{
-public:
-	bool handleError(const xercesc::DOMError &e) override
-	{
-		char* message = xercesc::XMLString::transcode(e.getMessage());
-		std::cerr << "Preprocessor DOMError: " << message << std::endl;
-		xercesc::XMLString::release(&message);
-		return false;
-	}
-};
-
-class EntityParserXMLErrorHandler : public xercesc::ErrorHandler
-{
-public:
-	void warning(const xercesc::SAXParseException& e) override
-	{
-		reportParseException("Warning", e);
-	}
-	void error(const xercesc::SAXParseException& e) override
-	{
-		reportParseException("Error", e);
-	}
-	void fatalError(const xercesc::SAXParseException& e) override
-	{
-		reportParseException("FATAL ERROR", e);
-	}
-	void resetErrors() override { }
-
-private:
-	void reportParseException(std::string type, const xercesc::SAXParseException& e)
-	{
-		char* message = xercesc::XMLString::transcode(e.getMessage());
-		char* systemID = xercesc::XMLString::transcode(e.getSystemId());
-		std::cerr << systemID << ":" << e.getLineNumber() << ":" << e.getColumnNumber() << std::endl;
-		std::cerr << type << ": " << message << std::endl;
-		xercesc::XMLString::release(&systemID);
-		xercesc::XMLString::release(&message);
-	}
-};
-
-class XSTR
-{
-public:
-	XSTR(const XMLCh* const xmlString) 
-	{
-		m_AsChar = xercesc::XMLString::transcode(xmlString);
-	}
-
-	XSTR(const char* normalString)
-	{
-		m_AsXMLCh = xercesc::XMLString::transcode(normalString);
-	}
-
-	~XSTR()
-	{
-		if (m_AsChar != nullptr) {
-			xercesc::XMLString::release(&m_AsChar);
-		}
-		if (m_AsXMLCh != nullptr) {
-			xercesc::XMLString::release(&m_AsXMLCh);
-		}
-	}
-
-	operator const char*() const { return m_AsChar; }
-	operator const XMLCh*() const { return m_AsXMLCh; }
-
-private:
-	char* m_AsChar = nullptr;
-	XMLCh* m_AsXMLCh = nullptr;
-};
-
-class EntityXMLFile : public Resource
-{
-	friend class ResourceManager;
-
-private:
-	EntityXMLFile(std::string path);
-
-public:
-    ~EntityXMLFile();
-
-    void PopulateWorld(World* world);
-
-private:
-    static unsigned int InstanceCount;
-
-	std::string m_EntityFile;
-	xercesc::XMLGrammarPool* m_GrammarPool = nullptr;
-	EntityParserXMLErrorHandler* m_ErrorHandler = nullptr;
-	xercesc::XercesDOMParser* m_DOMParser = nullptr;
-	xercesc::DOMDocument* m_DOMDocument = nullptr;
-	std::map<std::string, ComponentInfo> m_ComponentInfo;
-
-    // Preprocesses the entity file to insert include-by-copy child entities
-    // TODO: Make this work in memory instead of saving to file
-    void preprocess(std::string inPath, std::string outPath);
-
-    void parseComponentInfo();
-    void parseDefaults();
-    void predictComponentAllocation();
-    void parseEntityGraph(World* world, xercesc::DOMElement* parent, EntityID parentEntity);
-    std::size_t getTypeStride(std::string typeName);
-    float getFloatAttribute(const xercesc::DOMElement* element, const char* attribute) const;
-    void writeData(const xercesc::DOMElement* element, std::string typeName, char* outData);
-};
-
-#endif

include/Engine/Core/EventBroker.h

@@ -13,6 +13,8 @@
 	relay = decltype(relay)(std::bind(handler, this, std::placeholders::_1)); \
 	m_EventBroker->Subscribe(relay);
 
+typedef unsigned int EventID;
+
 class EventBroker;
 
 class BaseEventRelay
@@ -31,6 +33,7 @@ public:
     virtual bool Receive(const std::shared_ptr<Event> event) = 0;
 
 protected:
+    EventID m_EventID;
     std::string m_ContextTypeName;
     std::string m_EventTypeName;
     EventBroker* m_Broker;
@@ -40,7 +43,7 @@ template <typename ContextType, typename EventType>
 class EventRelay : public BaseEventRelay
 {
 public:
-    typedef std::function<bool(const EventType&)> CallbackType;
+    typedef std::function<bool(EventType&)> CallbackType;
 
     EventRelay()
         : m_Callback(nullptr)
@@ -62,7 +65,7 @@ template <typename ContextType, typename EventType>
 bool EventRelay<ContextType, EventType>::Receive(const std::shared_ptr<Event> event)
 {
     if (m_Callback != nullptr) {
-        return m_Callback(*static_cast<const EventType*>(event.get()));
+        return m_Callback(*static_cast<EventType*>(event.get()));
     } else {
         return false;
     }
@@ -95,6 +98,7 @@ public:
 
 private:
     bool m_IsProcessing = false;
+    EventID m_NextEventID = 0;
 
     typedef std::string ContextTypeName_t; // typeid(ContextType).name()
     typedef std::string EventTypeName_t; // typeid(EventType).name()
@@ -103,14 +107,14 @@ private:
     typedef std::unordered_map<ContextTypeName_t, EventRelays_t> ContextRelays_t;
     ContextRelays_t m_ContextRelays;
     std::vector<BaseEventRelay*> m_RelaysToSubscribe;
-    std::vector<BaseEventRelay*> m_RelaysToUnsubscribe;
+    std::vector<std::tuple<EventID, ContextTypeName_t, EventTypeName_t>> m_RelaysToUnsubscribe;
 
     typedef std::list<std::pair<EventTypeName_t, std::shared_ptr<Event>>> EventQueue_t;
     std::shared_ptr<EventQueue_t> m_EventQueueRead;
     std::shared_ptr<EventQueue_t> m_EventQueueWrite;
 
     void subscribeImmediate(BaseEventRelay& relay);
-    void unsubscribeImmediate(BaseEventRelay& relay);
+    void unsubscribeImmediate(std::tuple<EventID, ContextTypeName_t, EventTypeName_t> identifier);
 };
 
 template <typename EventType>

include/Engine/Core/InputController.h

@@ -11,25 +11,22 @@ template <typename EventContext>
 class InputController
 {
 public:
-	InputController(std::shared_ptr<dd::EventBroker> eventBroker)
+	InputController(EventBroker* eventBroker)
-		: EventBroker(eventBroker)
+		: m_EventBroker(eventBroker)
 	{ Initialize(); }
 
 	virtual void Initialize()
 	{
 		EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &InputController::OnCommand);
-		EVENT_SUBSCRIBE_MEMBER(m_EMouseMove, &InputController::OnMouseMove);
 	}
 
-	virtual bool OnCommand(const Events::InputCommand &event) { return false; }
+	virtual bool OnCommand(const Events::InputCommand& e) { return false; }
-	virtual bool OnMouseMove(const Events::MouseMove &event) { return false; }
 
 protected:
-	std::shared_ptr<dd::EventBroker> EventBroker;
+	EventBroker* m_EventBroker;
 
 private:
 	EventRelay<EventContext, Events::InputCommand> m_EInputCommand;
-	EventRelay<EventContext, Events::MouseMove> m_EMouseMove;
 };
 
 #endif

include/Engine/Core/InputManager.h

@@ -8,12 +8,15 @@
 #include "EventBroker.h"
 #include "EKeyDown.h"
 #include "EKeyUp.h"
+#include "EKeyboardChar.h"
 #include "EMousePress.h"
 #include "EMouseRelease.h"
 #include "EMouseMove.h"
+#include "EMouseScroll.h"
 #include "ELockMouse.h"
 #include "EGamepadAxis.h"
 #include "EGamepadButton.h"
+#include "EFileDropped.h"
 
 class InputManager
 {
@@ -64,6 +67,13 @@ private:
 
 	void PublishGamepadAxisIfChanged(int gamepadID, Gamepad::Axis axis);
 	void PublishGamepadButtonIfChanged(int gamepadID, Gamepad::Button button);
+
+    static std::vector<unsigned int> GLFWCharCallbackQueue;
+    static void GLFWCharCallback(GLFWwindow* window, unsigned int c);
+    static std::vector<std::pair<double, double>> GLFWScrollCallbackQueue;
+    static void GLFWScrollCallback(GLFWwindow* window, double xoffset, double yoffset);
+    static std::vector<std::string> GLFWDropCallbackQueue;
+    static void GLFWDropCallback(GLFWwindow* window, int count, const char* paths[]);
 };
 
 #endif

include/Engine/Core/MemoryPool.h

@@ -5,6 +5,14 @@
 template <typename T>
 class MemoryPoolForwardIterator;
 
+namespace DisableMemoryPool
+{
+//if true -> Pool allocation is not used when calling Allocate/Free, just use regular dynamic allocation. 
+//if false -> Use pool allocation.
+//Should default to false, unless the DisableMemoryPool is true in the Config.ini files.
+extern bool Value;
+}
+
 //This is the class to use if you want to allocate blocks (slots) of raw memory, with a fixed maximum size (stride).
 //Additionally, if you know that every memory-block will contain one object of a specific type, (i.e. the stride for the slot 
 //will the size of the object type) you should use ObjectPool<T> instead, your life will become easier.
@@ -80,8 +88,8 @@ public:
 	//If element cannot be allocated in the pool, because the memory ran out, memory is allocated dynamically with malloc() "outside the pool".
 	char* Allocate()
 	{
-		for (; m_CurrentAllocSlot < m_NumSlots && m_SlotIsAllocated[m_CurrentAllocSlot]; ++m_CurrentAllocSlot);
+		for (; m_CurrentAllocSlot < m_NumSlots && m_SlotIsAllocated[m_CurrentAllocSlot] && !DisableMemoryPool::Value; ++m_CurrentAllocSlot);
-		if (m_CurrentAllocSlot < m_NumSlots) {
+		if (m_CurrentAllocSlot < m_NumSlots && !DisableMemoryPool::Value) {
 			if (m_LowestAllocatedSlot > m_CurrentAllocSlot)
 				m_LowestAllocatedSlot = m_CurrentAllocSlot;
 			//Mark the slot as allocated.
@@ -93,7 +101,9 @@ public:
 		else {
 			m_ExtraMemory.push_back((char*)malloc(m_Stride));
 			//We should preferably not enter here to avoid performance issues. Set more numMaxElements in constructor instead.
-			LOG_WARNING("Allocated slots exceed Pool size, extra memory allocated dynamically. Pool size: %u, dynamic size: %u.", m_NumSlots, m_ExtraMemory.size());
+            if (!DisableMemoryPool::Value) {
+			    LOG_WARNING("Allocated slots exceed Pool size, extra memory allocated dynamically. Pool size: %u, dynamic size: %u.", m_NumSlots, m_ExtraMemory.size());
+            }
 			return m_ExtraMemory.back();
 		}
 	}
@@ -108,7 +118,7 @@ public:
 		//(i.e. IsAllocatedInPool may give false positives)
 		//if it was malloc():ed 
 		//so, we may enter here even if we shouldn't.
-		if (IsAllocatedInPool(obj)) {
+		if (!DisableMemoryPool::Value && IsAllocatedInPool(obj)) {
 			--m_NumAllocatedSlots;
 			const size_t freeSlot = (obj - m_StartAddress) / m_Stride;
 			m_SlotIsAllocated[freeSlot] = false;
@@ -253,7 +263,7 @@ public:
 	}
 
 	//Postfix increment i.e. iter++. Prefer pre-increment (++iter) for efficiency.
-	MemoryPoolForwardIterator& operator++(int)
+	MemoryPoolForwardIterator operator++(int)
 	{
 		MemoryPoolForwardIterator<T> copyIter(*this);
 		operator++();

include/Engine/Core/Octree.h

@@ -0,0 +1,233 @@
+#ifndef Octree_h__
+#define Octree_h__
+
+#include <type_traits>
+
+#include "../Common.h"
+#include "AABB.h"
+
+//Fwd declarations.
+class Ray;
+
+namespace OctSpace
+{
+struct Output;
+struct ContainedObject;
+struct Child;
+}
+
+//T needs to be AABB, or inherit from AABB.
+//T also needs to have a default constructor.
+template<typename T>
+class Octree
+{
+public:
+    Octree() = delete;
+    ~Octree();
+    //For the root Octree, [octreeBounds] should be a box containing the entire level.
+    Octree(const AABB& octreeBounds, int subDivisions);
+
+    //We cannot copy the Octree as of now, because of the recursive dynamic allocation.
+    //Define these if the Octree suddenly needs to be copied, think of the children Child* ptrs. 
+    Octree(const Octree& other) = delete;
+    Octree(const Octree&& other) = delete;
+    Octree& operator= (const Octree& other) = delete;
+    //Add a dynamic object (one that moves around) into the tree.
+    void AddDynamicObject(const T& object);
+    //Add a static object (that does not move) into the tree.
+    void AddStaticObject(const T& object);
+    //Get the objects that are in the same area as the input [box], the objects are put in [outObjects].
+    //The type Box must be AABB, or inherit from AABB.
+    template<typename Box>
+    void ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects);
+    //Empty the tree of all objects, static and dynamic.
+    void ClearObjects();
+    //Empty the tree of all dynamic objects. Static objects remain in the tree.
+    void ClearDynamicObjects();
+
+    //Returns true if the ray collides with something in the tree. Result is written to [data].
+    bool RayCollides(const Ray& ray, OctSpace::Output& data);
+    //Returns true if the box collides with something in the tree. 
+    //On collision with a box, that box is written to [outBoxIntersected].
+    //Note: More efficient than calling ObjectsInSameRegion from outside and testing there.
+    bool BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected);
+
+private:
+    OctSpace::Child* m_Root;
+    std::vector<OctSpace::ContainedObject> m_StaticObjects;
+    std::vector<OctSpace::ContainedObject> m_DynamicObjects;
+
+    void falsifyObjectChecks();
+};
+
+namespace OctSpace
+{
+
+struct Output
+{
+    float CollideDistance;
+};
+
+struct ContainedObject
+{
+    ContainedObject()
+        : Box(nullptr)
+        , Checked(false)
+    {}
+    template<typename BoxlikeObject>
+    ContainedObject(const BoxlikeObject& box)
+        : Box(new BoxlikeObject(box))
+        , Checked(false)
+    {}
+    std::unique_ptr<AABB> Box;
+    bool Checked;
+};
+
+struct Child
+{
+    ~Child();
+    Child(const AABB& octTreeBounds,
+        int subDivisions,
+        std::vector<ContainedObject>& staticObjects,
+        std::vector<ContainedObject>& dynamicObjects);
+    Child(const Child& other) = delete;
+    Child(const Child&& other) = delete;
+    Child& operator= (const Child& other) = delete;
+    void AddDynamicObject(const AABB& box);
+    void AddStaticObject(const AABB& box);
+    template<typename T, typename Box>
+    void ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects) const;
+    void ClearObjects();
+    void ClearDynamicObjects();
+    bool RayCollides(const Ray& ray, Output& data) const;
+    bool BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected) const;
+
+    Child* m_Children[8];
+    //Indices into the lists in Octree.
+    std::vector<int> m_StaticObjIndices;
+    std::vector<int> m_DynamicObjIndices;
+    AABB m_Box;
+    //Reference to the lists in Octree.
+    std::vector<ContainedObject>& m_StaticObjectsRef;
+    std::vector<ContainedObject>& m_DynamicObjectsRef;
+
+    inline bool hasChildren() const;
+    int childIndexContainingPoint(const glm::vec3& point) const;
+    std::vector<int> childIndicesContainingBox(const AABB& box) const;
+};
+
+}
+
+template<typename T>
+Octree<T>::Octree(const AABB& octTreeBounds, int subDivisions)
+    : m_Root(new OctSpace::Child(octTreeBounds, subDivisions, m_StaticObjects, m_DynamicObjects))
+{
+    static_assert(std::is_base_of<AABB, T>::value, "template argument type T in Octree must be a subclass of AABB.");
+}
+
+template<typename T>
+Octree<T>::~Octree()
+{
+    delete m_Root;
+}
+
+template<typename T>
+void Octree<T>::AddDynamicObject(const T& object)
+{
+    m_Root->AddDynamicObject(object);
+    m_DynamicObjects.emplace_back(object);
+}
+
+template<typename T>
+void Octree<T>::AddStaticObject(const T& object)
+{
+    m_Root->AddStaticObject(object);
+    m_StaticObjects.emplace_back(object);
+}
+
+template<typename T>
+template<typename Box>
+void Octree<T>::ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects)
+{
+    static_assert(std::is_base_of<AABB, Box>::value, "template argument type Box in Octree<T>::ObjectsInSameRegion must be a subclass of AABB.");
+    falsifyObjectChecks();
+    m_Root->ObjectsInSameRegion(box, outObjects);
+}
+
+template<typename T>
+void Octree<T>::ClearObjects()
+{
+    m_StaticObjects.clear();
+    m_DynamicObjects.clear();
+    m_Root->ClearObjects();
+}
+
+template<typename T>
+void Octree<T>::ClearDynamicObjects()
+{
+    m_DynamicObjects.clear();
+    m_Root->ClearDynamicObjects();
+}
+
+template<typename T>
+bool Octree<T>::RayCollides(const Ray& ray, OctSpace::Output& data)
+{
+    falsifyObjectChecks();
+    data.CollideDistance = -1;
+    return m_Root->RayCollides(ray, data);
+}
+
+template<typename T>
+bool Octree<T>::BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected)
+{
+    falsifyObjectChecks();
+    return m_Root->BoxCollides(boxToTest, outBoxIntersected);
+}
+
+template<typename T>
+void Octree<T>::falsifyObjectChecks()
+{
+    for (auto& obj : m_StaticObjects) {
+        obj.Checked = false;
+    }
+    for (auto& obj : m_DynamicObjects) {
+        obj.Checked = false;
+    }
+}
+
+template<typename T, typename Box>
+void OctSpace::Child::ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects) const
+{
+    if (hasChildren()) {
+        for (auto i : childIndicesContainingBox(box)) {
+            m_Children[i]->ObjectsInSameRegion(box, outObjects);
+        }
+    } else {
+        size_t startIndex = outObjects.size();
+        int numDuplicates = 0;
+        outObjects.resize(outObjects.size() + m_StaticObjIndices.size() + m_DynamicObjIndices.size());
+        for (size_t i = 0; i < m_StaticObjIndices.size(); ++i) {
+            ContainedObject& obj = m_StaticObjectsRef[m_StaticObjIndices[i]];
+            if (obj.Checked) {
+                ++numDuplicates;
+            } else {
+                obj.Checked = true;
+                outObjects[startIndex + i - numDuplicates] = *static_cast<T*>(obj.Box.get());
+            }
+        }
+        for (size_t i = 0; i < m_DynamicObjIndices.size(); ++i) {
+            ContainedObject& obj = m_DynamicObjectsRef[m_DynamicObjIndices[i]];
+            if (obj.Checked) {
+                ++numDuplicates;
+            } else {
+                obj.Checked = true;
+                outObjects[startIndex + i - numDuplicates] = *static_cast<T*>(obj.Box.get());
+            }
+        }
+        for (size_t i = 0; i < numDuplicates; ++i) {
+            outObjects.pop_back();
+        }
+    }
+}
+
+#endif

include/Engine/Core/Ray.h

@@ -0,0 +1,31 @@
+#ifndef Ray_h__
+#define Ray_h__
+
+#include "../GLM.h"
+#include "../Common.h"
+
+class Ray
+{
+public:
+    Ray(const glm::vec3& origin, const glm::vec3& dir)
+        : m_Origin(origin)
+        , m_Direction(glm::normalize(dir))
+    {
+        DEBUG_IF(true) {
+            if (glm::any(glm::isnan(m_Direction))) {
+                LOG_WARNING("Ray Direction was set to the zero-vector, expect unknown side effects and/or crashes.");
+            }
+        }
+    }
+    const glm::vec3& Origin() const { return m_Origin; }
+    const glm::vec3& Direction() const { return m_Direction; }
+    //Sets the ray origin at parameter.
+    void SetOrigin(const glm::vec3& origin) { m_Origin = origin; }
+    //Normalizes the parameter and sets direction to it.
+    void SetDirection(const glm::vec3& direction) { m_Direction = glm::normalize(direction); }
+private:
+    glm::vec3 m_Origin;
+    glm::vec3 m_Direction;
+};
+
+#endif // Ray_h__

include/Engine/Core/ResourceManager.h

@@ -12,7 +12,6 @@
 /** Base Resource class.
 
 	Implement this class for every resource to be handled by the resource manager.
-	Implement Create() to return a new object of that type.
 */
 class Resource
 {
@@ -22,6 +21,23 @@ protected:
 	Resource() { }
 
 public:
+    //Should be thrown in a Resource's constructor if it cannot complete because another resource is still loading.
+    //Not actually an error, just a message to the ResourceManager.
+    struct StillLoadingException : public std::exception
+    {
+        virtual const char* what() const throw()
+        {
+            return "Resource is still loading.";
+        }
+    };
+    struct FailedLoadingException : public std::exception
+    {
+        virtual const char* what() const throw()
+        {
+            return "Resource is failed to load.";
+        }
+    };
+
 	// Pretend that this is a pure virtual function that you have to implement
 	// FIXME: Why did we do this again instead of just using the constructor?
 	// static Resource* Create(std::string resourceName);
@@ -33,6 +49,15 @@ public:
 	unsigned int ResourceID;
 };
 
+//Any class inheriting from this class will always be loaded on the master thread, not on a parallel worker thread.
+//This is important in case some instructions must be executed on the main thread, e.g. OpenGL commands, like glBindBuffer.
+//This resource can still be loaded asyncronously, but it will not be loaded in a thread, instead it's constructor will 
+//be called once on every ResourceManager::Load, just throw StillLoadingException in the constructor if it is not done yet.
+class ThreadUnsafeResource : public Resource
+{
+    friend class ResourceManager;
+};
+
 /** Singleton resource manager to keep track of and cache any external engine assets */
 class ResourceManager
 {
@@ -40,6 +65,7 @@ private:
 	ResourceManager();
 
 public:
+    static bool UseThreading;
 	/*static ResourceManager& Instance()
 	{
 	static ResourceManager s;
@@ -49,15 +75,6 @@ public:
 	template <typename T>
 	static void RegisterType(std::string typeName);
 
-	/** Preloads a resource and caches it for future use
-
-		@tparam T Resource type.
-		@param resourceName Fully qualified name of the resource to preload.
-	*/
-	template <typename T>
-	static void Preload(std::string resourceName);
-	static void Preload(std::string resourceType, std::string resourceName);
-
 	/** Checks if a resource is in cache
 
 		@param resourceType Resource type as string.
@@ -65,15 +82,20 @@ public:
 	*/
 	// TODO: Templateify
 	static bool IsResourceLoaded(std::string resourceType, std::string resourceName);
+    
+	/** Return value should always be a valid pointer, will throw an exception on error.
+        If the resource has been loaded already, returns a pointer to it.
 
-	/** Hot-loads a resource and caches it for future use
+        If Async is false: Hot-loads a resource, caches it for future use, and returns a pointer to it. 
+        If Async is true: If the resource is not loaded yet, starts loading the resource 
+        in the background and throws Resource::StillLoadingException immediately.
 
 		@tparam T Resource type.
+		@tparam async Set this to true if the resource should be loaded asyncronously.
 		@param resourceName Fully qualified name of the resource to load.
 	*/
-	template <typename T>
+    template <typename T, bool async = false>
-	static T* Load(std::string resourceName, Resource* parent = nullptr);
+    static T* Load(const std::string& resourceName, Resource* parent = nullptr);
-	static Resource* Load(std::string resourceType, std::string resourceName, Resource* parent = nullptr);
 
 	/** Reloads an already loaded resource, keeping its resource ID intact.
 
@@ -87,19 +109,31 @@ public:
 	static void Update();
 
 private:
+    //This is a haxy way to make sure that IsMainThread is run when the program starts, so the master thread id is set.
+    struct MasterThreadChecker
+    {
+        MasterThreadChecker()
+        {
+            ResourceManager::IsMainThread();
+        }
+    };
+    const static MasterThreadChecker m_Checker;
+
 	static std::unordered_map<std::string, std::string> m_CompilerTypenameToResourceType;
     static std::unordered_map<std::string, std::function<Resource*(std::string)>> m_FactoryFunctions; // type -> factory function
 	static std::unordered_map<std::pair<std::string, std::string>, Resource*> m_ResourceCache; // (type, name) -> resource
 	static std::unordered_map<std::string, Resource*> m_ResourceFromName; // name -> resource
 	static std::unordered_map<Resource*, Resource*> m_ResourceParents; // resource -> parent resource
 
+	static std::unordered_map<std::pair<std::string, std::string>, boost::thread> m_LoadingThreads; // (type, name) -> loading thread
+	static std::unordered_map<std::pair<std::string, std::string>, std::exception_ptr> m_LoadingThreadExceptions; // (type, name) -> exceptions
+    static boost::recursive_mutex m_Mutex;
+
 	// TODO: Getters for IDs
 	static unsigned int m_CurrentResourceTypeID;
 	static std::unordered_map<std::string, unsigned int> m_ResourceTypeIDs;
 	// Number of resources of a type. Doubles as local ID.
 	static std::unordered_map<unsigned int, unsigned int> m_ResourceCount;
-	// Flag to suppress hot-load warnings when a preloading resource chain loads another resource
-	static bool m_Preloading;
 
 	static FileWatcher m_FileWatcher;
 	static void fileWatcherCallback(std::string path, FileWatcher::FileEventFlags flags);
@@ -108,22 +142,13 @@ private:
 	static unsigned int GetNewResourceID(unsigned int typeID);
 
 	// Internal: Create a resource and cache it
-	static Resource* CreateResource(std::string resourceType, std::string resourceName, Resource* parent);
+    static Resource* createResourceThrowing(const std::string& resourceType, const std::string& resourceName, Resource* parent);
+	static Resource* createResource(const std::string& resourceType, const std::string& resourceName, Resource* parent, std::exception_ptr& exception);
+    static Resource* cacheResource(Resource* resource, const std::string& resourceType, const std::string& resourceName, Resource* parent);
+
+    static bool IsMainThread();
 };
 
-template <typename T>
-T* ResourceManager::Load(std::string resourceName, Resource* parent /* = nullptr */)
-{
-	auto resourceTypename = typeid(T).name();
-	auto it = m_CompilerTypenameToResourceType.find(resourceTypename);
-	if (it == m_CompilerTypenameToResourceType.end()) {
-		LOG_ERROR("Failed to load resource \"%s\" of type \"%s\": type not registered", resourceName.c_str(), resourceTypename);
-		return nullptr;
-	}
-
-	return static_cast<T*>(Load(it->second, resourceName, parent));
-}
-
 template <typename T>
 void ResourceManager::RegisterType(std::string typeName)
 {
@@ -131,17 +156,85 @@ void ResourceManager::RegisterType(std::string typeName)
 	m_FactoryFunctions[typeName] = [](std::string resourceName) { return new T(resourceName); };
 }
 
-template <typename T>
+template <typename T, bool async>
-void ResourceManager::Preload(std::string resourceName)
+static T* ResourceManager::Load(const std::string& resourceName, Resource* parent /* = nullptr */)
 {
-	auto resourceTypename = typeid(T).name();
+    auto resourceTypename = typeid(T).name();
-	auto it = m_CompilerTypenameToResourceType.find(resourceTypename);
+    auto iter = m_CompilerTypenameToResourceType.find(resourceTypename);
-	if (it == m_CompilerTypenameToResourceType.end()) {
+    if (iter == m_CompilerTypenameToResourceType.end()) {
-		LOG_ERROR("Failed to load resource \"%s\" of type \"%s\": type not registered", resourceName.c_str(), resourceTypename);
+        LOG_ERROR("Failed to load resource \"%s\" of type \"%s\": type not registered", resourceName.c_str(), resourceTypename);
-		return;
+        throw Resource::FailedLoadingException();
-	}
+    }
 
-	Preload(it->second, resourceName);
+    std::string resourceType = iter->second;
+    constexpr bool mustNotLoadInThread = std::is_base_of<ThreadUnsafeResource, T>::value;
+    if (mustNotLoadInThread && !IsMainThread()) {
+        LOG_ERROR("Failed to Load \"%s\": ThreadUnsafeResource type \"%s\" load in the constructor of another resource that is loaded asyncronously.", resourceName.c_str(), iter->second.c_str());
+        throw Resource::FailedLoadingException();
+    }
+
+    auto cacheKey = std::make_pair(resourceType, resourceName);
+    decltype(m_ResourceCache)::iterator it;
+    //If a thread has already been launched to load this resource.
+    auto tIt = m_LoadingThreads.find(cacheKey);
+    if (UseThreading && tIt != m_LoadingThreads.end()) {
+        if (async) {
+            //Throw StillLoadingException if the thread is still working.
+            if (!tIt->second.try_join_for(boost::chrono::nanoseconds(1))) {
+                throw Resource::StillLoadingException();
+            }
+            //Else we know the thread has completed.
+        } else {
+            //Wait for the thread to finish loading.
+            tIt->second.join();
+        }
+        //When the thread is done, delete the thread.
+        m_LoadingThreads.erase(tIt);
+        //Rethrow the thread exception if it threw any.
+        auto excIt = m_LoadingThreadExceptions.find(cacheKey);
+        std::exception_ptr exception = excIt->second;
+        m_LoadingThreadExceptions.erase(excIt);
+        if (exception) {
+            std::rethrow_exception(exception);
+        }
+    }
+
+    //If resource has already been cached and completely loaded.
+    it = m_ResourceCache.find(cacheKey);
+    if (it != m_ResourceCache.end()) {
+        if (it->second != nullptr) {
+            return static_cast<T*>(it->second);
+        } else {
+            //Don't return null on failure, exception instead.
+            throw Resource::FailedLoadingException();
+        }
+    }
+
+    //If resource is not cached..
+    if (UseThreading && async) {
+        if (mustNotLoadInThread) {
+            try {
+                return static_cast<T*>(createResourceThrowing(resourceType, resourceName, parent));
+            } catch (const Resource::StillLoadingException&) {
+                throw;
+            }
+        } else {
+            //Create a thread that loads the resource into cache.
+            m_LoadingThreads[cacheKey] = boost::thread(createResource, resourceType, resourceName, parent, m_LoadingThreadExceptions[cacheKey]);
+            throw Resource::StillLoadingException();
+        }
+    } else {
+        //load and return the resource.
+        while (true) {
+            try {
+                return static_cast<T*>(createResourceThrowing(resourceType, resourceName, parent));
+            } catch (const Resource::StillLoadingException&) {
+                continue;
+            } catch (const std::exception&) {
+                throw;
+            }
+        }
+    }
 }
 
 #endif

include/Engine/Core/System.h

@@ -3,23 +3,49 @@
 
 #include "EventBroker.h"
 #include "World.h"
+#include "EntityWrapper.h"
 #include "ComponentWrapper.h"
 
 class System
 {
     friend class SystemPipeline;
 
-public:
-    System(EventBroker* eventBroker, std::string componentType)
-        : m_EventBroker(eventBroker)
-        , m_ComponentType(componentType)
-    { }
-
-    virtual void Update(World* world, ComponentWrapper& component, double dt) = 0;
-
 protected:
-    std::string m_ComponentType;
+    System(World* world, EventBroker) { }
+    System(World* world, EventBroker* eventBroker)
+        : m_World(world)
+        , m_EventBroker(eventBroker)
+    { }
+    virtual ~System() = default;
+
+    World* m_World;
     EventBroker* m_EventBroker;
 };
 
+class PureSystem : public virtual System
+{
+    friend class SystemPipeline;
+
+protected:
+    PureSystem(std::string componentType)
+        : m_ComponentType(componentType)
+    { }
+    virtual ~PureSystem() = default;
+
+    const std::string m_ComponentType;
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cComponent, double dt) = 0;
+};
+
+class ImpureSystem : public virtual System
+{
+    friend class SystemPipeline;
+
+protected:
+    ImpureSystem() = default;
+    virtual ~ImpureSystem() = default;
+
+    virtual void Update(double dt) = 0;
+};
+
 #endif

include/Engine/Core/SystemPipeline.h

@@ -5,54 +5,113 @@
 #include "EventBroker.h"
 #include "System.h"
 #include "World.h"
+#include "EPause.h"
 
 class SystemPipeline
 {
 public:
-    SystemPipeline(EventBroker* eventBroker)
+    SystemPipeline(World* world, EventBroker* eventBroker)
-        : m_EventBroker(eventBroker)
+        : m_World(world)
-    { }
+        , m_EventBroker(eventBroker)
+    {
+        EVENT_SUBSCRIBE_MEMBER(m_EPause, &SystemPipeline::OnPause);
+        EVENT_SUBSCRIBE_MEMBER(m_EResume, &SystemPipeline::OnResume);
+    }
+
     ~SystemPipeline()
     {
-        for (auto& pair : m_Systems) {
+        for (UnorderedSystems& group : m_OrderedSystemGroups) {
-            for (auto& system : pair.second) {
+            for (auto& pair : group.Systems) {
-                delete system;
+                delete pair.second;
             }
         }
     }
 
     template <typename T, typename... Arguments>
-    void AddSystem(Arguments... args)
+    //All systems with orderlevel 0 will be updated first, then 1, 2, etc.
+    void AddSystem(int updateOrderLevel, Arguments... args)
     {
-        System* system = new T(m_EventBroker, args...);
+        if (updateOrderLevel + 1 > m_OrderedSystemGroups.size()) {
-        if (!system->m_ComponentType.empty()) {
+            m_OrderedSystemGroups.resize(updateOrderLevel + 1);
-            m_Systems[system->m_ComponentType].push_back(system);
+        }
-        } else {
+        UnorderedSystems& group = m_OrderedSystemGroups[updateOrderLevel];
-            LOG_ERROR("Failed to add system \"%s\": Missing component type!", typeid(T).name());
+        System* system = new T(m_World, m_EventBroker, args...);
-            delete system;
+        group.Systems[typeid(T).name()] = system;
+
+        PureSystem* pureSystem = dynamic_cast<PureSystem*>(system);
+        if (pureSystem != nullptr) {
+            if (!pureSystem->m_ComponentType.empty()) {
+                group.PureSystems[pureSystem->m_ComponentType].push_back(pureSystem);
+            } else {
+                LOG_ERROR("Failed to add pure system \"%s\": Missing component type!", typeid(T).name());
+            }
+        }
+
+        ImpureSystem* impureSystem = dynamic_cast<ImpureSystem*>(system);
+        if (impureSystem != nullptr) {
+            group.ImpureSystems.push_back(impureSystem);
         }
     }
 
-    void Update(World* world, double dt)
+    void Update(double dt)
     {
-        for (auto& pair : m_Systems) {
+        if (m_Paused) {
-            const std::string& componentName = pair.first;
+            dt = 0.0;
-            auto& systems = pair.second;
+        }
-            const ComponentPool* pool = world->GetComponents(componentName);
+
-            if (pool == nullptr) {
+        for (UnorderedSystems& group : m_OrderedSystemGroups) {
-                continue;
+            // Process events
+            for (auto& pair : group.Systems) {
+                m_EventBroker->Process(pair.first);
             }
-            for (auto& component : *pool) {
+
-                for (auto& system : systems) {
+            // Update
-                    system->Update(world, component, dt);
+            for (auto& system : group.ImpureSystems) {
+                system->Update(dt);
+            }
+            for (auto& pair : group.PureSystems) {
+                const std::string& componentName = pair.first;
+                auto& systems = pair.second;
+                const ComponentPool* pool = m_World->GetComponents(componentName);
+                if (pool == nullptr) {
+                    continue;
+                }
+                for (auto& component : *pool) {
+                    for (auto& system : systems) {
+                        system->UpdateComponent(EntityWrapper(m_World, component.EntityID), component, dt);
+                    }
                 }
             }
         }
     }
 
 private:
+    World* m_World;
     EventBroker* m_EventBroker;
-    std::unordered_map<std::string, std::vector<System*>> m_Systems;
+    bool m_Paused = false;
+
+    struct UnorderedSystems
+    {
+        std::map<std::string, System*> Systems;
+        std::map<std::string, std::vector<PureSystem*>> PureSystems;
+        std::vector<ImpureSystem*> ImpureSystems;
+    };
+    std::vector<UnorderedSystems> m_OrderedSystemGroups;
+
+    EventRelay<SystemPipeline, Events::Pause> m_EPause;
+    bool OnPause(const Events::Pause& e) { 
+        if (e.World == m_World) { 
+            m_Paused = true; 
+        }
+        return true;
+    }
+    EventRelay<SystemPipeline, Events::Resume> m_EResume;
+    bool OnResume(const Events::Resume& e) {
+        if (e.World == m_World) {
+            m_Paused = false;
+        }
+        return true;
+    }
 };
 
 #endif

include/Engine/Core/Transform.h

@@ -0,0 +1,17 @@
+#ifndef Transform_h__
+#define Transform_h__
+
+#include "../GLM.h"
+#include "World.h"
+
+namespace Transform
+{
+
+glm::vec3 AbsolutePosition(World* world, EntityID entity);
+glm::quat AbsoluteOrientation(World* world, EntityID entity);
+glm::vec3 AbsoluteScale(World* world, EntityID entity);
+glm::mat4 ModelMatrix(EntityID entity, World* world);
+
+}
+
+#endif

include/Engine/Core/UniformScaleSystem.h

@@ -0,0 +1,22 @@
+#ifndef UniformScaleSystem_h__
+#define UniformScaleSystem_h__
+
+#include "../GLM.h"
+#include "System.h"
+#include "../Rendering/ESetCamera.h"
+
+class UniformScaleSystem : public PureSystem
+{
+public:
+    UniformScaleSystem(World* world, EventBroker* eventBroker);
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cUniformScale, double dt) override;
+
+private:
+    EntityWrapper m_Camera = EntityWrapper::Invalid;
+
+    EventRelay<UniformScaleSystem, Events::SetCamera> m_ESetCamera;
+    bool OnSetCamera(const Events::SetCamera& e);
+};
+
+#endif

include/Engine/Core/Util/IfDebug.h

@@ -0,0 +1,12 @@
+// Example:
+// DEBUG_IF(condition) {
+//    // This code is executed only in debug mode and if condition is true.
+// }
+// NOTE: condition statement is not executed at all in release mode.
+#ifndef DEBUG_IF
+#ifndef DEBUG
+#define DEBUG_IF(c) if(c)
+#else
+#define DEBUG_IF(c) if(false)
+#endif
+#endif

include/Engine/Core/Util/XercesString.h

@@ -0,0 +1,46 @@
+#ifndef Util_XercesString_h__
+#define Util_XercesString_h__
+
+#include <string>
+#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/util/XMLString.hpp>
+
+namespace XS
+{
+
+class ToString
+{
+public:
+    ToString(const XMLCh* const str) { m_AsChar = xercesc::XMLString::transcode(str); }
+    ~ToString()
+    {
+        if (m_AsChar != nullptr) {
+            xercesc::XMLString::release(&m_AsChar);
+        }
+    }
+
+    operator std::string() const { return std::string(m_AsChar); }
+private:
+    char* m_AsChar = nullptr;
+};
+
+class ToXMLCh
+{
+public:
+    ToXMLCh(const std::string str) { m_Transcoded = xercesc::XMLString::transcode(str.c_str()); }
+    ToXMLCh(const char* str) { m_Transcoded = xercesc::XMLString::transcode(str); }
+    ~ToXMLCh()
+    {
+        if (m_Transcoded != nullptr) {
+            xercesc::XMLString::release(&m_Transcoded);
+        }
+    }
+
+    operator const XMLCh*() const { return m_Transcoded; }
+private:
+    XMLCh* m_Transcoded = nullptr;
+};
+
+}
+
+#endif

include/Engine/Core/World.h

@@ -14,24 +14,45 @@ public:
 
     // Create empty entity
     EntityID CreateEntity(EntityID parent = 0);
-
+    // Delete entity and all components within
+    void DeleteEntity(EntityID entity);
+    // Check if an entity exists
+    bool ValidEntity(EntityID entity) const;
     // Register a component type and allocate space for it
     void RegisterComponent(ComponentInfo& ci);
     // Attach a component to an entity and fill it with default values
-    ComponentWrapper AttachComponent(EntityID entity, std::string componentType);
+    ComponentWrapper AttachComponent(EntityID entity, const std::string& componentType);
+    // Check if an entity has a component
+    bool HasComponent(EntityID entity, const std::string& componentType) const;
     // Get a component of an entity
-    ComponentWrapper GetComponent(EntityID entity, std::string componentType);
+    ComponentWrapper GetComponent(EntityID entity, const std::string& componentType);
+    // Delete a component off an entity
+    void DeleteComponent(EntityID entity, const std::string& componentType);
     // Get all components of the specified type
-    const ComponentPool* GetComponents(std::string componentType);
+    const ComponentPool* GetComponents(const std::string& componentType);
     // Get entity parent
     EntityID GetParent(EntityID entity);
+    // Change the parent of an entity
+    void SetParent(EntityID entity, EntityID parent);
+    // Get children of an entity
+    const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetChildren(EntityID entity);
+    // Get all component pools
+    const std::unordered_map<std::string, ComponentPool*>& GetComponentPools() const { return m_ComponentPools; }
+    // Get the entity children map
+    const std::unordered_multimap<EntityID, EntityID>& GetEntityChildren() const { return m_EntityChildren; }
+    // Set the textual name of an entity
+    void SetName(EntityID entity, const std::string& name);
+    // Get the textual name of an entity
+    std::string GetName(EntityID entity) const;
 
 private:
-    EntityID m_CurrentEntityID = 1;
+    EntityID m_CurrentEntityID = 0;
 
     std::unordered_map<EntityID, EntityID> m_EntityParents;
+    // TODO: This should be a more effective structure
     std::unordered_multimap<EntityID, EntityID> m_EntityChildren;
     std::unordered_map<std::string, ComponentPool*> m_ComponentPools;
+    std::unordered_map<EntityID, std::string> m_EntityNames;
 
     EntityID generateEntityID();
 };

include/Engine/Editor/EditorGUI.h

@@ -0,0 +1,153 @@
+#ifndef EditorGUI_h__
+#define EditorGUI_h__
+
+#include <imgui/imgui.h>
+#define IMGUI_DEFINE_MATH_OPERATORS
+#include <imgui/imgui_internal.h>
+#include <nativefiledialog/nfd.h>
+#include <boost/filesystem.hpp>
+#include <boost/any.hpp>
+#include "../Common.h"
+#include "../GLM.h"
+#include <glm/gtx/common.hpp>
+
+#include "EditorWidgetSystem.h"
+#include "../Core/EventBroker.h"
+#include "../Core/World.h"
+#include "../Core/EntityWrapper.h"
+#include "../Core/ResourceManager.h"
+#include "../Core/EPause.h"
+#include "../Core/EKeyDown.h"
+#include "../Rendering/Texture.h"
+
+class EditorGUI
+{
+public:
+    EditorGUI(World* world, EventBroker* eventBroker);
+
+    enum class WidgetMode
+    {
+        Translate,
+        Rotate,
+        Scale
+    };
+
+    void Draw();
+
+    void SelectEntity(EntityWrapper entity);
+    void SetDirty(EntityWrapper entity);
+
+    // Called when an entity is selected in the entity tree
+    typedef std::function<void(EntityWrapper)> OnEntitySelectedCallback_t;
+    void SetEntitySelectedCallback(OnEntitySelectedCallback_t f) { m_OnEntitySelected = f; }
+    // Called when the user means to import an entity file. 
+    // @param EntityWrapper The entity to parent the imported entity to. The entity will be imported into the world of this entity.
+    // @param boost::filesystem::path The path to the entity to import
+    // @return EntityWrapper The newly created entity
+    typedef std::function<EntityWrapper(EntityWrapper, boost::filesystem::path)> OnEntityImport_t;
+    void SetEntityImportCallback(OnEntityImport_t f) { m_OnEntityImport = f; }
+    // Called when the user means to save an entity to file.
+    // Permitted to throw exceptions on save failure.
+    typedef std::function<void(EntityWrapper, boost::filesystem::path)> OnEntitySave_t;
+    void SetEntitySaveCallback(OnEntitySave_t f) { m_OnEntitySave = f; }
+    // Called when the user means to create a new entity.
+    // @param EntityWrapper The parent of the entity to be created
+    // @return EntityWrapper The newly created entity
+    typedef std::function<EntityWrapper(EntityWrapper)> OnEntityCreate_t;
+    void SetEntityCreateCallback(OnEntityCreate_t f) { m_OnEntityCreate = f; }
+    // Called when the user means to delete an entity.
+    typedef std::function<void(EntityWrapper)> OnEntityDelete_t;
+    void SetEntityDeleteCallback(OnEntityDelete_t f) { m_OnEntityDelete = f; }
+    // Called when the user means to change the parent of an entity.
+    typedef std::function<void(EntityWrapper, EntityWrapper)> OnEntityChangeParent_t;
+    void SetEntityChangeParentCallback(OnEntityChangeParent_t f) { m_OnEntityChangeParent = f; }
+    // Called when the user means to rename an entity.
+    typedef std::function<void(EntityWrapper, const std::string&)> OnEntityChangeName_t;
+    void SetEntityChangeNameCallback(OnEntityChangeName_t f) { m_OnEntityChangeName = f; }
+    // Called when the user means to attach a new component to an entity.
+    typedef std::function<void(EntityWrapper, const std::string&)> OnComponentAttach_t;
+    void SetComponentAttachCallback(OnComponentAttach_t f) { m_OnComponentAttach = f; }
+    // Called when the user means to delete a component off an entity.
+    typedef std::function<void(EntityWrapper, const std::string&)> OnComponentDelete_t;
+    void SetComponentDeleteCallback(OnComponentDelete_t f) { m_OnComponentDelete = f; }
+    // Called when the user selects a widget mode.
+    typedef std::function<void(WidgetMode)> OnWidgetMode_t;
+    void SetWidgetModeCallback(OnWidgetMode_t f) { m_OnWidgetMode = f; }
+
+private:
+    World* m_World;
+    EventBroker* m_EventBroker;
+
+    struct EntityFileInfo
+    {
+        boost::filesystem::path Path;
+        bool Dirty = false;
+    };
+
+    // Config variables
+    const boost::filesystem::path m_DefaultEntityPath = boost::filesystem::path("Schema") / boost::filesystem::path("Entities");
+
+    // State
+    EntityWrapper m_CurrentSelection = EntityWrapper::Invalid;
+    std::unordered_map<EntityWrapper, EntityFileInfo> m_EntityFiles;
+    EntityWrapper m_CurrentlyDragging = EntityWrapper::Invalid;
+    std::string m_LastErrorMessage;
+    WidgetMode m_CurrentWidgetMode = WidgetMode::Translate;
+    std::set<std::string> m_ModalsToOpen;
+    std::map<std::string, boost::any> m_ModalData;
+
+    // Callbacks
+    OnEntitySelectedCallback_t m_OnEntitySelected = nullptr;
+    OnEntityImport_t m_OnEntityImport = nullptr;
+    OnEntitySave_t m_OnEntitySave = nullptr;
+    OnEntityCreate_t m_OnEntityCreate = nullptr;
+    OnEntityDelete_t m_OnEntityDelete = nullptr;
+    OnEntityChangeParent_t m_OnEntityChangeParent = nullptr;
+    OnEntityChangeName_t m_OnEntityChangeName = nullptr;
+    OnComponentAttach_t m_OnComponentAttach = nullptr;
+    OnComponentDelete_t m_OnComponentDelete = nullptr;
+    OnWidgetMode_t m_OnWidgetMode = nullptr;
+
+    // Events
+    EventRelay<EditorGUI, Events::KeyDown> m_EKeyDown;
+    bool OnKeyDown(const Events::KeyDown& e);
+
+    // Utility functions
+    boost::filesystem::path fileOpenDialog();
+    boost::filesystem::path fileSaveDialog();
+    const std::string formatEntityName(EntityWrapper entity);
+    GLuint tryLoadTexture(std::string filePath);
+    void openModal(const std::string& modal);
+
+    // Entity file handling methods
+    void entityImport(World* world);
+    void entitySave(EntityWrapper entity, bool saveAs = false);
+    void entityCreate(World* world, EntityWrapper parent);
+    void entityDelete(EntityWrapper entity);
+    void entityChangeParent(EntityWrapper entity, EntityWrapper parent);
+    
+    // UI drawing methods
+    void drawMenu();
+    void drawTools();
+    void drawEntities(World* world);
+    void drawEntitiesRecursive(World* world, EntityID parent);
+    bool drawEntityNode(EntityWrapper entity);
+    void drawComponents(EntityWrapper entity);
+    bool drawComponentNode(EntityWrapper entity, const ComponentInfo& componentType);
+    bool drawComponentField(ComponentWrapper& c, const ComponentInfo::Field_t& field);
+    bool drawComponentField_Vector(ComponentWrapper &c, const ComponentInfo::Field_t &field);
+    bool drawComponentField_Color(ComponentWrapper &c, const ComponentInfo::Field_t &field);
+    bool drawComponentField_int(ComponentWrapper &c, const ComponentInfo::Field_t &field);
+    bool drawComponentField_enum(ComponentWrapper &c, const ComponentInfo::Field_t &field);
+    bool drawComponentField_float(ComponentWrapper &c, const ComponentInfo::Field_t &field);
+    bool drawComponentField_double(ComponentWrapper &c, const ComponentInfo::Field_t &field);
+    bool drawComponentField_bool(ComponentWrapper &c, const ComponentInfo::Field_t &field);
+    bool drawComponentField_string(ComponentWrapper &c, const ComponentInfo::Field_t &field);
+    void drawModals();
+
+    // Custom UI elements
+    bool createDeleteButton(const std::string& componentType);
+    void createWidgetToolButton(WidgetMode mode);
+};
+
+#endif

include/Engine/Editor/EditorRenderSystem.h

@@ -0,0 +1,27 @@
+#ifndef EditorRenderSystem_h__
+#define EditorRenderSystem_h__
+
+#include "../Core/System.h"
+#include "../Rendering/IRenderer.h"
+#include "../Rendering/ModelJob.h"
+#include "../Rendering/Camera.h"
+#include "../Rendering/ESetCamera.h"
+
+class EditorRenderSystem : public ImpureSystem
+{
+public:
+    EditorRenderSystem(World* world, EventBroker* eventBroker, IRenderer* renderer, RenderFrame* renderFrame);
+
+    virtual void Update(double dt) override;
+
+private:
+    IRenderer* m_Renderer;
+    RenderFrame* m_RenderFrame;
+    Camera* m_EditorCamera;
+    EntityWrapper m_CurrentCamera = EntityWrapper::Invalid;
+
+    EventRelay<EditorRenderSystem, Events::SetCamera> m_ESetCamera;
+    bool OnSetCamera(Events::SetCamera& e);
+};
+
+#endif

include/Engine/Editor/EditorStats.h

@@ -0,0 +1,29 @@
+#include <numeric>
+#include <iomanip>
+#include <imgui/imgui.h>
+#include "../Common.h"
+#include "../GLM.h"
+#include "../OpenGL.h"
+
+class EditorStats
+{
+public:
+    EditorStats();
+    void Draw(double dt);
+
+private:
+    // FPS graph
+    const unsigned int m_SampleSize = 100;
+    unsigned int m_FrameCount = 0;
+    std::vector<double> m_FrameTimes;
+    double m_TimeAccumulator = 0.0;
+    double m_AveragedSamplesPerSecond = 10.0;
+    const unsigned int m_AveragedSampleSize = 100;
+    unsigned int m_CurrentAveragedSampleIndex = 0;
+    std::vector<double> m_AveragedSamples;
+    void drawFPSGraph(double dt);
+
+    void drawRAMUsage(double dt);
+
+    void drawVRAMStats(double dt);
+};

include/Engine/Editor/EditorSystem.h

@@ -0,0 +1,59 @@
+#include "../Core/System.h"
+#include "../Rendering/IRenderer.h"
+#include "../Rendering/Camera.h"
+#include "../Rendering/DebugCameraInputController.h"
+#include "../Rendering/ESetCamera.h"
+#include "../Core/World.h"
+#include "../Core/SystemPipeline.h"
+#include "../Core/ResourceManager.h"
+#include "../Core/EntityFilePreprocessor.h"
+#include "../Core/EntityFileParser.h"
+#include "../Core/EntityFileWriter.h"
+#include "../Core/EMousePress.h"
+#include "EditorGUI.h"
+#include "EditorStats.h"
+
+class EditorSystem : public ImpureSystem
+{
+public:
+    EditorSystem(World* world, EventBroker* eventBroker, IRenderer* renderer, RenderFrame* renderFrame);
+    ~EditorSystem();
+
+    void Update(double dt);
+
+private:
+    IRenderer* m_Renderer;
+    RenderFrame* m_RenderFrame;
+    World* m_EditorWorld;
+    SystemPipeline* m_EditorWorldSystemPipeline;
+    Camera* m_EditorCamera;
+    EntityWrapper m_Camera = EntityWrapper::Invalid;
+    DebugCameraInputController<EditorSystem>* m_DebugCameraInputController;
+    EditorGUI* m_EditorGUI;
+    EditorStats* m_EditorStats;
+
+    // State
+    EditorGUI::WidgetMode m_WidgetMode = EditorGUI::WidgetMode::Translate;
+    EntityWrapper m_Widget = EntityWrapper::Invalid;
+    EntityWrapper m_CurrentSelection = EntityWrapper::Invalid;
+
+    // Utility functions
+    EntityWrapper importEntity(EntityWrapper parent, boost::filesystem::path filePath);
+    void setWidgetMode(EditorGUI::WidgetMode mode);
+
+    // GUI callbacks
+    void OnEntitySelected(EntityWrapper entity);
+    void OnEntitySave(EntityWrapper entity, boost::filesystem::path filePath);
+    EntityWrapper OnEntityCreate(EntityWrapper parent);
+    void OnEntityDelete(EntityWrapper entity);
+    void OnEntityChangeParent(EntityWrapper entity, EntityWrapper parent);
+    void OnEntityChangeName(EntityWrapper entity, const std::string& name);
+    void OnComponentAttach(EntityWrapper entity, const std::string& componentType);
+    void OnComponentDelete(EntityWrapper entity, const std::string& componentType);
+
+    // Events
+    EventRelay<EditorSystem, Events::MousePress> m_EMousePress;
+    bool OnMousePress(const Events::MousePress& e);
+    EventRelay<EditorSystem, Events::WidgetDelta> m_EWidgetDelta;
+    bool OnWidgetDelta(const Events::WidgetDelta& e);
+};

include/Engine/Editor/EditorWidgetSystem.h

@@ -0,0 +1,49 @@
+#ifndef EditorWidgetSystem_h__
+#define EditorWidgetSystem_h__
+
+#include <imgui/imgui.h>
+#include "../GLM.h"
+#include "../Core/System.h"
+#include "../Rendering/IRenderer.h"
+#include "../Rendering/Util/ScreenCoords.h"
+#include "../Core/EMouseMove.h"
+#include "../Core/EMousePress.h"
+#include "../Core/EMouseRelease.h"
+
+namespace Events
+{
+
+struct WidgetDelta : Event
+{
+    glm::vec3 Translation;
+    glm::vec3 Rotation;
+    glm::vec3 Scale;
+};
+
+}
+
+class EditorWidgetSystem : public ImpureSystem, PureSystem
+{
+public:
+    EditorWidgetSystem(World* world, EventBroker* eventBroker, IRenderer* renderer);
+
+    virtual void Update(double dt) override;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cEditorWidget, double dt) override;
+
+private:
+    IRenderer* m_Renderer;
+
+    // State
+    EntityWrapper m_PickEntity = EntityWrapper::Invalid;
+    PickData m_PickData;
+    glm::vec2 m_MouseDelta;
+
+    EventRelay<EditorWidgetSystem, Events::MouseMove> m_EMouseMove;
+    bool OnMouseMove(const Events::MouseMove& e);
+    EventRelay<EditorWidgetSystem, Events::MousePress> m_EMousePress;
+    bool OnMousePress(const Events::MousePress& e);
+    EventRelay<EditorWidgetSystem, Events::MouseRelease> m_EMouseRelease;
+    bool OnMouseRelease(const Events::MouseRelease& e);
+};
+
+#endif

include/Engine/GLM.h

@@ -7,4 +7,5 @@
 #include <glm/gtx/rotate_vector.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <glm/gtx/quaternion.hpp>
-#include <glm/gtc/type_ptr.hpp>
+#include <glm/gtc/type_ptr.hpp>
+#include <glm/gtx/projection.hpp>

include/Engine/GUI/Button.h

@@ -40,7 +40,7 @@ public:
 		m_TexturePressed = resourceName;
 	}
 
-	void Draw(RenderQueueCollection& rq) override
+	void Draw(RenderScene& rq) override
 	{
 		if (m_Texture == nullptr && !m_TextureReleased.empty()) {
 			SetTexture(m_TextureReleased);

include/Engine/GUI/Frame.h

@@ -212,7 +212,7 @@ public:
 
 	virtual void Update(double dt) { }
 
-	void DrawLayered(RenderQueueCollection& rq)
+	void DrawLayered(RenderScene& rq)
 	{
 		if (this->Hidden())
 			return;
@@ -232,7 +232,7 @@ public:
 		}
 	}
 
-	virtual void Draw(RenderQueueCollection& rq) { }
+	virtual void Draw(RenderScene& rq) { }
 
 protected:
 	::EventBroker* m_EventBroker;

include/Engine/GUI/TextureFrame.h

@@ -16,7 +16,7 @@ public:
 	void EnableScissor() { m_ScissorEnabled = true; }
 	void DisableScissor() { m_ScissorEnabled = false; }
 
-	void Draw(RenderQueueCollection& rq) override
+	void Draw(RenderScene& rq) override
 	{
 		if (m_Texture == nullptr)
 			return;

include/Engine/Input/EBindGamepadAxis.h

@@ -1,24 +0,0 @@
-#ifndef Events_BindGamepadAxis_h__
-#define Events_BindGamepadAxis_h__
-
-#include "Core/EventBroker.h"
-#include "Core/EGamepadAxis.h"
-
-namespace Events
-{
-
-/** Called to bind a gamepad axis to an input command. */
-struct BindGamepadAxis : Event
-{
-	/** The axis to bind. */
-	Gamepad::Axis Axis;
-	/** The command to send. */
-	std::string Command;
-	/** The value to send for positive stimulation.
-	
-		Multiplied by the 0-1 clamped value of the axis.
-	*/
-	float Value;
-};
-
-}

include/Engine/Input/EBindGamepadButton.h

@@ -1,26 +0,0 @@
-#ifndef Events_BindGamepadButton_h__
-#define Events_BindGamepadButton_h__
-
-#include "Core/EventBroker.h"
-#include "Core/EGamepadButton.h"
-
-namespace Events
-{
-
-/** Called to bind a gamepad button to an input command. */
-struct BindGamepadButton : Event
-{
-	/** The gamepad button to bind. */
-	Gamepad::Button Button;
-	/** The command to send. */
-	std::string Command;
-	/** The value to send for positive stimulation.
-
-		Multiplied by the 0-1 clamped value of the button.
-	*/
-	float Value;
-};
-
-}
-
-#endif

include/Engine/Input/EBindKey.h

@@ -1,25 +0,0 @@
-#ifndef Events_BindKey_h__
-#define Events_BindKey_h__
-
-#include "Core/EventBroker.h"
-
-namespace Events
-{
-
-/** Called to bind a keyboard key to an input command. */
-struct BindKey : Event
-{
-	/** The GLFW key code to bind. */
-	int KeyCode;
-	/** The command to send. */
-	std::string Command;
-	/** The value to send for positive stimulation.
-
-		Multiplied by the 0-1 clamped value of the key.
-	*/
-	float Value;
-};
-
-}
-
-#endif

include/Engine/Input/EBindMouseButton.h

@@ -1,25 +0,0 @@
-#ifndef Events_BindMouseButton_h__
-#define Events_BindMouseButton_h__
-
-#include "Core/EventBroker.h"
-
-namespace Events
-{
-
-/** Called to bind a mouse button to an input command. */
-struct BindMouseButton : Event
-{
-	/** The GLFW mouse button code to bind. */
-	int Button;
-	/** The command to send. */
-	std::string Command;
-	/** The value to send for positive stimulation.
-
-		Multiplied by the 0-1 clamped value of the button.
-	*/
-	float Value;
-};
-
-}
-
-#endif

include/Engine/Input/EBindOrigin.h

@@ -0,0 +1,22 @@
+#ifndef Events_BindOrigin_h__
+#define Events_BindOrigin_h__
+
+#include "Core/EventBroker.h"
+
+namespace Events
+{
+
+/** Called to bind an input origin to an input command. */
+struct BindOrigin : Event
+{
+	/** The input origin to bind. */
+	std::string Origin;
+	/** The command to send. */
+	std::string Command;
+	/** The value to send for positive stimulation. */
+	float Value = 1.f;
+};
+
+}
+
+#endif

include/Engine/Input/EInputCommand.h

@@ -13,7 +13,7 @@ struct InputCommand : Event
 	/** The command that was sent. */
 	std::string Command;
 	/** The value of the command. */
-	float Value;
+	float Value = 0;
 };
 
 }

include/Engine/Input/FirstPersonInputController.h

@@ -0,0 +1,70 @@
+#ifndef FirstPersonInputController_h__
+#define FirstPersonInputController_h__
+
+#include "../GLM.h"
+#include "../Core/InputController.h"
+#include "../Core/ELockMouse.h"
+
+template <typename EventContext>
+class FirstPersonInputController : public InputController<EventContext>
+{
+public:
+    FirstPersonInputController(EventBroker* eventBroker, unsigned int playerID)
+        : InputController(eventBroker)
+        , m_PlayerID(playerID)
+    {
+        EVENT_SUBSCRIBE_MEMBER(m_ELockMouse, &FirstPersonInputController::OnLockMouse);
+        EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &FirstPersonInputController::OnUnlockMouse);
+    }
+
+    const glm::quat Orientation() const { return m_Orientation; }
+    
+    void LockMouse()
+    {
+        Events::LockMouse e;
+        m_EventBroker->Publish(e);
+        m_MouseLocked = true;
+    }
+
+    void UnlockMouse()
+    {
+        Events::UnlockMouse e;
+        m_EventBroker->Publish(e);
+        m_MouseLocked = false;
+    }
+
+    virtual bool OnCommand(const Events::InputCommand& e) override
+    {
+        if (m_PlayerID != e.PlayerID) {
+            return false;
+        }
+
+        if (m_MouseLocked) {
+            if (e.Command == "Pitch") {
+                float val = glm::radians(e.Value);
+                m_Orientation = m_Orientation * glm::angleAxis<float>(-val, glm::vec3(1, 0, 0));
+                return true;
+            }
+
+            if (e.Command == "Yaw") {
+                float val = glm::radians(e.Value);
+                m_Orientation = glm::angleAxis<float>(-val, glm::vec3(0, 1, 0)) * m_Orientation;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+protected:
+    const unsigned int m_PlayerID;
+    glm::quat m_Orientation;
+    bool m_MouseLocked = false;
+    
+    EventRelay<EventContext, Events::LockMouse> m_ELockMouse;
+    bool OnLockMouse(const Events::LockMouse& e) { m_MouseLocked = true; return true; }
+    EventRelay<EventContext, Events::UnlockMouse> m_EUnlockMouse;
+    bool OnUnlockMouse(const Events::UnlockMouse& e) { m_MouseLocked = false; return true; }
+};
+
+#endif

include/Engine/Input/InputHandler.h

@@ -0,0 +1,25 @@
+#ifndef InputHandler_h__
+#define InputHandler_h__
+
+#include "../Common.h"
+#include "../Core/EventBroker.h"
+#include "InputProxy.h"
+
+class InputHandler
+{
+public:
+    InputHandler(EventBroker* eventBroker, InputProxy* inputProxy)
+        : m_EventBroker(eventBroker)
+        , m_InputProxy(inputProxy)
+    { }
+
+    virtual bool BindOrigin(std::string origin, std::string command, float value) = 0;
+    virtual void Update(double dt) { }
+    virtual float GetCommandValue(std::string command) = 0;
+
+protected:
+    EventBroker* m_EventBroker;
+    InputProxy* m_InputProxy;
+};
+
+#endif

include/Engine/Input/InputProxy.h

@@ -0,0 +1,47 @@
+#ifndef InputProxy_h__
+#define InputProxy_h__
+
+#include <boost/tokenizer.hpp>
+#include "../Common.h"
+#include "../Core/ResourceManager.h"
+#include "../Core/ConfigFile.h"
+#include "EInputCommand.h"
+#include "EBindOrigin.h"
+
+class InputHandler;
+
+class InputProxy
+{
+public:
+    InputProxy(EventBroker* eventBroker);
+    ~InputProxy();
+    
+    void LoadBindings(std::string file);
+	void Update(double dt);
+    void Process();
+    template <typename T>
+    void AddHandler();
+    void Publish(const Events::InputCommand& e);
+
+protected:
+    EventBroker* m_EventBroker;
+    std::vector<InputHandler*> m_Handlers;
+    std::map<std::string, std::set<InputHandler*>> m_CommandHandlers;
+    
+    // Represents every unique command (has of PlayerID & Command) and all values reported for that command this frame
+    std::map<std::pair<unsigned int, std::string>, std::vector<float>> m_CommandQueue;
+
+    std::map<std::string, float> m_CurrentCommandValues;
+    std::map<std::string, float> m_LastCommandValues;
+
+	EventRelay<InputProxy, Events::BindOrigin> m_EBindOrigin;
+	bool OnBindOrigin(const Events::BindOrigin& e);
+};
+
+template <typename T>
+void InputProxy::AddHandler()
+{
+    m_Handlers.push_back(new T(m_EventBroker, this));
+}
+
+#endif

include/Engine/Input/InputSystem.h

@@ -1,78 +0,0 @@
-#ifndef InputSystem_h__
-#define InputSystem_h__
-
-#include <array>
-#include <unordered_map>
-
-#include "Core/System.h"
-#include "Core/EKeyUp.h"
-#include "Core/EKeyDown.h"
-#include "Core/EMousePress.h"
-#include "Core/EMouseRelease.h"
-#include "Core/EGamepadAxis.h"
-#include "Core/EGamepadButton.h"
-#include "Core/Util/EnumClassHash.h"
-#include "EBindKey.h"
-#include "EBindMouseButton.h"
-#include "EBindGamepadAxis.h"
-#include "EBindGamepadButton.h"
-#include "EInputCommand.h"
-
-namespace Systems
-{
-
-class InputSystem : public System
-{
-public:
-	InputSystem(World* world, std::shared_ptr<dd::EventBroker> eventBroker)
-		: System(world, eventBroker)
-	{ }
-
-	void RegisterComponents(ComponentFactory* cf) override;
-	void Initialize() override;
-
-	void Update(double dt) override;
-
-private:
-	std::unordered_map<std::string, std::unordered_map<int, float>> m_CommandKeyboardValues; // command string -> keyboard key value for command
-	std::unordered_map<std::string, std::unordered_map<int, float>> m_CommandMouseButtonValues; // command string -> mouse button value for command
-	std::unordered_map<std::string, std::unordered_map<Gamepad::Axis, float, EnumClassHash>> m_CommandGamepadAxisValues; // command string -> gamepad axis value for command
-	std::unordered_map<std::string, std::unordered_map<Gamepad::Button, float, EnumClassHash>> m_CommandGamepadButtonValues; // command string -> gamepad button value for command
-	// Input binding tables
-	std::unordered_multimap<int, std::tuple<std::string, float>> m_KeyBindings; // GLFW_KEY... -> command string & value
-	std::unordered_multimap<int, std::tuple<std::string, float>> m_MouseButtonBindings; // GLFW_MOUSE_BUTTON... -> command string
-	std::unordered_multimap<Gamepad::Axis, std::tuple<std::string, float>, EnumClassHash> m_GamepadAxisBindings; // Gamepad::Axis -> command string & value
-	std::unordered_multimap<Gamepad::Button, std::tuple<std::string, float>, EnumClassHash> m_GamepadButtonBindings; // Gamepad::Button -> command string
-
-	// Input events
-	EventRelay<InputSystem, Events::KeyDown> m_EKeyDown;
-	bool OnKeyDown(const Events::KeyDown &event);
-	EventRelay<InputSystem, Events::KeyUp> m_EKeyUp;
-	bool OnKeyUp(const Events::KeyUp &event);
-	EventRelay<InputSystem, Events::MousePress> m_EMousePress;
-	bool OnMousePress(const Events::MousePress &event);
-	EventRelay<InputSystem, Events::MouseRelease> m_EMouseRelease;
-	bool OnMouseRelease(const Events::MouseRelease &event);
-	EventRelay<InputSystem, Events::GamepadAxis> m_EGamepadAxis;
-	bool OnGamepadAxis(const Events::GamepadAxis &event);
-	EventRelay<InputSystem, Events::GamepadButtonDown> m_EGamepadButtonDown;
-	bool OnGamepadButtonDown(const Events::GamepadButtonDown &event);
-	EventRelay<InputSystem, Events::GamepadButtonUp> m_EGamepadButtonUp;
-	bool OnGamepadButtonUp(const Events::GamepadButtonUp &event);
-	// Input binding events
-	EventRelay<InputSystem, Events::BindKey> m_EBindKey;
-	bool OnBindKey(const Events::BindKey &event);
-	EventRelay<InputSystem, Events::BindMouseButton> m_EBindMouseButton;
-	bool OnBindMouseButton(const Events::BindMouseButton &event);
-	EventRelay<InputSystem, Events::BindGamepadAxis> m_EBindGamepadAxis;
-	bool OnBindGamepadAxis(const Events::BindGamepadAxis &event);
-	EventRelay<InputSystem, Events::BindGamepadButton> m_EBindGamepadButton;
-	bool OnBindGamepadButton(const Events::BindGamepadButton &event);
-
-	float GetCommandTotalValue(std::string command);
-	void PublishCommand(int playerID, std::string command, float value);
-};
-
-}
-
-#endif

include/Engine/Input/KeyboardInputHandler.h

@@ -0,0 +1,28 @@
+#ifndef KeyboardInputHandler_h__
+#define KeyboardInputHandler_h__
+
+#include <GLFW/glfw3.h>
+#include "InputHandler.h"
+#include "Core/EKeyDown.h"
+#include "Core/EKeyUp.h"
+
+class KeyboardInputHandler : public InputHandler
+{
+public:
+    KeyboardInputHandler(EventBroker* eventBroker, InputProxy* inputProxy);
+
+    bool BindOrigin(std::string origin, std::string command, float value) override;
+    virtual float GetCommandValue(std::string command) override;
+
+private:
+    std::unordered_map<std::string, int> m_OriginKeyCodes;
+	std::unordered_map<int, std::tuple<std::string, float>> m_KeyBindings; // GLFW_KEY... -> command string & value
+    std::unordered_map<std::string, float> m_CommandValues;
+
+	EventRelay<InputHandler, Events::KeyDown> m_EKeyDown;
+    bool OnKeyDown(const Events::KeyDown& e);
+	EventRelay<InputHandler, Events::KeyUp> m_EKeyUp;
+	bool OnKeyUp(const Events::KeyUp& e);
+};
+
+#endif

include/Engine/Input/MouseInputHandler.h

@@ -0,0 +1,38 @@
+#ifndef MouseInputHandler_h__
+#define MouseInputHandler_h__
+
+#include <GLFW/glfw3.h>
+#include "InputHandler.h"
+#include "Core/EMousePress.h"
+#include "Core/EMouseRelease.h"
+#include "Core/EMouseMove.h"
+
+class MouseInputHandler : public InputHandler
+{
+public:
+    MouseInputHandler(EventBroker* eventBroker, InputProxy* inputProxy);
+
+    bool BindOrigin(std::string origin, std::string command, float value) override;
+    virtual float GetCommandValue(std::string command) override;
+
+private:
+    std::unordered_map<std::string, int> m_OriginCodes;
+    std::unordered_map<std::string, char> m_OriginAxes;
+	std::unordered_map<int, std::tuple<std::string, float>> m_Bindings; // GLFW_MOUSE_BUTTON... -> command string & value
+	std::unordered_map<char, std::tuple<std::string, float>> m_Axes; // Axis -> command string & value
+    std::unordered_map<std::string, float> m_CommandValues;
+    std::unordered_map<std::string, float> m_ContinuousCommandValues;
+
+	EventRelay<InputHandler, Events::MousePress> m_EMousePress;
+    bool OnMousePress(const Events::MousePress& e);
+	EventRelay<InputHandler, Events::MouseRelease> m_EMouseRelease;
+	bool OnMouseRelease(const Events::MouseRelease& e);
+	EventRelay<InputHandler, Events::MouseMove> m_EMouseMove;
+	bool OnMouseMove(const Events::MouseMove& e);
+
+    bool hasOrigin(std::string origin);
+
+
+};
+
+#endif

include/Engine/Network/Client.h

@@ -1,14 +1,101 @@
 #ifndef Client_h__
 #define Client_h__
 
-#include <boost\asio.hpp>
+#include <string>
+#include <ctime>
+#include <limits>
+#include <queue>
 
-class Client
+#include <glm/common.hpp>
+#include <boost/asio.hpp>
+#include <boost/shared_array.hpp>
+
+#include "Network/Network.h"
+#include "Network/MessageType.h"
+#include "Network/PlayerDefinition.h"
+#include "Network/SnapshotDefinitions.h"
+#include "Core/World.h"
+#include "Core/EventBroker.h"
+#include "Core/ConfigFile.h"
+#include "Input/EInputCommand.h"
+#include "Core/EPlayerDamage.h"
+#include "Network/EInterpolate.h"
+
+class Client : public Network
 {
-	Client();
+public:
-	~Client();
+    Client(ConfigFile* config);
+    ~Client();
+    void Start(World* world, EventBroker* eventBroker) override;
+    void Update() override;
+private:
+    // Assio UDP logic
+    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
+    boost::asio::io_service m_IOService;
+    boost::asio::ip::udp::socket m_Socket;
 
+    // Sending message to server logic
+    int bytesRead = -1;
+    char readBuf[INPUTSIZE] = { 0 };
 
+    // Packet loss logic
+    unsigned int m_PacketID = 0;
+    unsigned int m_PreviousPacketID = 0;
+    unsigned int m_SendPacketID = 0;
+
+    // Game logic
+    World* m_World;
+    std::string m_PlayerName;
+    int m_PlayerID = -1;
+    EntityID m_ServerEntityID = std::numeric_limits<EntityID>::max();
+    bool m_IsConnected = false;
+    // Server Client Lookup map
+    // Assumes that root node for client and server is EntityID 0.
+
+    // Don't Add items to these two maps with insert, use insertIntoServerClientMaps(EntityID, EntityID)!!!!
+    std::unordered_map<EntityID, EntityID> m_ServerIDToClientID;
+    std::unordered_map<EntityID, EntityID> m_ClientIDToServerID;
+
+    // Network logic
+    PlayerDefinition m_PlayerDefinitions[MAXCONNECTIONS];
+    SnapshotDefinitions m_NextSnapshot;
+    double m_DurationOfPingTime;
+    std::clock_t m_StartPingTime;
+    std::vector<Events::InputCommand> m_InputCommandBuffer;
+
+    // Private member functions
+    void readFromServer();
+    int  receive(char* data, size_t length);
+    void send(Packet& packet);
+    void connect();
+    void disconnect();
+    void ping();
+    void parseMessageType(Packet& packet);
+    void updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID, const std::string& componentType);
+    void parseConnect(Packet& packet);
+    void parsePlayerConnected(Packet& packet);
+    void parsePing();
+    void parseServerPing();
+    void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
+    void parseSnapshot(Packet& packet);
+    void identifyPacketLoss();
+    bool hasServerTimedOut();
+    EntityID createPlayer();
+    void sendInputCommands();
+    void becomePlayer();
+    // Mapping Logic
+    // Returns if local EntityID exist in map
+    bool clientServerMapsHasEntity(EntityID clientEntityID);
+    // Returns if server EntityID exist in map
+    bool serverClientMapsHasEntity(EntityID serverEntityID);
+    void insertIntoServerClientMaps(EntityID serverEntityID, EntityID clientEntityID);
+
+    // Events
+    EventBroker* m_EventBroker;
+    EventRelay<Client, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
+    EventRelay<Client, Events::PlayerDamage> m_EPlayeDamage;
+    bool OnPlayerDamage(const Events::PlayerDamage& e);
 };
 
 #endif

include/Engine/Network/EInterpolate.h

@@ -0,0 +1,20 @@
+#ifndef Events_Interpolate_h__
+#define Events_Interpolate_h__
+
+#include <boost/shared_array.hpp>
+
+#include "Core/EventBroker.h"
+#include "Core/Entity.h"
+
+namespace Events
+{
+
+struct Interpolate : Event
+{
+    EntityID Entity;
+    boost::shared_array<char> DataArray;
+};
+
+}
+
+#endif

include/Engine/Network/MessageType.h

@@ -0,0 +1,20 @@
+#ifndef MessageType_h__
+#define MessageType_h__
+
+// Message types used by both server and client.
+// Used to determine what type of message was sent.
+enum class MessageType
+{
+	Connect,
+	Disconnect,
+	ClientPing,
+	ServerPing,
+	Message,
+	Snapshot,
+    OnInputCommand,
+    OnPlayerDamage,
+    PlayerConnected,
+    BecomePlayer
+};
+
+#endif

include/Engine/Network/Network.h

@@ -0,0 +1,20 @@
+#ifndef Network_h__
+#define Network_h__
+
+#include "Core/World.h"
+#include "Core/EventBroker.h"
+#include "Network/Packet.h"
+
+#define MAXCONNECTIONS 8
+#define INPUTSIZE 4097
+#define TIMEOUTMS 15000
+
+class Network
+{
+public:
+    virtual ~Network() { };
+    virtual void Start(World* m_world, EventBroker *eventBroker) = 0;
+    virtual void Update() = 0;
+};
+
+#endif

include/Engine/Network/Packet.h

@@ -0,0 +1,67 @@
+#ifndef Packet_h__
+#define Packet_h__
+
+#include <string>
+#include "Network/MessageType.h"
+#include "Core/Util/Logging.h"
+
+// Defines the 
+class Packet
+{
+public:
+    // arg1: Type of message (Connect, Disconnect...)
+    // arg2: PacketID for identifying packet loss.
+    Packet(MessageType type, unsigned int& packetID);
+    // Used to create packet from already existing data buffer.
+    Packet(char* data, const int sizeOfPacket);
+    Packet(MessageType type);
+    ~Packet();
+    void Init(MessageType type, unsigned int& packetID);
+
+    // Add primitive types like int, float, char...
+    template<typename T>
+    void WritePrimitive(T val)
+    {
+        // Check if we are trying to add more than the package can fit.
+        if (m_MaxPacketSize < m_Offset + sizeof(T)) {
+            LOG_WARNING("Packet AddPrimitive(): You are trying to add more than we have allocated for! New size is %i bytes\n", m_MaxPacketSize*2);
+            resizeData();
+        }
+        memcpy(m_Data + m_Offset, &val, sizeof(T));
+        m_Offset += sizeof(T);
+    }
+    // Pops the first element as if it was a primitive.
+    template<typename T>
+    T ReadPrimitive()
+    {
+        if (m_Offset < m_ReturnDataOffset + sizeof(T)) {
+            LOG_WARNING("Packet PopFrontPrimitive(): You are trying to remove more than what exists in this packet!");
+            return -1;
+        }
+        T returnValue;
+        memcpy(&returnValue, m_Data + m_ReturnDataOffset, sizeof(T));
+        m_ReturnDataOffset += sizeof(T);
+        return returnValue;
+    }
+    // Add a string to the message
+    void WriteString(const std::string& str);
+    // Add data to the message
+    void WriteData(char* data, int sizeOfData);
+    // Pops the first element as if it was a string.
+    std::string ReadString();
+    char* ReadData(int SizeOfData);
+    void ChangePacketID(unsigned int& packetID);
+    int Size() { return m_Offset; };
+    char* Data() { return m_Data; };
+    unsigned int DataReadSize() { return m_ReturnDataOffset; }
+    unsigned int MaxSize() { return m_MaxPacketSize; }
+
+private:
+    char* m_Data;
+    unsigned int m_ReturnDataOffset = 0;
+    int m_Offset = 0;
+    unsigned int m_MaxPacketSize = 512;
+    void resizeData();
+};
+
+#endif

include/Engine/Network/PlayerDefinition.h

@@ -0,0 +1,13 @@
+#ifndef PlayerDefinition_h__
+#define PlayerDefinition_h__
+#include <string>
+
+struct PlayerDefinition {
+    int EntityID = -1;
+    std::string Name = "";
+    boost::asio::ip::udp::endpoint Endpoint;
+    unsigned int PacketID;
+    std::clock_t StopTime;
+};
+
+#endif

include/Engine/Network/Server.h

@@ -1,12 +1,81 @@
 #ifndef Server_h__
 #define Server_h__
 
-#include <boost\asio.hpp>
+#include <string>
+#include <ctime>
 
-class Server
+#include <glm/common.hpp>
+#include <boost/asio/ip/udp.hpp>
+
+#include "Network/MessageType.h"
+#include "Network/PlayerDefinition.h"
+#include "Core/World.h"
+#include "Core/EventBroker.h"
+#include "../Network/Network.h"
+#include "Input/EInputCommand.h"
+#include "Core/EPlayerDamage.h"
+
+class Server : public Network
 {
-	Server();
+public:
-	~Server();
+    Server();
+    ~Server();
+    void Start(World* m_world, EventBroker *eventBroker) override;
+    void Update() override;
+private:
+    // UDP logic
+    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
+    boost::asio::io_service m_IOService;
+    boost::asio::ip::udp::socket m_Socket;
+
+    // Sending messages to client logic
+    PlayerDefinition m_PlayerDefinitions[MAXCONNECTIONS];
+    std::vector<PlayerDefinition> m_ConnectedUsers;
+    char readBuffer[INPUTSIZE] = { 0 };
+    int bytesRead = 0;
+    // time for previouse message
+    std::clock_t previousePingMessage = std::clock();
+    std::clock_t previousSnapshotMessage = std::clock();
+    std::clock_t timOutTimer = std::clock();
+    // How often we send messages (milliseconds)
+    int intervalMs = 1000;
+    int snapshotInterval = 50;
+    int checkTimeOutInterval = 100;
+
+    //Timers
+    std::clock_t m_StartPingTime;
+
+    // Game logic
+    World* m_World;
+    EventBroker* m_EventBroker;
+    
+    // Packet loss logic
+    unsigned int m_PacketID = 0;
+    unsigned int m_PreviousPacketID = 0;
+
+    // Private member functions
+    int  receive(char* data, size_t length);
+    void readFromClients();
+    void send(Packet& packet, int playerID);
+    void send(Packet& packet);
+    void broadcast(Packet& packet);
+    void sendSnapshot();
+    void sendPing();
+    void checkForTimeOuts();
+    void disconnect(int i);
+    void parseMessageType(Packet& packet);
+    void parseOnInputCommand(Packet& packet);
+    void parseOnPlayerDamage(Packet& packet);
+    void parseConnect(Packet& packet);
+    void parseDisconnect();
+    void parseClientPing();
+    void parseServerPing();
+    void identifyPacketLoss();
+    void createPlayer();
+    int GetPlayerIDFromEndpoint(boost::asio::ip::udp::endpoint endpoint);
+    // Debug event
+    EventRelay<Server, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
 };
 
 #endif

include/Engine/Network/SnapshotDefinitions.h

@@ -0,0 +1,12 @@
+#ifndef SnapshotDefinitions_h__
+#define SnapshotDefinitions_h__
+
+struct SnapshotDefinitions
+{
+	// "+Forward" is 8 characters * sizeof(char) = 8
+	std::string InputForward;
+	// "+Right" is 6 characters * sizeof(char) = 6
+    std::string InputRight;
+};
+
+#endif

include/Engine/Rendering/BaseTexture.h

@@ -3,7 +3,7 @@
 
 #include "../Core/ResourceManager.h"
 
-class BaseTexture : public Resource
+class BaseTexture : public ThreadUnsafeResource
 {
 	friend class ResourceManager;
 

include/Engine/Rendering/Camera.h

@@ -2,6 +2,7 @@
 #define Camera_h__
 
 #include "../GLM.h"
+#include "../Core/Util/Rectangle.h"
 
 class Camera
 {
@@ -26,13 +27,11 @@ public:
 	glm::quat Orientation() const { return m_Orientation; }
 	void SetOrientation(glm::quat val);
 
-	/*float Pitch() const { return m_Pitch; }
-	void Pitch(float val);
-	float Yaw() const { return m_Yaw; }
-	void Yaw(float val);*/
-
 	glm::mat4 ProjectionMatrix() const { return m_ProjectionMatrix; }
+    void SetProjectionMatrix(glm::mat4 val);
+
 	glm::mat4 ViewMatrix() const { return m_ViewMatrix; }
+    void SetViewMatrix(glm::mat4 val);
 
 	float AspectRatio() const { return m_AspectRatio; }
 	void SetAspectRatio(float val);
@@ -46,11 +45,12 @@ public:
 	float FarClip() const { return m_FarClip; }
 	void SetFarClip(float val);
 
-	
+    void UpdateViewMatrix();
+    void UpdateProjectionMatrix();
+
+    glm::vec2 WorldToScreen(glm::vec3 worldCoord, Rectangle resolution);
 
 private:
-	void UpdateViewMatrix();
-	void UpdateProjectionMatrix();
 
 	glm::vec3 m_Position;
 	glm::quat m_Orientation;

include/Engine/Rendering/DebugCameraInputController.h

@@ -0,0 +1,84 @@
+#ifndef DebugCameraInputController_h__
+#define DebugCameraInputController_h__
+
+#include <imgui/imgui.h>
+#include "../Input/FirstPersonInputController.h"
+#include "../Core/EMousePress.h"
+#include "../Core/EMouseRelease.h"
+
+template <typename EventContext>
+class DebugCameraInputController : public FirstPersonInputController<EventContext>
+{
+public:
+    DebugCameraInputController(EventBroker* eventBroker, unsigned int playerID)
+        : FirstPersonInputController(eventBroker, playerID)
+    {
+        EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &DebugCameraInputController::OnMousePress);
+        EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &DebugCameraInputController::OnMouseRelease);
+    }
+
+    void SetPosition(const glm::vec3 position) { m_Position = position; }
+    void SetOrientation(const glm::quat orientation) { m_Orientation = orientation; }
+
+    const glm::vec3 Position() const { return m_Position; }
+    void SetBaseSpeed(float speed) { m_BaseSpeed = speed; }
+
+    virtual bool OnCommand(const Events::InputCommand& e) override
+    {
+        ImGuiIO& io = ImGui::GetIO();
+
+        if (!io.WantCaptureKeyboard) {
+            if (e.Command == "Right") {
+                float value = std::max(-1.f, std::min(e.Value, 1.f));
+                m_Velocity.x = value;
+            }
+            if (e.Command == "Forward") {
+                float value = std::max(-1.f, std::min(e.Value, 1.f));
+                m_Velocity.z = -value;
+            }
+            if (e.Command == "Sprint") {
+                if (e.Value > 0.f) {
+                    m_Speed = m_BaseSpeed * 2.f * (e.Value);
+                } else {
+                    m_Speed = m_BaseSpeed;
+                }
+            }
+        }
+
+        return FirstPersonInputController::OnCommand(e);
+    }
+
+    void Update(double dt)
+    {
+        if (glm::length2(m_Velocity) > 0) {
+            m_Position += m_Orientation * (glm::normalize(m_Velocity) * m_Speed * (float)dt);
+        }
+    }
+
+protected:
+    glm::vec3 m_Position = glm::vec3(0, 0, 0);
+    glm::vec3 m_Velocity = glm::vec3(0, 0, 0);
+    float m_BaseSpeed = 2.0f;
+    float m_Speed = m_BaseSpeed;
+    EventRelay<EventContext, Events::MousePress> m_EMousePress;
+    bool OnMousePress(const Events::MousePress& e)
+    {
+        if (e.Button == GLFW_MOUSE_BUTTON_2) {
+            ImGuiIO& io = ImGui::GetIO();
+            if (!io.WantCaptureMouse) {
+                LockMouse();
+            }
+        }
+        return true;
+    }
+    EventRelay<EventContext, Events::MouseRelease> m_EMouseRelease;
+    bool OnMouseRelease(const Events::MouseRelease& e)
+    {
+        if (e.Button == GLFW_MOUSE_BUTTON_2) {
+            UnlockMouse();
+        }
+        return true;
+    }
+};
+
+#endif

include/Engine/Rendering/DirectionalLightJob.h

@@ -0,0 +1,35 @@
+#ifndef DirectionalLightJob_h__
+#define DirectionalLightJob_h__
+
+#include <cstdint>
+
+#include "../Common.h"
+#include "../GLM.h"
+#include "../Core/ComponentWrapper.h"
+#include "RenderJob.h"
+#include "../Core/Transform.h"
+#include "../Core/World.h"
+
+struct DirectionalLightJob : RenderJob
+{
+    DirectionalLightJob(ComponentWrapper transformComponent, ComponentWrapper directionalLightComponent, World* m_World)
+        : RenderJob()
+    {
+
+        Direction = glm::vec4(0,0,-1,0) * glm::inverse(Transform::AbsoluteOrientation(m_World, transformComponent.EntityID));
+        //Direction = glm::vec4((glm::vec3)directionalLightComponent["Direction"], 0.f);
+        Color = (glm::vec4)directionalLightComponent["Color"];
+        Intensity = (double)directionalLightComponent["Intensity"];
+    };
+
+    glm::vec4 Direction;
+    glm::vec4 Color;
+    float Intensity;
+
+    void CalculateHash() override
+    {
+        Hash = 0;
+    }
+};
+
+#endif

include/Engine/Rendering/DrawBloomPass.h

@@ -0,0 +1,53 @@
+#ifndef DrawBloomPass_h__
+#define DrawBloomPass_h__
+
+#include "IRenderer.h"
+#include "DrawBloomPassState.h"
+//#include "LightCullingPass.h" Finalpass om den skall skickas in
+#include "FrameBuffer.h"
+#include "ShaderProgram.h"
+//#include "Util/UnorderedMapVec2.h"
+#include "Texture.h"
+
+class DrawBloomPass
+{
+public:
+    DrawBloomPass(IRenderer* renderer /* ,Texture or finalpass*/ );
+    ~DrawBloomPass() { }
+    void InitializeTextures();
+    void InitializeFrameBuffers();
+    void InitializeShaderPrograms();
+    void InitializeBuffers();
+    void ClearBuffer();
+
+    void FillGaussianBuffer(FrameBuffer* fb);
+
+    void Draw(GLuint texture);
+
+    //Getters
+    //Return the blurred result of the texture that was sent into draw
+    GLuint GaussianTexture() const { return m_GaussianTexture_vert; }
+
+
+private:
+    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
+
+    Texture* m_WhiteTexture;
+    Model* m_ScreenQuad;
+
+    const IRenderer* m_Renderer;
+    //const LightCullingPass* m_LightCullingPass 
+    GLuint m_iterations = 9;
+
+    GLuint m_GaussianTexture_horiz;
+    GLuint m_GaussianTexture_vert;
+
+    FrameBuffer m_GaussianFrameBuffer_horiz;
+    FrameBuffer m_GaussianFrameBuffer_vert;
+
+    ShaderProgram* m_GaussianProgram_horiz;
+    ShaderProgram* m_GaussianProgram_vert;
+
+};
+
+#endif 

include/Engine/Rendering/DrawBloomPassState.h

@@ -0,0 +1,15 @@
+#ifndef DrawBloomPassState_h__
+#define DrawBloomPassState_h__
+
+#include "Rendering/RenderState.h"
+
+class DrawBloomPassState : public RenderState
+{
+public:
+    DrawBloomPassState();
+    ~DrawBloomPassState();
+private:
+
+};
+
+#endif

include/Engine/Rendering/DrawColorCorrectionPass.h

@@ -0,0 +1,29 @@
+#ifndef DrawColorCorrectionPass_h__
+#define DrawColorCorrectionPass_h__
+
+#include "IRenderer.h"
+#include "DrawScreenQuadPassState.h"
+#include "FrameBuffer.h"
+#include "ShaderProgram.h"
+//#include "Util/UnorderedMapVec2.h"
+#include "Texture.h"
+
+class DrawColorCorrectionPass
+{
+public:
+    DrawColorCorrectionPass(IRenderer* renderer);
+    ~DrawColorCorrectionPass() { }
+    void InitializeFrameBuffers();
+    void InitializeShaderPrograms();
+
+    void Draw(GLuint sceneTexture, GLuint bloomTexture);
+private:
+    const IRenderer* m_Renderer;
+
+    ShaderProgram* m_ColorCorrectionProgram;
+
+    Model* m_ScreenQuad;
+    GLfloat m_Exposure;
+};
+
+#endif 

include/Engine/Rendering/DrawFinalPass.h

@@ -0,0 +1,48 @@
+#ifndef DrawFinalPass_h__
+#define DrawFinalPass_h__
+
+#include "IRenderer.h"
+#include "DrawFinalPassState.h"
+#include "LightCullingPass.h"
+#include "FrameBuffer.h"
+#include "ShaderProgram.h"
+#include "Util/UnorderedMapVec2.h"
+#include "Texture.h"
+
+class DrawFinalPass
+{
+public:
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass);
+    ~DrawFinalPass() { }
+    void InitializeTextures();
+    void InitializeFrameBuffers();
+    void InitializeShaderPrograms();
+    void Draw(RenderScene& scene);
+    void ClearBuffer();
+
+    //Return the texture that is used in later stages to apply the bloom effect
+    GLuint BloomTexture() const { return m_BloomTexture; }
+    //Return the texture with diffuse and lighting of the scene.
+    GLuint SceneTexture() const { return m_SceneTexture; }
+    FrameBuffer* FinalPassFrameBuffer() { return &m_FinalPassFrameBuffer; }
+
+
+private:
+    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
+    void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps) const;
+
+    Texture* m_WhiteTexture;
+    Texture* m_BlackTexture;
+
+    FrameBuffer m_FinalPassFrameBuffer;
+    GLuint m_BloomTexture;
+    GLuint m_SceneTexture;
+    GLuint m_DepthBuffer;
+
+    const IRenderer* m_Renderer;
+    const LightCullingPass* m_LightCullingPass;
+
+    ShaderProgram* m_ForwardPlusProgram;
+};
+
+#endif 

include/Engine/Rendering/DrawFinalPassState.h

@@ -0,0 +1,15 @@
+#ifndef DrawFinalPassState_h__
+#define DrawFinalPassState_h__
+
+#include "Rendering/RenderState.h"
+
+class DrawFinalPassState : public RenderState
+{
+public:
+    DrawFinalPassState(GLuint frameBuffer);
+    ~DrawFinalPassState();
+private:
+
+};
+
+#endif

include/Engine/Rendering/DrawScenePass.h

@@ -1,36 +0,0 @@
-#ifndef DrawScenePass_h__
-#define DrawScenePass_h__
-
-#include "IRenderer.h"
-#include "DrawScenePassState.h"
-#include "FrameBuffer.h"
-#include "ShaderProgram.h"
-#include "Util/UnorderedMapVec2.h"
-#include "Texture.h"
-
-class DrawScenePass
-{
-public:
-    DrawScenePass(IRenderer* renderer);
-    ~DrawScenePass() { }
-    void InitializeTextures();
-    void InitializeFrameBuffers();
-    void InitializeShaderPrograms();
-
-    void Draw(RenderQueueCollection& rq);
-
-    //Getters
-
-
-private:
-    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
-
-    Texture* m_WhiteTexture;
-
-    const IRenderer* m_Renderer;
-
-    ShaderProgram* m_BasicForwardProgram;
-
-};
-
-#endif 

include/Engine/Rendering/DrawScenePassState.h

@@ -1,15 +0,0 @@
-#ifndef DrawScenePassState_h__
-#define DrawScenePassState_h__
-
-#include "Rendering/RenderState.h"
-
-class DrawScenePassState : public RenderState
-{
-public:
-    DrawScenePassState();
-    ~DrawScenePassState();
-private:
-
-};
-
-#endif

include/Engine/Rendering/DrawScreenQuadPass.h

@@ -0,0 +1,28 @@
+#ifndef DrawScreenQuadPass_h__
+#define DrawScreenQuadPass_h__
+
+#include "IRenderer.h"
+#include "DrawScreenQuadPassState.h"
+#include "FrameBuffer.h"
+#include "ShaderProgram.h"
+//#include "Util/UnorderedMapVec2.h"
+#include "Texture.h"
+
+class DrawScreenQuadPass
+{
+public:
+    DrawScreenQuadPass(IRenderer* renderer);
+    ~DrawScreenQuadPass() { }
+    void InitializeFrameBuffers();
+    void InitializeShaderPrograms();
+
+    void Draw(GLuint texture);
+private:
+    const IRenderer* m_Renderer;
+
+    ShaderProgram* m_DrawQuadProgram;
+
+    Model* m_ScreenQuad;
+};
+
+#endif 

include/Engine/Rendering/DrawScreenQuadPassState.h

@@ -0,0 +1,15 @@
+#ifndef DrawScreenQuadPassState_h__
+#define DrawScreenQuadPassState_h__
+
+#include "Rendering/RenderState.h"
+
+class DrawScreenQuadPassState : public RenderState
+{
+public:
+    DrawScreenQuadPassState();
+    ~DrawScreenQuadPassState();
+private:
+
+};
+
+#endif

include/Engine/Rendering/DummyRenderer.h

@@ -9,7 +9,7 @@ class DummyRenderer : public IRenderer
 {
 public:
 	virtual void Initialize() override;
-	virtual void Draw(RenderQueueCollection& rq) override;
+	virtual void Draw(RenderFrame& rq) override;
 };
 
 #endif

include/Engine/Rendering/EPicking.h

@@ -1,69 +0,0 @@
-#ifndef Events_Picking_h__
-#define Events_Picking_h__
-
-#include "../OpenGL.h"
-#include "../GLM.h"
-
-#include "../Core/EventBroker.h"
-#include "Util/ScreenCoords.h"
-#include "FrameBuffer.h"
-#include "../Core/Entity.h"
-#include "Util/UnorderedMapVec2.h"
-
-namespace Events
-{
-
-/** Thrown Every frame, use functions to pick*/
-struct Picking : Event
-{
-public:
-    Picking(FrameBuffer* pickingBuffer, GLuint* depthBuffer, glm::mat4 projectionMatrix, glm::mat4 viewMatrix, Rectangle resolution, const std::unordered_map<glm::vec2, EntityID>* pickingColorsToEntity)
-        : PickingBuffer(pickingBuffer)
-        , DepthBuffer(depthBuffer)
-        , ProjectionMatrix(projectionMatrix)
-        , ViewMatrix(viewMatrix)
-        , Resolution(resolution)
-        , PickingColorsToEntity(pickingColorsToEntity)
-    { }
-        
-    
-
-    struct PickData
-    {
-        //Picked Entity
-        EntityID Entity;
-        //World position of the "pick"
-        glm::vec3 Position;
-    };
-
-    PickData Pick(glm::vec2 screenCoord) const
-    {
-        PickData pickData;
-
-        ScreenCoords::PixelData data = ScreenCoords::ToPixelData(screenCoord, PickingBuffer, *DepthBuffer);
-
-        auto it = PickingColorsToEntity->find(glm::vec2(data.Color[0], data.Color[1]));
-        if (it != PickingColorsToEntity->end()) {
-            pickData.Entity = it->second;
-        } else {
-            pickData.Entity = -1;
-        }
-        pickData.Position = ScreenCoords::ToWorldPos(screenCoord.x, Resolution.Width - screenCoord.y, data.Depth, Resolution, ProjectionMatrix, ViewMatrix);
-
-        return pickData;
-    }
-
-
-private:
-    FrameBuffer* PickingBuffer;
-    GLuint* DepthBuffer;
-    const glm::mat4 ProjectionMatrix;
-    const glm::mat4 ViewMatrix;
-    const Rectangle Resolution;
-    const std::unordered_map<glm::vec2, EntityID>* PickingColorsToEntity;
-    
-};
-
-}
-
-#endif

include/Engine/Rendering/ESetCamera.h

@@ -0,0 +1,17 @@
+#ifndef Events_SetCamera_h__
+#define Events_SetCamera_h__
+
+#include "../Core/EventBroker.h"
+#include "../Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct SetCamera : Event
+{
+    EntityWrapper CameraEntity;
+};
+
+}
+
+#endif

include/Engine/Rendering/Font.h

@@ -0,0 +1,36 @@
+#ifndef Font_h__
+#define Font_h__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H  
+#include FT_GLYPH_H
+#include <boost/tokenizer.hpp>
+#include <boost/lexical_cast.hpp>
+
+#include "../OpenGL.h"
+#include "../GLM.h"
+#include "../Core/ResourceManager.h"
+
+class Font : public Resource
+{
+    friend class ResourceManager;
+private:
+    Font(std::string path);
+    
+public:
+    struct Character {
+        GLuint     TextureID;  // ID handle of the glyph texture
+        glm::ivec2 Size;       // Size of glyph
+        glm::ivec2 Bearing;    // Offset from baseline to left/top of glyph
+        GLuint     Advance;    // Offset to advance to next glyph
+    };
+
+    
+
+    int FontSize = 16;
+
+    ~Font();
+
+    std::map<GLchar, Character> m_Characters;
+};
+#endif

include/Engine/Rendering/IRenderer.h

@@ -9,6 +9,17 @@
 #include "Camera.h"
 #include "RenderQueue.h"
 #include "Model.h"
+#include "../Core/World.h" //So temp
+
+
+struct PickData
+{
+    EntityID Entity;
+    glm::vec3 Position; //World position
+    float Depth;
+    ::Camera* Camera;
+    const ::World* World;
+};
 
 class IRenderer
 {
@@ -20,28 +31,19 @@ public:
 	void SetFullscreen(bool fullscreen) { m_Fullscreen = fullscreen; }
 	bool VSYNC() const { return m_VSYNC; }
 	void SetVSYNC(bool vsync) { m_VSYNC = vsync; }
-	::Camera* Camera() const { return m_Camera; }
-	void SetCamera(::Camera* camera)
-	{
-		if (camera == nullptr) {
-			m_Camera = m_DefaultCamera;
-		} else {
-			m_Camera = camera;
-		}
-	}
-
 	virtual void Initialize() = 0;
 	virtual void Update(double dt) = 0;
-	virtual void Draw(RenderQueueCollection& rq) = 0;
+	virtual void Draw(RenderFrame& rq) = 0;
+    virtual PickData Pick(glm::vec2 screenCord) = 0;
+
+    World* m_World; //Temp world, untill viktor merge.
 
 protected:
-	Rectangle m_Resolution = Rectangle(1280, 720);
+	Rectangle m_Resolution = Rectangle::Rectangle(1280, 720);
 	bool m_Fullscreen = false;
 	bool m_VSYNC = false;
 	int m_GLVersion[2];
 	std::string m_GLVendor;
-	::Camera* m_DefaultCamera;
-	::Camera* m_Camera = nullptr;
 	GLFWwindow* m_Window = nullptr;
 };
 

include/Engine/Rendering/ImGuiRenderPass.h

@@ -0,0 +1,77 @@
+#include <imgui/imgui.h>
+#include "../OpenGL.h"
+#include "IRenderer.h"
+#include "RenderState.h"
+#include "../Core/EventBroker.h"
+#include "../Core/EMousePress.h"
+#include "../Core/EMouseRelease.h"
+#include "../Core/EMouseMove.h"
+#include "../Core/EMouseScroll.h"
+#include "../Core/EKeyDown.h"
+#include "../Core/EKeyUp.h"
+#include "../Core/EKeyboardChar.h"
+
+class ImGuiRenderState : public RenderState
+{
+public:
+    ImGuiRenderState()
+        : RenderState()
+    {
+        BindFramebuffer(0);
+        Enable(GL_BLEND);
+        BlendEquation(GL_FUNC_ADD);
+        BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        Disable(GL_CULL_FACE);
+        Disable(GL_DEPTH_TEST);
+        Enable(GL_SCISSOR_TEST);
+    }
+};
+
+class ImGuiRenderPass
+{
+public:
+    ImGuiRenderPass(IRenderer* renderer, EventBroker* eventBroker);
+
+    void Update(double dt);
+    void Draw();
+
+private:
+    IRenderer* m_Renderer;
+    EventBroker* m_EventBroker;
+
+    GLFWwindow* g_Window;
+    double g_DeltaTime = 0.0;
+    float g_MouseWheel = 0.f;
+    GLuint g_FontTexture;
+    int g_ShaderHandle;
+    int g_VertHandle;
+    int g_FragHandle;
+    int g_AttribLocationTex;
+    int g_AttribLocationProjMtx;
+    int g_AttribLocationPosition;
+    int g_AttribLocationUV;
+    int g_AttribLocationColor;
+    GLuint g_VboHandle;
+    GLuint g_VaoHandle;
+    GLuint g_ElementsHandle;
+
+    EventRelay<ImGuiRenderPass, Events::MousePress> m_EMousePress;
+    bool OnMousePress(const Events::MousePress& e);
+    EventRelay<ImGuiRenderPass, Events::MouseRelease> m_EMouseRelease;
+    bool OnMouseRelease(const Events::MouseRelease& e);
+    EventRelay<ImGuiRenderPass, Events::MouseMove> m_EMouseMove;
+    bool OnMouseMove(const Events::MouseMove& e);
+    EventRelay<ImGuiRenderPass, Events::MouseScroll> m_EMouseScroll;
+    bool OnMouseScroll(const Events::MouseScroll& e);
+    EventRelay<ImGuiRenderPass, Events::KeyDown> m_EKeyDown;
+    bool OnKeyDown(const Events::KeyDown& e);
+    EventRelay<ImGuiRenderPass, Events::KeyUp> m_EKeyUp;
+    bool OnKeyUp(const Events::KeyUp& e);
+    EventRelay<ImGuiRenderPass, Events::KeyboardChar> m_EKeyboardChar;
+    bool OnKeyboardChar(const Events::KeyboardChar& e);
+
+    bool createDeviceObjects();
+    bool createFontsTexture();
+
+    void newFrame();
+};

include/Engine/Rendering/LightCullingPass.h

@@ -0,0 +1,84 @@
+#ifndef LightCullingPass_h__
+#define LightCullingPass_h__
+
+#define TILE_SIZE 16 
+#define MAX_LIGHTS_PER_TILE 200
+
+#include "IRenderer.h"
+#include "LightCullingPassState.h"
+#include "ShaderProgram.h"
+#include "RenderQueue.h"
+
+
+class LightCullingPass
+{
+public:
+    LightCullingPass(IRenderer* renderer);
+    ~LightCullingPass();
+
+    void GenerateNewFrustum(RenderScene& scene);
+    void OnResolutionChange();
+    void SetSSBOSizes();
+    void CullLights(RenderScene& scene);
+    void FillLightList(RenderScene& scene);
+
+    GLuint FrustumSSBO() const { return m_FrustumSSBO; }
+    GLuint LightSSBO() const { return m_LightSSBO; }
+    GLuint LightGridSSBO() const { return m_LightGridSSBO; }
+    GLuint LightOffsetSSBO() const { return m_LightOffsetSSBO; }
+    GLuint LightIndexSSBO() const { return m_LightIndexSSBO; }
+private:
+
+    void InitializeSSBOs();
+    void InitializeShaderPrograms();
+
+    const IRenderer* m_Renderer;
+
+    GLuint m_FrustumSSBO = 0;
+    GLuint m_LightSSBO = 0;
+    GLuint m_LightGridSSBO = 0;
+    GLuint m_LightOffsetSSBO = 0;
+    GLuint m_LightIndexSSBO = 0;
+
+    ShaderProgram* m_CalculateFrustumProgram;
+    ShaderProgram* m_LightCullProgram;
+
+    int m_NumberOfTiles = 0;
+
+    struct Plane {
+        glm::vec3 Normal = glm::vec3(0.f);
+        float d = 0;
+    };
+
+    struct Frustum {
+        Plane Planes[4];
+    };
+    Frustum* m_Frustums;
+
+    //This should be a component
+    struct LightSource {
+        glm::vec4 Position = glm::vec4(0.f);
+        glm::vec4 Direction = glm::vec4(10.f);
+        glm::vec4 Color = glm::vec4(1.f);
+        float Radius = 5.f;
+        float Intensity = 0.8f;
+        float Falloff = 0.3f;
+        enum Type_t { Zero, Point, Directional, Spot } Type;
+    };
+    std::vector<LightSource> m_LightSources;
+
+    struct LightGrid {
+        float Start = 0;
+        float Amount = 0;
+        glm::vec2 Padding = glm::vec2(1.f, 2.f);
+    };
+
+    LightGrid* m_LightGrid;
+
+    int m_LightOffset = 0;
+
+    float* m_LightIndex;
+};
+
+
+#endif

include/Engine/Rendering/Model.h

@@ -4,7 +4,7 @@
 #include "RawModel.h"
 #include "../OpenGL.h"
 
-class Model : public RawModel
+class Model : public ThreadUnsafeResource
 {
 	friend class ResourceManager;
 
@@ -13,11 +13,15 @@ private:
 
 public:
 	~Model();
+    const std::vector<RawModel::MaterialGroup>& MaterialGroups() const { return m_RawModel->MaterialGroups; }
+    const glm::mat4& Matrix() const { return m_RawModel->m_Matrix; }
+    const std::vector<RawModel::Vertex>& Vertices() const { return m_RawModel->m_Vertices; }
 
 	GLuint VAO;
 	GLuint ElementBuffer;
 
 private:
+    RawModel* m_RawModel;
 	GLuint VertexBuffer;
 	GLuint DiffuseVertexColorBuffer;
 	GLuint SpecularVertexColorBuffer;