New small fix.

# Conflicts:
#	src/Game/Game.cpp

README.md

@@ -10,10 +10,11 @@ Libraries bundled along with binaries for Windows (MSVC14), available as a submo
 | **[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)                                                                                                             |
 | **[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)                                                                              |
 
 #### 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/Collision.h

@@ -0,0 +1,59 @@
+#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 "Core/Ray.h"
+#include "Core/AABB.h"
+#include "Engine/Rendering/RawModel.h"
+#include "Core/Entity.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);
+
+//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);
+
+//Returns true if the entity has a boundingbox. Outputs the aabb in [outBox].
+bool GetEntityBox(World* world, EntityID entity, AABB& outBox, bool forceBoxFromModel = false);
+bool GetEntityBox(World* world, ComponentWrapper& AABBComponent, AABB& outBox);
+
+}
+
+#endif

include/Engine/Collision/CollisionSystem.h

@@ -0,0 +1,31 @@
+#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"
+
+class CollisionSystem : public PureSystem
+{
+public:
+    CollisionSystem(EventBroker* eventBroker)
+        : PureSystem(eventBroker, "AABB")
+        , zPress(false)
+    {
+        //TODO: Debug stuff, remove later.
+        EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &CollisionSystem::OnKeyUp);
+    }
+
+    virtual void UpdateComponent(World* world, ComponentWrapper& cAABB, double dt) override;
+
+private:
+    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,38 @@
+#ifndef TriggerSystem_h__
+#define TriggerSystem_h__
+
+#include <glm/common.hpp>
+#include <unordered_set>
+
+#include "Core/System.h"
+#include "Core/EventBroker.h"
+#include "ETrigger.h"
+
+class AABB;
+
+class TriggerSystem : public PureSystem
+{
+public:
+    TriggerSystem(EventBroker* eventBroker)
+        : PureSystem(eventBroker, "Trigger")
+    {}
+
+    virtual void UpdateComponent(World* world, ComponentWrapper& collision, double dt) override;
+
+private:
+    std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesTouchingTrigger;
+    std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesCompletelyInTrigger;
+
+    //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

@@ -4,4 +4,5 @@
 #include <map>
 #include <unordered_map>
 
-#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.
+    virtual void CreateFromCenter(const glm::vec3& center, 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& Center() const { return m_Center; }
+    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_Center;
+    glm::vec3 m_HalfSize;
+};
+
+#endif

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;
@@ -54,6 +54,8 @@ 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);
 

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/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/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/EPlayerDamage.h

@@ -0,0 +1,20 @@
+#ifndef EPlayerDamage_h__
+#define EPlayerDamage_h__
+
+#include "EventBroker.h"
+#include "../Core/Entity.h"
+
+namespace Events
+{
+
+struct PlayerDamage : Event
+{
+    double DamageAmount;
+    EntityID PlayerDamagedID;
+    //optional TypeOfDamage
+    std::string TypeOfDamage;
+};
+
+}
+
+#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/EventBroker.h

@@ -13,123 +13,127 @@
 	relay = decltype(relay)(std::bind(handler, this, std::placeholders::_1)); \
 	m_EventBroker->Subscribe(relay);
 
+typedef unsigned int EventID;
+
 class EventBroker;
 
 class BaseEventRelay
 {
-friend class EventBroker;
+    friend class EventBroker;
 
 protected:
-	BaseEventRelay(std::string contextTypeName, std::string eventTypeName)
-		: m_ContextTypeName(contextTypeName)
-		, m_EventTypeName(eventTypeName)
-		, m_Broker(nullptr) 
-	{ }
-	~BaseEventRelay();
+    BaseEventRelay(std::string contextTypeName, std::string eventTypeName)
+        : m_ContextTypeName(contextTypeName)
+        , m_EventTypeName(eventTypeName)
+        , m_Broker(nullptr)
+    { }
+    ~BaseEventRelay();
 
 public:
-	virtual bool Receive(const std::shared_ptr<Event> event) = 0;
+    virtual bool Receive(const std::shared_ptr<Event> event) = 0;
 
 protected:
-	std::string m_ContextTypeName;
-	std::string m_EventTypeName;
-	EventBroker* m_Broker;
+    EventID m_EventID;
+    std::string m_ContextTypeName;
+    std::string m_EventTypeName;
+    EventBroker* m_Broker;
 };
 
 template <typename ContextType, typename EventType>
 class EventRelay : public BaseEventRelay
 {
 public:
-	typedef std::function<bool(const EventType&)> CallbackType;
+    typedef std::function<bool(const EventType&)> CallbackType;
 
-	EventRelay()
-		: m_Callback(nullptr)
-		, BaseEventRelay(typeid(ContextType).name(), typeid(EventType).name()) 
-	{ }
-	EventRelay(CallbackType callback) 
-		: m_Callback(callback)
-		, BaseEventRelay(typeid(ContextType).name(), typeid(EventType).name()) 
-	{ }
+    EventRelay()
+        : m_Callback(nullptr)
+        , BaseEventRelay(typeid(ContextType).name(), typeid(EventType).name())
+    { }
+    EventRelay(CallbackType callback)
+        : m_Callback(callback)
+        , BaseEventRelay(typeid(ContextType).name(), typeid(EventType).name())
+    { }
 
 protected:
-	bool Receive(const std::shared_ptr<Event> event) override;
+    bool Receive(const std::shared_ptr<Event> event) override;
 
 private:
-	CallbackType m_Callback;
+    CallbackType m_Callback;
 };
 
 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()));
-	} else {
-		return false;
-	}
+    if (m_Callback != nullptr) {
+        return m_Callback(*static_cast<const EventType*>(event.get()));
+    } else {
+        return false;
+    }
 }
 
 class EventBroker
 {
-template <typename ContextType, typename EventType> friend class EventRelay;
+    template <typename ContextType, typename EventType> friend class EventRelay;
 
 public:
-	EventBroker()
-	{
-		m_EventQueueRead = std::make_shared<EventQueue_t>();
-		m_EventQueueWrite = std::make_shared<EventQueue_t>();
-	}
+    EventBroker()
+    {
+        m_EventQueueRead = std::make_shared<EventQueue_t>();
+        m_EventQueueWrite = std::make_shared<EventQueue_t>();
+    }
 
-	void Subscribe(BaseEventRelay &relay);
-	template <typename EventType>
-	void Publish(const EventType &event);
-	/*
-		Process all events in a given context.
-		Returns: Number of events processed
-	*/
-	template <typename ContextType>
-	int Process();
-	int Process(std::string contextTypeName);
-	void Swap();
-	void Clear();
-	void Unsubscribe(BaseEventRelay &relay);
+    void Subscribe(BaseEventRelay &relay);
+    template <typename EventType>
+    void Publish(const EventType &event);
+    /*
+        Process all events in a given context.
+        Returns: Number of events processed
+    */
+    template <typename ContextType>
+    int Process();
+    int Process(std::string contextTypeName);
+    void Swap();
+    void Clear();
+    void Unsubscribe(BaseEventRelay &relay);
 
 private:
-	bool m_IsProcessing = false;
+    bool m_IsProcessing = false;
+    EventID m_NextEventID = 0;
 
-	typedef std::string ContextTypeName_t; // typeid(ContextType).name()
-	typedef std::string EventTypeName_t; // typeid(EventType).name()
+    typedef std::string ContextTypeName_t; // typeid(ContextType).name()
+    typedef std::string EventTypeName_t; // typeid(EventType).name()
 
-	typedef std::unordered_multimap<EventTypeName_t, BaseEventRelay*> EventRelays_t;
-	typedef std::unordered_map<ContextTypeName_t, EventRelays_t> ContextRelays_t;
-	ContextRelays_t m_ContextRelays;
-	std::vector<BaseEventRelay*> m_RelaysToSubscribe;
-	std::vector<BaseEventRelay*> m_RelaysToUnsubscribe;
+    typedef std::unordered_multimap<EventTypeName_t, BaseEventRelay*> EventRelays_t;
+    typedef std::unordered_map<ContextTypeName_t, EventRelays_t> ContextRelays_t;
+    ContextRelays_t m_ContextRelays;
+    std::vector<BaseEventRelay*> m_RelaysToSubscribe;
+    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;
+    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 subscribeImmediate(BaseEventRelay& relay);
+    void unsubscribeImmediate(std::tuple<EventID, ContextTypeName_t, EventTypeName_t> identifier);
 };
 
 template <typename EventType>
 void EventBroker::Publish(const EventType &event)
 {
-	/*auto itpair = m_Subscribers.equal_range(typeid(EventType).name());
-	for (auto it = itpair.first; it != itpair.second; ++it)
-	{
-		it->second->Receive(event);
-	}*/
+    /*auto itpair = m_Subscribers.equal_range(typeid(EventType).name());
+    for (auto it = itpair.first; it != itpair.second; ++it)
+    {
+        it->second->Receive(event);
+    }*/
 
-	m_EventQueueWrite->push_back(std::make_pair(typeid(EventType).name(), std::shared_ptr<EventType>(new EventType(event))));
+    m_EventQueueWrite->push_back(std::make_pair(typeid(EventType).name(), std::shared_ptr<EventType>(new EventType(event))));
 }
 
 template <typename ContextType>
 int EventBroker::Process()
 {
-	const std::string contextTypeName = typeid(ContextType).name();
-	return Process(contextTypeName);
+    const std::string contextTypeName = typeid(ContextType).name();
+    return Process(contextTypeName);
 }
 
 #endif

include/Engine/Core/InputController.h

@@ -11,25 +11,22 @@ template <typename EventContext>
 class InputController
 {
 public:
-	InputController(std::shared_ptr<dd::EventBroker> eventBroker)
-		: EventBroker(eventBroker)
+	InputController(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 OnMouseMove(const Events::MouseMove &event) { return false; }
+	virtual bool OnCommand(const Events::InputCommand& e) { 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

@@ -253,7 +253,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/OctTree.h

@@ -0,0 +1,104 @@
+#ifndef OctTree_h__
+#define OctTree_h__
+
+#include "Core/AABB.h"
+
+class Ray;
+
+class OctTree
+{
+public:
+    struct Output
+    {
+        float CollideDistance;
+    };
+
+    OctTree();
+    ~OctTree();
+    //For the root OctTree, [octTreeBounds] should be a box containing the entire level.
+    OctTree(const AABB& octTreeBounds, int subDivisions);
+
+    //We cannot copy the OctTree as of now, because of the recursive dynamic allocation.
+    //Define these if the OctTree suddenly needs to be copied, think of the children OctChild* ptrs. 
+    OctTree(const OctTree& other) = delete;
+    OctTree(const OctTree&& other) = delete;
+    OctTree& operator= (const OctTree& other) = delete;
+    //Add a dynamic object (one that moves around) into the tree.
+    void AddDynamicObject(const AABB& box);
+    //Add a static object (that does not move) into the tree.
+    void AddStaticObject(const AABB& box);
+    //Get the boxes that are in the same area as the input [box], the boxes are put in [outBoxes].
+    void BoxesInSameRegion(const AABB& box, std::vector<AABB>& outBoxes);
+    //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, 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 BoxesInSameRegion from outside and testing there.
+    bool BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected);
+
+private:
+    struct OctChild;    //Fwd declaration;
+    struct ContainedObject
+    {
+        ContainedObject()
+            : Box(AABB())
+            , Checked(false)
+        {}
+        ContainedObject(AABB box)
+            : Box(box)
+            , Checked(false)
+        {}
+        AABB Box;
+        bool Checked;
+    };
+    OctChild* m_Root;
+    std::vector<ContainedObject> m_StaticObjects;
+    std::vector<ContainedObject> m_DynamicObjects;
+
+    bool m_UpdatedOnce;
+    unsigned int m_BoxID;
+    glm::vec3 m_PrevPos;
+    glm::quat m_PrevOri;
+
+    void falsifyObjectChecks();
+
+    struct OctChild
+    {
+        ~OctChild();
+        OctChild(const AABB& octTreeBounds, 
+            int subDivisions, 
+            std::vector<OctTree::ContainedObject>& staticObjects, 
+            std::vector<OctTree::ContainedObject>& dynamicObjects);
+        OctChild(const OctChild& other) = delete;
+        OctChild(const OctChild&& other) = delete;
+        OctChild& operator= (const OctChild& other) = delete;
+        void AddDynamicObject(const AABB& box);
+        void AddStaticObject(const AABB& box);
+        void BoxesInSameRegion(const AABB& box, std::vector<AABB>& outBoxes) const;
+        void ClearObjects();
+        void ClearDynamicObjects();
+        bool RayCollides(const Ray& ray, Output& data) const;
+        bool BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected) const;
+
+        OctChild* m_Children[8];
+        //Indices into the lists in OctTree.
+        std::vector<int> m_StaticObjIndices;
+        std::vector<int> m_DynamicObjIndices;
+        AABB m_Box;
+        //Reference to the lists in OctTree.
+        std::vector<OctTree::ContainedObject>& m_StaticObjectsRef;
+        std::vector<OctTree::ContainedObject>& m_DynamicObjectsRef;
+
+        inline bool hasChildren() const;
+        int childIndexContainingPoint(const glm::vec3& point) const;
+        std::vector<int> childIndicesContainingBox(const AABB& box) const;
+    };
+};
+
+
+#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/System.h

@@ -9,17 +9,42 @@ class System
 {
     friend class SystemPipeline;
 
-public:
-    System(const EventBroker* eventBroker, std::string componentType)
+protected:
+    System(EventBroker* eventBroker)
         : m_EventBroker(eventBroker)
+    { }
+    virtual ~System() = default;
+
+    EventBroker* m_EventBroker;
+};
+
+class PureSystem : public System
+{
+    friend class SystemPipeline;
+
+protected:
+    PureSystem(EventBroker* eventBroker, std::string componentType)
+        : System(eventBroker)
         , m_ComponentType(componentType)
     { }
+    virtual ~PureSystem() = default;
 
-    virtual void Update(World* world, ComponentWrapper& component, double dt) = 0;
+    const std::string m_ComponentType;
 
-private:
-    const EventBroker* m_EventBroker;
-    std::string m_ComponentType;
+    virtual void UpdateComponent(World* world, ComponentWrapper& component, double dt) = 0;
+};
+
+class ImpureSystem : public System
+{
+    friend class SystemPipeline;
+
+protected:
+    ImpureSystem(EventBroker* eventBroker)
+        : System(eventBroker)
+    { }
+    virtual ~ImpureSystem() = default;
+
+    virtual void Update(World* world, double dt) = 0;
 };
 
 #endif

include/Engine/Core/SystemPipeline.h

@@ -9,50 +9,81 @@
 class SystemPipeline
 {
 public:
-    SystemPipeline(const EventBroker* eventBroker)
+    SystemPipeline(EventBroker* eventBroker)
         : m_EventBroker(eventBroker)
     { }
     ~SystemPipeline()
     {
-        for (auto& pair : m_Systems) {
-            for (auto& system : pair.second) {
-                delete system;
+        for (UnorderedSystems& group : m_OrderedSystemGroups) {
+            for (auto& pair : group.Systems) {
+                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)
     {
+        if (updateOrderLevel + 1 > m_OrderedSystemGroups.size()) {
+            m_OrderedSystemGroups.resize(updateOrderLevel + 1);
+        }
+        UnorderedSystems& group = m_OrderedSystemGroups[updateOrderLevel];
         System* system = new T(m_EventBroker, args...);
-        if (!system->m_ComponentType.empty()) {
-            m_Systems[system->m_ComponentType].push_back(system);
-        } else {
-            LOG_ERROR("Failed to add system \"%s\": Missing component type!", typeid(T).name());
-            delete system;
+        group.Systems[typeid(T).name()] = system;
+
+        if (std::is_base_of<PureSystem, T>::value) {
+            PureSystem* pureSystem = static_cast<PureSystem*>(system);
+            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());
+            }
+        }
+
+        if (std::is_base_of<ImpureSystem, T>::value) {
+            ImpureSystem* impureSystem = static_cast<ImpureSystem*>(system);
+            group.ImpureSystems.push_back(impureSystem);
         }
     }
 
     void Update(World* world, double dt)
     {
-        for (auto& pair : m_Systems) {
-            const std::string& componentName = pair.first;
-            auto& systems = pair.second;
-            const ComponentPool* pool = world->GetComponents(componentName);
-            if (pool == nullptr) {
-                continue;
+        for (UnorderedSystems& group : m_OrderedSystemGroups) {
+            // Process events
+            for (auto& pair : group.Systems) {
+                m_EventBroker->Process(pair.first);
             }
-            for (auto& component : *pool) {
-                for (auto& system : systems) {
-                    system->Update(world, component, dt);
+
+            // Update
+            for (auto& pair : group.PureSystems) {
+                const std::string& componentName = pair.first;
+                auto& systems = pair.second;
+                const ComponentPool* pool = world->GetComponents(componentName);
+                if (pool == nullptr) {
+                    continue;
                 }
+                for (auto& component : *pool) {
+                    for (auto& system : systems) {
+                        system->UpdateComponent(world, component, dt);
+                    }
+                }
+            }
+            for (auto& system : group.ImpureSystems) {
+                system->Update(world, dt);
             }
         }
     }
 
 private:
-    const EventBroker* m_EventBroker;
-    std::unordered_map<std::string, std::vector<System*>> m_Systems;
+    EventBroker* m_EventBroker;
+    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;
 };
 
 #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/World.h

@@ -14,22 +14,35 @@ public:
 
     // Create empty entity
     EntityID CreateEntity(EntityID parent = 0);
+    // Delete entity and all components within
+    void DeleteEntity(EntityID entity);
 
     // 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);
+    // Check if an entity has a component
+    bool HasComponent(EntityID entity, std::string componentType);
     // Get a component of an entity
     ComponentWrapper GetComponent(EntityID entity, std::string componentType);
+    // Delete a component off an entity
+    void DeleteComponent(EntityID entity, std::string componentType);
     // Get all components of the specified type
     const ComponentPool* GetComponents(std::string componentType);
     // Get entity parent
     EntityID GetParent(EntityID entity);
+    // Change the parent of an entity
+    void SetParent(EntityID entity, EntityID parent);
+    // 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; }
 
 private:
     EntityID m_CurrentEntityID = 1;
 
     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;
 

include/Engine/Editor/EditorSystem.h

@@ -0,0 +1,79 @@
+#include <imgui/imgui.h>
+#include <glm/gtx/common.hpp>
+#include <boost/filesystem/path.hpp>
+#include "../Core/System.h"
+#include "../Core/EMousePress.h"
+#include "../Core/EMouseRelease.h"
+#include "../Core/EMouseMove.h"
+#include "../Core/ConfigFile.h"
+#include "../Input/EInputCommand.h"
+#include "../Rendering/IRenderer.h"
+#include "../Rendering/EPicking.h"
+#include "../Core/EFileDropped.h"
+#include "../Rendering/RenderQueueFactory.h"
+
+class EditorSystem : public ImpureSystem
+{
+public:
+    EditorSystem(EventBroker* eventBroker, IRenderer* renderer);
+
+    virtual void Update(World* world, double dt) override;
+
+private:
+    IRenderer* m_Renderer;
+    World* m_World = nullptr;
+
+    bool m_Enabled;
+    bool m_Visible;
+    std::vector<glm::vec2> m_PickingQueue;
+
+    enum class WidgetMode
+    {
+        None,
+        Translate,
+        Rotate,
+        Scale
+    } m_WidgetMode = WidgetMode::None;
+
+    enum class WidgetSpace
+    {
+        Local,
+        Global
+    } m_WidgetSpace = WidgetSpace::Global;
+
+    EntityID m_Widget = 0;
+    EntityID m_WidgetX = 0;
+    EntityID m_WidgetPlaneX = 0;
+    EntityID m_WidgetY = 0;
+    EntityID m_WidgetPlaneY = 0;
+    EntityID m_WidgetZ = 0;
+    EntityID m_WidgetPlaneZ = 0;
+    EntityID m_WidgetOrigin = 0;
+    glm::vec3 m_WidgetCurrentAxis;
+    float m_WidgetPickingDepth = 0.f;
+
+    EntityID m_Selection = 0;
+    EntityID m_LastSelection = 0;
+    glm::vec3 m_Position;
+    std::string m_LastDroppedFile;
+
+    EventRelay<EditorSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
+    EventRelay<EditorSystem, Events::MouseRelease> m_EMouseRelease;
+    bool OnMouseRelease(const Events::MouseRelease& e);
+    EventRelay<EditorSystem, Events::MousePress> m_EMousePress;
+    bool OnMousePress(const Events::MousePress& e);
+    EventRelay<EditorSystem, Events::MouseMove> m_EMouseMove;
+    bool OnMouseMove(const Events::MouseMove& e);
+    EventRelay<EditorSystem, Events::Picking> m_EPicking;
+    bool OnPicking(const Events::Picking& e);
+    EventRelay<EditorSystem, Events::FileDropped> m_EFileDropped;
+    bool OnFileDropped(const Events::FileDropped& e);
+
+    void updateWidget();
+    void setWidgetMode(WidgetMode newMode);
+    void setWidgetSpace(WidgetSpace space);
+    void drawUI(World* world, double dt);
+    bool createDeleteButton(std::string componentType);
+    void changeParent(EntityID entity, EntityID newParent);
+};

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/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

@@ -1,146 +1,46 @@
-#ifndef InputSystem_h__
-#define InputSystem_h__
+#ifndef InputProxy_h__
+#define InputProxy_h__
 
-#include <array>
-#include <unordered_map>
-
-#include <steam/steam_api.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 "../Common.h"
+#include "../Core/ResourceManager.h"
+#include "../Core/ConfigFile.h"
 #include "EInputCommand.h"
 #include "EBindOrigin.h"
 
-class InputProxy;
-
-class InputHandler
-{
-public:
-    InputHandler(EventBroker* eventBroker, InputProxy* inputProxy)
-        : m_EventBroker(eventBroker)
-        , m_InputProxy(inputProxy)
-    { }
-
-    virtual void Update(double dt) { }
-    virtual bool BindOrigin(std::string origin, std::string command, float value) = 0;
-
-protected:
-    EventBroker* m_EventBroker;
-    InputProxy* m_InputProxy;
-};
+class InputHandler;
 
 class InputProxy
 {
 public:
-    InputProxy(EventBroker* eventBroker)
-        : m_EventBroker(eventBroker)
-    {
-        EVENT_SUBSCRIBE_MEMBER(m_EBindOrigin, &InputProxy::OnBindOrigin);
-    }
-
-	void Update(double dt)
-    {
-        m_EventBroker->Process<InputProxy>();
-        m_EventBroker->Process<InputHandler>();
-        for (auto& handler : m_Handlers) {
-            handler->Update(dt);
-        }
-    }
-
-    void Process()
-    {
-        // Accumulate the input values of all unique commands published by input handlers
-        for (auto& pair : m_CommandQueue) {
-            Events::InputCommand e;
-            e.PlayerID = pair.first.first;
-            e.Command = pair.first.second;
-            e.Value = 0;
-            for (auto& value : pair.second) {
-                e.Value += value;
-            }
-	        e.Value = std::max(-1.f, std::min(e.Value, 1.f));
-            m_EventBroker->Publish(e);
-            LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
-        }
-        m_CommandQueue.clear();
-    }
-
+    InputProxy(EventBroker* eventBroker);
+    ~InputProxy();
+    
+    void LoadBindings(std::string file);
+	void Update(double dt);
+    void Process();
     template <typename T>
-    void AddHandler()
-    {
-        m_Handlers.push_back(new T(m_EventBroker, this));
-    }
-
-    void Publish(const Events::InputCommand& e)
-    {
-        auto key = std::make_pair(e.PlayerID, e.Command);
-        m_CommandQueue[key].push_back(e.Value);
-    }
+    void AddHandler();
+    void Publish(const Events::InputCommand& e);
 
 protected:
     EventBroker* m_EventBroker;
     std::vector<InputHandler*> m_Handlers;
-    // Represents every unique command (has of PlayerID & Command) and all values reported for that command
+    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)
-    {
-        bool originBound = false;
-        for (auto& handler : m_Handlers) {
-            bool result = handler->BindOrigin(e.Origin, e.Command, e.Value);
-            if (result) {
-                if (originBound) {
-                    LOG_WARNING("Multiple handlers responded to binding input origin \"%s\"!", e.Origin.c_str());
-                }
-                originBound = true;
-            }
-        }
-
-        if (!originBound) {
-            LOG_ERROR("No input handler responded to binding input origin \"%s\"!", e.Origin.c_str());
-        }
-
-        return originBound;
-    }
-	//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_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<InputProxy, Events::MousePress> m_EMousePress;
-	//bool OnMousePress(const Events::MousePress &event);
-	//EventRelay<InputProxy, Events::MouseRelease> m_EMouseRelease;
-	//bool OnMouseRelease(const Events::MouseRelease &event);
-	//EventRelay<InputProxy, Events::GamepadAxis> m_EGamepadAxis;
-	//bool OnGamepadAxis(const Events::GamepadAxis &event);
-	//EventRelay<InputProxy, Events::GamepadButtonDown> m_EGamepadButtonDown;
-	//bool OnGamepadButtonDown(const Events::GamepadButtonDown &event);
-	//EventRelay<InputProxy, Events::GamepadButtonUp> m_EGamepadButtonUp;
-	//bool OnGamepadButtonUp(const Events::GamepadButtonUp &event);
-	//// Input binding events
-	//EventRelay<InputProxy, Events::BindMouseButton> m_EBindMouseButton;
-	//bool OnBindMouseButton(const Events::BindMouseButton &event);
-	//EventRelay<InputProxy, Events::BindGamepadAxis> m_EBindGamepadAxis;
-	//bool OnBindGamepadAxis(const Events::BindGamepadAxis &event);
-	//EventRelay<InputProxy, Events::BindGamepadButton> m_EBindGamepadButton;
-	//bool OnBindGamepadButton(const Events::BindGamepadButton &event);
-
-	//float GetCommandTotalValue(std::string command);
-	//void PublishCommand(int playerID, std::string command, float value);
+	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/KeyboardInputHandler.h

@@ -1,67 +1,28 @@
+#ifndef KeyboardInputHandler_h__
+#define KeyboardInputHandler_h__
+
 #include <GLFW/glfw3.h>
-#include "InputProxy.h"
+#include "InputHandler.h"
 #include "Core/EKeyDown.h"
 #include "Core/EKeyUp.h"
 
 class KeyboardInputHandler : public InputHandler
 {
 public:
-    KeyboardInputHandler(EventBroker* eventBroker, InputProxy* inputProxy)
-        : InputHandler(eventBroker, inputProxy)
-    {
-        EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &KeyboardInputHandler::OnKeyDown);
-        EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &KeyboardInputHandler::OnKeyUp);
+    KeyboardInputHandler(EventBroker* eventBroker, InputProxy* inputProxy);
 
-        m_OriginKeyCodes["R"] = GLFW_KEY_R;
-    }
-
-    bool BindOrigin(std::string origin, std::string command, float value) override
-    {
-        auto originIt = m_OriginKeyCodes.find(origin);
-        if (originIt == m_OriginKeyCodes.end()) {
-            return false;
-        }
-
-        int keyCode = originIt->second;
-        m_KeyBindings[keyCode] = std::make_tuple(command, value);
-        return true;
-    }
+    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)
-    {
-        auto it = m_KeyBindings.find(e.KeyCode);
-        if (it == m_KeyBindings.end()) {
-            return false;
-        }
-
-        Events::InputCommand ic;
-        ic.PlayerID = 0;
-        std::tie(ic.Command, ic.Value) = it->second;
-        m_InputProxy->Publish(ic);
-
-        return true;
-    }
-
+    bool OnKeyDown(const Events::KeyDown& e);
 	EventRelay<InputHandler, Events::KeyUp> m_EKeyUp;
-	bool OnKeyUp(const Events::KeyUp& e)
-    {
-        auto it = m_KeyBindings.find(e.KeyCode);
-        if (it == m_KeyBindings.end()) {
-            return false;
-        }
+	bool OnKeyUp(const Events::KeyUp& e);
+};
 
-        Events::InputCommand ic;
-        ic.PlayerID = 0;
-        std::tie(ic.Command, std::ignore) = it->second;
-        ic.Value = 0;
-        m_InputProxy->Publish(ic);
-
-        return true;
-    }
-
-};
+#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/Input/SteamControllerInputHandler.h

@@ -1,98 +0,0 @@
-#include <steam/steam_api.h>
-#include "InputProxy.h"
-
-class SteamControllerInputHandler : public InputHandler
-{
-public:
-    SteamControllerInputHandler(EventBroker* eventBroker, InputProxy* inputProxy)
-        : InputHandler(eventBroker, inputProxy)
-    {
-        SteamController()->Init();
-    }
-
-    ~SteamControllerInputHandler()
-    {
-        SteamController()->Shutdown();
-    }
-
-    void Update(double dt) override
-    {
-        std::array<ControllerHandle_t, STEAM_CONTROLLER_MAX_COUNT> controllers;
-        int numControllers = SteamController()->GetConnectedControllers(controllers.data());
-        for (int i = 0; i < numControllers; i++) {
-            auto controllerHandle = controllers.at(i);
-            auto actionSetHandle = SteamController()->GetActionSetHandle("InGameControls");
-            //SteamController()->ShowBindingPanel(controllerHandle);
-            SteamController()->ActivateActionSet(controllerHandle, actionSetHandle);
-            for (auto& command : m_Commands) {
-                Events::InputCommand ic;
-                ic.PlayerID = i + 1;
-                ic.Command = command.first;
-
-                auto digitalActionHandle = m_DigitalActionHandles.at(ic.Command);
-                auto handle = SteamController()->GetDigitalActionHandle("DebugReload");
-                auto data = SteamController()->GetDigitalActionData(controllerHandle, handle);
-                LOG_DEBUG("Controller %i, active %i, value %i", i, data.bActive, data.bState);
-                if (data.bState) {
-                    ic.Value = command.second;
-                } else {
-                    ic.Value = 0.f;
-                }
-                //m_InputProxy->Publish(ic);
-            }
-        }
-        
-    }
-
-    bool BindOrigin(std::string origin, std::string command, float value) override
-    {
-        if (origin != "SteamController") {
-            return false;
-        }
-
-        m_Commands[command] = value;
-        m_DigitalActionHandles[command] = SteamController()->GetDigitalActionHandle(command.c_str());
-        return true;
-    }
-
-private:
-    std::map<std::string, float> m_Commands;
-    std::map<std::string, ControllerDigitalActionHandle_t> m_DigitalActionHandles;
-
-	//std::unordered_map<std::string, std::unordered_map<int, float>> m_CommandKeyboardValues; // command string -> keyboard key value for command
-	std::unordered_map<int, std::tuple<std::string, float>> m_KeyBindings; // GLFW_KEY... -> command string & value
-
-	EventRelay<InputHandler, Events::KeyDown> m_EKeyDown;
-    bool OnKeyDown(const Events::KeyDown& e)
-    {
-        auto it = m_KeyBindings.find(e.KeyCode);
-        if (it == m_KeyBindings.end()) {
-            return false;
-        }
-
-        Events::InputCommand ic;
-        ic.PlayerID = 0;
-        std::tie(ic.Command, ic.Value) = it->second;
-        m_InputProxy->Publish(ic);
-
-        return true;
-    }
-
-	EventRelay<InputHandler, Events::KeyUp> m_EKeyUp;
-	bool OnKeyUp(const Events::KeyUp& e)
-    {
-        auto it = m_KeyBindings.find(e.KeyCode);
-        if (it == m_KeyBindings.end()) {
-            return false;
-        }
-
-        Events::InputCommand ic;
-        ic.PlayerID = 0;
-        std::tie(ic.Command, std::ignore) = it->second;
-        ic.Value = 0;
-        m_InputProxy->Publish(ic);
-
-        return true;
-    }
-
-};

include/Engine/Network/Client.h

@@ -1,14 +1,84 @@
 #ifndef Client_h__
 #define Client_h__
 
-#include <boost\asio.hpp>
+#include <string>
+#include <ctime>
 
-class Client
+#include <glm/common.hpp>
+#include <boost/asio.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"
+
+class Client : public Network
 {
-	Client();
-	~Client();
+public:
+    Client(ConfigFile* config);
+    ~Client();
+    void Start(World* world, EventBroker* eventBroker) override;
+    void Update() override;
+    void Close();
+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[1024] = { 0 };
+    int snapshotInterval = 33;
+    std::clock_t previousSnapshotMessage = std::clock();
 
+    // 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;
+
+    // Network logic
+    PlayerDefinition m_PlayerDefinitions[MAXCONNECTIONS];
+    SnapshotDefinitions m_NextSnapshot;
+    bool m_ThreadIsRunning = true;
+    double m_DurationOfPingTime;
+    std::clock_t m_StartPingTime;
+    // Use to check if we should send disconnect message
+    // if game is turned of by closing window.
+    bool m_WasStarted = false;
+
+    // Private member functions
+    void readFromServer();
+    void sendSnapshotToServer();
+    int receive(char* data, size_t length);
+    void send(Packet& packet);
+    void connect();
+    void disconnect();
+    void ping();
+    void moveMessageHead(char*& data, size_t& length, size_t stepSize);
+    void parseMessageType(Packet& packet);
+    void parseEventMessage(Packet& packet);
+    void parseConnect(Packet& packet);
+    void parsePing();
+    void parseServerPing();
+    void parseSnapshot(Packet& packet);
+    void identifyPacketLoss();
+    bool isConnected();
+    EntityID createPlayer();
+
+    // Events
+    EventBroker* m_EventBroker;
+    EventRelay<Client, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand &e);
 };
 
 #endif

include/Engine/Network/MessageType.h

@@ -0,0 +1,17 @@
+#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,
+	Event,
+};
+
+#endif

include/Engine/Network/Network.h

@@ -0,0 +1,19 @@
+#ifndef Network_h__
+#define Network_h__
+
+#include "Core/World.h"
+#include "Core/EventBroker.h"
+#include "Network/Packet.h"
+
+#define MAXCONNECTIONS 8
+#define INPUTSIZE 128
+
+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,61 @@
+#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();
+    // 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!");
+        }
+        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(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);
+
+    int Size() { return m_Offset; };
+    char* Data() { return m_Data; };
+
+private:
+    char* m_Data;
+    unsigned int m_ReturnDataOffset = 0;
+    int m_Offset = 0;
+    unsigned int m_MaxPacketSize = 128;
+};
+
+#endif

include/Engine/Network/PlayerDefinition.h

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

include/Engine/Network/Server.h

@@ -1,12 +1,85 @@
 #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"
+
+class Server : public Network
 {
-	Server();
-	~Server();
+public:
+    Server();
+    ~Server();
+    void Start(World* m_world, EventBroker *eventBroker) override;
+    void Update() override;
+    void Close();
+
+private:
+    // UDP logic
+    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
+    boost::asio::io_service m_IOService;
+    boost::asio::ip::udp::socket m_Socket;
+    PlayerDefinition m_PlayerDefinitions[MAXCONNECTIONS];
+
+    // Sending messages to client logic
+    char readBuffer[1024] = { 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;
+    std::clock_t m_StopTimes[8];
+
+    // Game logic
+    World* m_World;
+    EventBroker* m_EventBroker;
+    // vec.size() = ammount of players to create, stores playerID's
+    std::vector<unsigned int> m_PlayersToCreate;
+    
+    // Packet loss logic
+    unsigned int m_PacketID;
+    unsigned int m_PreviousPacketID;
+    unsigned int m_SendPacketID;
+    
+    // Close logic
+    bool m_ThreadIsRunning = true;
+
+    // Private member functions
+    int  receive(char* data, size_t length);
+    void readFromClients();
+    void send(Packet& packet, int playerID);
+    void send(Packet& packet);
+    void moveMessageHead(char*& data, size_t& length, size_t stepSize);
+    void broadcast(std::string message);
+    void broadcast(Packet& packet);
+    void sendSnapshot();
+    void sendPing();
+    void checkForTimeOuts();
+    void disconnect(int i);
+    void parseMessageType(Packet& packet);
+    void parseEvent(Packet& packet);
+    void parseConnect(Packet& packet);
+    void parseDisconnect();
+    void parseClientPing();
+    void parseServerPing();
+    void parseSnapshot(Packet& packet);
+    void identifyPacketLoss();
+    EntityID createPlayer();
 };
 
 #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/DebugCameraInputController.h

@@ -0,0 +1,63 @@
+#include <imgui/imgui.h>
+#include "../Input/FirstPersonInputController.h"
+
+template <typename EventContext>
+class DebugCameraInputController : public FirstPersonInputController<EventContext>
+{
+public:
+    DebugCameraInputController(EventBroker* eventBroker, unsigned int playerID)
+        : FirstPersonInputController(eventBroker, playerID)
+    { }
+
+    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 (e.Command == "PrimaryFire") {
+            if (e.Value > 0) {
+                if (!io.WantCaptureMouse) {
+                    LockMouse();
+                }
+            } else {
+                UnlockMouse();
+            }
+            return false;
+        }
+
+        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;
+};

include/Engine/Rendering/DrawScenePass.h

@@ -0,0 +1,36 @@
+#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

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

include/Engine/Rendering/EPicking.h

@@ -34,21 +34,26 @@ public:
         EntityID Entity;
         //World position of the "pick"
         glm::vec3 Position;
+        // Depth
+        float Depth;
     };
 
     PickData Pick(glm::vec2 screenCoord) const
     {
         PickData pickData;
 
+        // Invert screen y coordinate
+        screenCoord.y = Resolution.Height - screenCoord.y;
         ScreenCoords::PixelData data = ScreenCoords::ToPixelData(screenCoord, PickingBuffer, *DepthBuffer);
+        pickData.Depth = data.Depth;
 
         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.Entity = 0;
         }
-        pickData.Position = ScreenCoords::ToWorldPos(screenCoord.x, Resolution.Width - screenCoord.y, data.Depth, Resolution, ProjectionMatrix, ViewMatrix);
+        pickData.Position = ScreenCoords::ToWorldPos(screenCoord.x, screenCoord.y, data.Depth, Resolution, ProjectionMatrix, ViewMatrix);
 
         return pickData;
     }

include/Engine/Rendering/IRenderer.h

@@ -35,7 +35,7 @@ public:
 	virtual void Draw(RenderQueueCollection& rq) = 0;
 
 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];

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/PickingPass.h

@@ -0,0 +1,49 @@
+#ifndef PickingPass_h__
+#define PickingPass_h__
+
+#include "IRenderer.h"
+#include "PickingPassState.h"
+#include "FrameBuffer.h"
+#include "ShaderProgram.h"
+#include "Util/UnorderedMapVec2.h"
+#include "../Core/EventBroker.h"
+#include "EPicking.h"
+
+class PickingPass
+{
+public:
+    PickingPass(IRenderer* renderer, EventBroker* eb);
+    ~PickingPass();
+    void InitializeTextures();
+    void InitializeFrameBuffers();
+    void InitializeShaderPrograms();
+
+    void Draw(RenderQueueCollection& rq);
+
+
+    //Getters
+    const ShaderProgram& PickingProgram() const { return *m_PickingProgram; }
+    const std::unordered_map<glm::vec2, EntityID>& PickingColorsToEntity() const { return m_PickingColorsToEntity; }
+    GLuint PickingTexture() const { return m_PickingTexture; }
+    GLuint DepthBuffer() const { return m_DepthBuffer; }
+    const FrameBuffer& PickingBuffer() const { return m_PickingBuffer; }
+
+
+private:
+    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
+
+    EventBroker* m_EventBroker;
+
+    const IRenderer* m_Renderer;
+
+    ShaderProgram* m_PickingProgram;
+
+    std::unordered_map<glm::vec2, EntityID> m_PickingColorsToEntity;
+
+    GLuint m_PickingTexture;
+    GLuint m_DepthBuffer;
+
+    FrameBuffer m_PickingBuffer;
+};
+
+#endif 

include/Engine/Rendering/PickingPassState.h

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

include/Engine/Rendering/RenderQueueFactory.h

@@ -13,8 +13,12 @@ public:
     RenderQueueFactory();
     void Update(World* world);
 
-    
     RenderQueueCollection RenderQueues() const { return m_RenderQueues; }
+
+    static glm::vec3 AbsolutePosition(World* world, EntityID entity);
+    static glm::quat AbsoluteOrientation(World* world, EntityID entity);
+    static glm::vec3 AbsoluteScale(World* world, EntityID entity);
+
 private:
     RenderQueueCollection m_RenderQueues;
 
@@ -22,10 +26,6 @@ private:
     void FillLights(World* world, RenderQueue* renderQueue);
 
     glm::mat4 ModelMatrix(World* world, EntityID entity);
-
-    glm::vec3 AbsolutePosition(World* world, EntityID entity);
-    glm::quat AbsoluteOrientation(World* world, EntityID entity);
-    glm::vec3 AbsoluteScale(World* world, EntityID entity);
 };
 
 #endif

include/Engine/Rendering/RenderState.h

@@ -0,0 +1,27 @@
+#ifndef RenderState_h__
+#define RenderState_h__
+
+#include <functional>
+#include "../Common.h"
+#include "../OpenGL.h"
+#include "../GLM.h"
+
+class RenderState 
+{
+public:
+    RenderState() = default;
+    ~RenderState();
+
+    bool Enable(GLenum cap);
+    bool Disable(GLenum cap);
+    bool CullFace(GLenum mode);
+    bool ClearColor(glm::vec4 color);
+    bool Clear(GLbitfield mask);
+    bool BindFramebuffer(GLint framebuffer);
+    bool BlendEquation(GLenum mode);
+    bool BlendFunc(GLenum sfactor, GLenum dfactor);
+
+private:
+    std::vector<std::function<void(void)>> m_ResetFunctions;
+};
+#endif

include/Engine/Rendering/Renderer.h

@@ -10,9 +10,26 @@
 #include "Util/UnorderedMapVec2.h"
 #include "FrameBuffer.h"
 #include "../Core/World.h"
+#include "PickingPass.h"
+#include "DrawScenePass.h"
+#include "DebugCameraInputController.h"
+
+
+#define TILE_SIZE 16 
+#define NUM_LIGHTS 3
+
+
+enum lightType 
+{
+    Point,
+    Spot,
+    Directional,
+    Area
+};
 
 #include "../Core/EventBroker.h"
 #include "EPicking.h"
+#include "ImGuiRenderPass.h"
 
 class Renderer : public IRenderer
 {
@@ -21,44 +38,90 @@ public:
         : m_EventBroker(eventBroker)
     { }
 
-	virtual void Initialize() override;
-	virtual void Update(double dt) override;
-	virtual void Draw(RenderQueueCollection& rq) override;
+    virtual void Initialize() override;
+    virtual void Update(double dt) override;
+    virtual void Draw(RenderQueueCollection& rq) override;
 
 private:
-	//----------------------Variables----------------------//
+    //----------------------Variables----------------------//
     EventBroker* m_EventBroker;
 
-	Texture* m_ErrorTexture;
-	Texture* m_WhiteTexture;
-	float m_CameraMoveSpeed;
-    FrameBuffer m_PickingBuffer;
-    GLuint m_PickingTexture;
-    GLuint m_DepthBuffer;
+    std::shared_ptr<DebugCameraInputController<Renderer>> m_DebugCameraInputController;
+
+    Texture* m_ErrorTexture;
+    Texture* m_WhiteTexture;
+    float m_CameraMoveSpeed;
 
     Model* m_ScreenQuad;
     Model* m_UnitQuad;
     Model* m_UnitSphere;
 
-    std::unordered_map<glm::vec2, EntityID> m_PickingColorsToEntity;
+    DrawScenePass* m_DrawScenePass;
+    PickingPass* m_PickingPass;
+    ImGuiRenderPass* m_ImGuiRenderPass;
 
-	//----------------------Functions----------------------//
-	void InitializeWindow();
-	void InitializeShaders();
+    //----------------------Functions----------------------//
+    void InitializeWindow();
+    void InitializeShaders();
     void InitializeTextures();
-    void InitializeFrameBuffers();
+    void InitializeSSBOs();
+    void InitializeRenderPasses();
     //TODO: Renderer: Get InputUpdate out of renderer
-	void InputUpdate(double dt);
-    void PickingPass(RenderQueueCollection& rq);
+    void InputUpdate(double dt);
+    //void PickingPass(RenderQueueCollection& rq);
     void DrawScreenQuad(GLuint textureToDraw);
-    void DrawScene(RenderQueueCollection& rq);
 
+    //----------------------Forward+-----------------------//
+    void CalculateFrustum();
+    void CullLights();
+    //Frustum
+    struct Plane {
+        glm::vec3 Normal;
+        float d;
+    };
+    struct Frustum {
+        Plane Planes[4];
+    };
+    Frustum m_Frustums[80*45]; //TODO: Renderer: Make this change with resolution
+
+    //Lights
+    void TEMPCreateLights();
+    //TODO: Renderer: Add Directionllights, spotlights and area lights to this as type.
+    struct PointLight {
+        glm::vec4 Position = glm::vec4(0.f);
+        glm::vec4 Color = glm::vec4(1.f);
+        float Radius = 5.f;
+        float Intensity = 0.8f;
+        float Falloff = 0.3f;
+        float Padding = 1337;
+    };
+    PointLight m_PointLights[NUM_LIGHTS];
+
+    struct LightGrid {
+        int Amount;
+        int Start;
+        glm::vec2 Padding;
+    };
+    LightGrid m_LightGrid[80*45];
+
+    int m_LightOffset = 0;
+
+    int m_LightIndex[80*45*200];
+
+    //-------------------------SSBO------------------------//
+    GLuint m_FrustumSSBO = 0;
+    GLuint m_LightSSBO = 1;
+    GLuint m_LightGridSSBO = 2;
+    GLuint m_LightOffsetSSBO = 3;
+    GLuint m_LightIndexSSBO = 4;
 
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
 	//--------------------ShaderPrograms-------------------//
-	ShaderProgram m_BasicForwardProgram;
-    ShaderProgram m_PickingProgram;
-    ShaderProgram m_DrawScreenQuadProgram;
+	ShaderProgram* m_BasicForwardProgram;
+    ShaderProgram* m_DrawScreenQuadProgram;
+    ShaderProgram* m_CalculateFrustumProgram;
+    ShaderProgram* m_LightCullProgram;
+
 };
 
 #endif

include/Engine/Rendering/ShaderProgram.h

@@ -1,6 +1,9 @@
+#ifndef ShaderProgram_h__
+#define ShaderProgram_h__
 
 #include "../Common.h"
 #include "../OpenGL.h"
+#include "../Core/ResourceManager.h"
 #include <fstream>
 
 class Shader
@@ -60,11 +63,13 @@ public:
 		: ShaderType(fileName) { }
 };
 
-class ShaderProgram
+class ShaderProgram : public Resource
 {
-public:
-	ShaderProgram()
+    friend class ResourceManager;
+private:
+	ShaderProgram(std::string)
 		: m_ShaderProgramHandle(0) { }
+public:
 	~ShaderProgram();
 
 	void AddShader(std::shared_ptr<Shader> shader);
@@ -79,3 +84,5 @@ private:
 	GLuint m_ShaderProgramHandle;
 	std::vector<std::shared_ptr<Shader>> m_Shaders;
 };
+
+#endif

include/Engine/Rendering/Util/GLError.h

@@ -9,7 +9,7 @@ inline bool _GLERROR(const char* info, const char* file, const char* func, unsig
 	GLenum error = glGetError();
 	if (error != GL_NO_ERROR)
 	{
-		_LOG(LOG_LEVEL_ERROR, file, func, line, "GL Error: %s %i %s", info, error, gluErrorString(error));
+		_LOG(LOG_LEVEL_ERROR, file, func, line, "GL Error: %s, %i, %s", info, error, gluErrorString(error));
 		return true;
 	}
 

include/Game/Game.h

@@ -11,11 +11,20 @@
 #include "Rendering/RenderQueueFactory.h"
 #include "Input/InputProxy.h"
 #include "Input/KeyboardInputHandler.h"
-#include "Input/SteamControllerInputHandler.h"
+#include "Input/MouseInputHandler.h"
 #include "Core/EKeyDown.h"
 #include "Core/EntityXMLFile.h"
 #include "Core/SystemPipeline.h"
 #include "RaptorCopterSystem.h"
+#include "PlayerSystem.h"
+#include "Editor/EditorSystem.h"
+
+// Network
+#include <boost/thread.hpp>
+#include "Network/Network.h"
+#include "Network/Server.h"
+#include "Network/Client.h"
+
 
 class Game
 {
@@ -37,12 +46,21 @@ private:
     World* m_World;
     SystemPipeline* m_SystemPipeline;
     RenderQueueFactory* m_RenderQueueFactory;
+    // Network variables
+    boost::thread m_NetworkThread;
 
-    EventRelay<Game, Events::KeyUp> m_EKeyUp;
-    bool testOnKeyUp(const Events::KeyUp& e);
+    // Network methods
+    void networkFunction();
+    Network* m_ClientOrServer;
+    bool m_IsClientOrServer = false;
+
+    EventRelay<Game, Events::InputCommand> m_EInputCommand;
+    bool debugOnInputCommand(const Events::InputCommand& e);
+
+    void debugInitialize();
+    void debugTick(double dt);
+	EventRelay<Client, Events::KeyDown> m_EKeyDown;
 
-    void testIntialize();
-    void testTick(double dt);
 };
 
 #endif

include/Game/HealthSystem.h

@@ -0,0 +1,36 @@
+#ifndef HealthSystem_h__
+#define HealthSystem_h__
+
+#include <GLFW/glfw3.h>
+#include <glm/common.hpp>
+
+#include "Common.h"
+#include "Core/System.h"
+#include "Core\EPlayerDamage.h";
+#include "Core\EPlayerHealthPickup.h";
+#include "Core\EPlayerDeath.h";
+
+#include <tuple>
+#include <vector>
+
+class HealthSystem : public PureSystem
+{
+public:
+    HealthSystem(EventBroker* eventBroker);
+
+    //updatecomponent
+    virtual void UpdateComponent(World* world, ComponentWrapper& health, double dt) override;
+
+private:
+    //methods which will take care of specific events
+    EventRelay<HealthSystem, Events::PlayerDamage> m_EPlayerDamage;
+    bool HealthSystem::OnPlayerDamaged(const Events::PlayerDamage& e);
+    EventRelay<HealthSystem, Events::PlayerHealthPickup> m_EPlayerHealthPickup;
+    bool HealthSystem::OnPlayerHealthPickup(const Events::PlayerHealthPickup& e);
+
+    //vector which will keep track of health changes
+    std::vector<std::tuple<EntityID, double>> m_DeltaHealthVector;
+   
+};
+
+#endif

include/Game/PlayerSystem.h

@@ -0,0 +1,33 @@
+#ifndef PlayerSystem_h__
+#define PlayerSystem_h__
+
+#include <GLFW/glfw3.h>
+#include <glm/common.hpp>
+
+#include "Common.h"
+#include "Core/System.h"
+#include "Collision/ETrigger.h"
+
+class PlayerSystem : public PureSystem
+{
+public:
+    PlayerSystem(EventBroker* eventBroker)
+        : PureSystem(eventBroker, "Player")
+    {
+        EVENT_SUBSCRIBE_MEMBER(m_ETouch, &PlayerSystem::OnTouch);
+        EVENT_SUBSCRIBE_MEMBER(m_EEnter, &PlayerSystem::OnEnter);
+        EVENT_SUBSCRIBE_MEMBER(m_ELeave, &PlayerSystem::OnLeave);
+    }
+
+    virtual void UpdateComponent(World* world, ComponentWrapper& player, double dt) override;
+private:
+    float m_Speed = 5;
+    EventRelay<PlayerSystem, Events::TriggerEnter> m_EEnter;
+    bool OnEnter(const Events::TriggerEnter &event);
+    EventRelay<PlayerSystem, Events::TriggerTouch> m_ETouch;
+    bool PlayerSystem::OnTouch(const Events::TriggerTouch &event);
+    EventRelay<PlayerSystem, Events::TriggerLeave> m_ELeave;
+    bool PlayerSystem::OnLeave(const Events::TriggerLeave &event);
+};
+
+#endif

include/Game/RaptorCopterSystem.h

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

resources/DefaultConfig.ini

@@ -1,9 +1,19 @@
 [Debug]
 LogLevel=1
 LoadMap=
+EditorEnabled=false
+
 
 [Video]
 Fullscreen=false
 VSYNC=false
 Width=1280
-Height=720
+Height=720
+FOV=45
+
+[Networking]
+StartNetwork=false
+IsServer=false
+Name=Bob
+Address=127.0.0.1
+Port=13

resources/DefaultInput.ini

@@ -0,0 +1,24 @@
+[Mouse]
+Sensitivity=0.5
+InvertPitch=false
+
+[Bindings]
+MouseLeft=PrimaryFire
+MouseX=Yaw
+MouseY=Pitch
+W=+Forward
+S=-Forward
+D=+Right
+A=-Right
+R=Reload
+Space=Jump
+LeftControl=Crouch
+LeftShift=Sprint
+F1=ToggleEditor
+1=EditorToolMove
+2=EditorToolRotate
+3=EditorToolScale
+X=EditorToggleTransformSpace
+C=ConnectToServer
+N=SwitchToServer
+M=SwitchToClient

resources/Schema/Components.xsd

@@ -5,4 +5,8 @@
 	<xs:include schemaLocation="Components/Model.xsd"/>
 	<xs:include schemaLocation="Components/Test.xsd"/>
 	<xs:include schemaLocation="Components/RaptorCopter.xsd"/>
+	<xs:include schemaLocation="Components/Player.xsd"/>
+	<xs:include schemaLocation="Components/AABB.xsd"/>
+	<xs:include schemaLocation="Components/Trigger.xsd"/>
+	<xs:include schemaLocation="Components/Health.xsd"/>
 </xs:schema>

resources/Schema/Components/AABB.xml

@@ -0,0 +1,4 @@
+<c:AABB>
+	<BoxCenter X="0" Y="0" Z="0"/>
+	<BoxSize X="1" Y="1" Z="1"/>
+</c:AABB>

resources/Schema/Components/AABB.xsd

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="AABB">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="BoxCenter" type="t:Vector" minOccurs="0"/>
+				<xs:element name="BoxSize" type="t:Vector" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Health.xml

@@ -0,0 +1,4 @@
+<c:Health>
+	<Health>100</Health>
+	<MaxHealth>100</MaxHealth>
+</c:Health>

resources/Schema/Components/Health.xsd

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="Health">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Health" type="t:double" minOccurs="0"/>
+				<xs:element name="MaxHealth" type="t:double" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Player.xml

@@ -0,0 +1,7 @@
+<c:Player>
+	<Velocity X="0" Y="0" Z="0"/>
+	<Forward>false</Forward>
+	<Left>false</Left>
+	<Back>false</Back>
+	<Right>false</Right>
+</c:Player>

resources/Schema/Components/Player.xsd

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="Player">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Velocity" type="t:Vector" minOccurs="0"/>
+				<xs:element name="Forward" type="t:bool" minOccurs="0"/>
+				<xs:element name="Left" type="t:bool" minOccurs="0"/>
+				<xs:element name="Back" type="t:bool" minOccurs="0"/>
+				<xs:element name="Right" type="t:bool" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Test.xml

@@ -1,6 +0,0 @@
-<c:Test>
-	<Integer>1</Integer>
-	<Float>1.333</Float>
-	<Vector X="1.33333" Y="2.33333" Z="3.33333"/>
-	<Quaternion X="1.33333" Y="2.33333" Z="3.33333" W="4.44444"/>
-</c:Test>

resources/Schema/Components/Test.xsd

@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="Test">
-		<xs:annotation>
-			<xs:documentation>ECS Test Component</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="Integer" type="t:int" minOccurs="0"/>
-				<xs:element name="Double" type="t:double" minOccurs="0"/>
-				<xs:element name="String" type="t:string" minOccurs="0"/>
-				<xs:element name="Vector" type="t:Vector" minOccurs="0"/>
-				<xs:element name="Quaternion" type="t:Quaternion" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Transform.xml

@@ -1,5 +1,5 @@
 <c:Transform>
 	<Position X="0" Y="0" Z="0"/>
-	<Orientation X="0" Y="0" Z="0" W="0"/>
+	<Orientation X="0" Y="0" Z="0"/>
 	<Scale X="1" Y="1" Z="1"/>
 </c:Transform>

resources/Schema/Components/Trigger.xml

@@ -0,0 +1,2 @@
+<c:Trigger>
+</c:Trigger>

resources/Schema/Components/Trigger.xsd

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="Trigger">
+	</xs:element>
+</xs:schema>

resources/Schema/Entities/CollisionTestLevel.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Entity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd" xmlns:c="components">
+	<Components>
+		<c:Transform>
+			<Orientation X="0" Y="0" Z="0"/>
+		</c:Transform>
+		<c:Model>
+			<Resource>Models/DummyScene.obj</Resource>
+		</c:Model>
+	</Components>
+	<Children>
+		<Entity>
+			<Components>
+				<c:Transform>
+					<Position X="-1.5"/>
+					<Scale X="1" Y="1" Z="1"/>
+				</c:Transform>
+				<c:Model>
+					<Resource>Models/ScaleWidget.obj</Resource>
+				</c:Model>
+			</Components>
+		</Entity>
+		<Entity>
+			<Components>
+				<c:Transform>
+					<Position X="1.5"/>
+					<Scale X="2" Y="2" Z="2"/>
+				</c:Transform>
+				<c:Model>
+					<Resource>Models/RotationWidgetX.obj</Resource>
+				</c:Model>
+				<c:Trigger>
+				</c:Trigger>
+			</Components>
+		</Entity>
+		<Entity>
+			<Components>
+				<c:Player>
+					<Velocity X="0" Y="0" Z="0"/>
+				</c:Player>
+				<c:Transform>
+					<Position X="2.5"/>
+				</c:Transform>
+				<c:Model>
+					<Resource>Models/Core/UnitCube.obj</Resource>
+				</c:Model>
+				<c:AABB>
+				</c:AABB>
+			</Components>
+		</Entity>
+		<Entity>
+			<Components>
+				<c:Transform>
+					<Position X="0" Y="-0"/>
+					<Scale X="1" Y="1" Z="1"/>
+				</c:Transform>
+				<!--<c:Move>
+					<Speed>1</Speed>
+					<Direction X="-1"/>
+					<Rotation Y="3.14"/>
+				</c:Move>-->
+			</Components>
+			<Children>
+				<Entity>
+					<Components>
+						<c:Transform>
+							<Position X="0" Y="0"/>
+							<Orientation X="0.0" Y="0" Z="1.0"/>
+						</c:Transform>
+						<c:Model>
+							<Resource>Models/Core/UnitRaptor.obj</Resource>
+							<Color R="1" G="0.4" B="0.8"/>
+						</c:Model>
+					</Components>
+					<Children>
+						<Entity>
+							<Components>
+								<c:Transform>
+									<Position X="-0.01" Y="0.55"/>
+									<Orientation X="0" Y="0" Z="-1"/>
+								</c:Transform>
+								<c:RaptorCopter>
+									<Speed>20</Speed>
+									<Axis Y="1"/>
+								</c:RaptorCopter>
+							</Components>
+							<Children>
+								<Entity>
+									<Components>
+										<c:Transform>
+											<Position X="0" Y="0"/>
+											<Scale X="1.7" Y="0.03" Z="0.1"/>
+											<Orientation X="0" Y="0" Z="0"/>
+										</c:Transform>
+										<c:Model>
+											<Resource>Models/Core/UnitCube.obj</Resource>
+											<Color R="1" G="0.4" B="0.8"/>
+										</c:Model>
+									</Components>
+								</Entity>
+								<Entity>
+									<Components>
+										<c:Transform>
+											<Position X="0" Y="0"/>
+											<Scale X="1.7" Y="0.03" Z="0.1"/>
+											<Orientation X="0" Y="1.57" Z="0"/>
+										</c:Transform>
+										<c:Model>
+											<Resource>Models/Core/UnitCube.obj</Resource>
+											<Color R="1" G="0.4" B="0.8"/>
+										</c:Model>
+									</Components>
+								</Entity>
+							</Children>
+						</Entity>
+					</Children>
+				</Entity>
+			</Children>
+		</Entity>
+	</Children>
+</Entity>

resources/Schema/Entities/EditorTestWorld.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Entity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd" xmlns:c="components">
+	<Components>
+		<c:Transform>
+			<Position X="0" Y="0" Z="0"/>
+			<Orientation X="0" Y="0" Z="0"/>
+		</c:Transform>
+	</Components>
+	<Children>
+		<Entity>
+			<Components>
+				<c:Transform>
+					<Position X="0" Y="0" Z="0"/>
+					<Scale X="100" Y="1" Z="100"/>
+				</c:Transform>
+				<c:Model>
+					<Resource>Models/Core/UnitPlane.obj</Resource>
+				</c:Model>
+			</Components>
+		</Entity>
+		<Entity>
+			<Components>
+				<c:Transform>
+					<Position X="1" Y="1" Z="0"/>
+					<Orientation X="0" Y="0.78539" Z="0"/>
+				</c:Transform>
+				<c:Model>
+					<Resource>An error</Resource>
+				</c:Model>
+			</Components>
+			<Children>
+				<Entity>
+					<Components>
+						<c:Transform>
+							<Position X="2" Y="0" Z="0"/>
+							<Orientation X="0" Y="0.78539" Z="0"/>
+						</c:Transform>
+						<c:Model>
+							<Resource>An error</Resource>
+						</c:Model>
+					</Components>
+					<Children>
+					</Children>
+				</Entity>
+			</Children>
+		</Entity>
+	</Children>
+</Entity>

resources/Schema/Entities/Test.xml

@@ -25,12 +25,30 @@
 			<Components>
 				<c:Transform>
 					<Position X="1.5"/>
+					<Scale X="2" Y="2" Z="2"/>
 				</c:Transform>
 				<c:Model>
 					<Resource>Models/RotationWidget.obj</Resource>
 				</c:Model>
+				<c:Trigger>
+				</c:Trigger>
 			</Components>
 		</Entity>
+		<!--<Entity>
+			<Components>
+				<c:Player>
+					<Velocity X="0" Y="0" Z="0"/>
+				</c:Player>
+				<c:Transform>
+					<Position X="2.5"/>
+				</c:Transform>
+				<c:Model>
+					<Resource>Models/Core/UnitCube.obj</Resource>
+				</c:Model>
+				<c:AABB>
+				</c:AABB>
+			</Components>
+		</Entity>-->
 		<Entity>
 			<Components>
 				<c:Transform>
@@ -48,7 +66,7 @@
 					<Components>
 						<c:Transform>
 							<Position X="0" Y="0"/>
-							<Orientation X="0.0" Y="0" Z="0.0"/>
+							<Orientation X="0.0" Y="0" Z="1.0"/>
 						</c:Transform>
 						<c:Model>
 							<Resource>Models/Core/UnitRaptor.obj</Resource>
@@ -59,8 +77,8 @@
 						<Entity>
 							<Components>
 								<c:Transform>
-									<Position X="0" Y="0"/>
-									<Orientation X="0" Y="0" Z="0"/>
+									<Position X="-0.01" Y="0.55"/>
+									<Orientation X="0" Y="0" Z="-1"/>
 								</c:Transform>
 								<c:RaptorCopter>
 									<Speed>20</Speed>
@@ -71,19 +89,7 @@
 								<Entity>
 									<Components>
 										<c:Transform>
-											<Position X="0" Y="0.4"/>
-											<Scale X="0.1" Y="0.4" Z="0.1"/>
-										</c:Transform>
-										<c:Model>
-											<Resource>Models/Core/UnitCylinder.obj</Resource>
-											<Color R="1" G="0.4" B="0.8"/>
-										</c:Model>
-									</Components>
-								</Entity>
-								<Entity>
-									<Components>
-										<c:Transform>
-											<Position X="0" Y="0.6"/>
+											<Position X="0" Y="0"/>
 											<Scale X="1.7" Y="0.03" Z="0.1"/>
 											<Orientation X="0" Y="0" Z="0"/>
 										</c:Transform>
@@ -96,7 +102,7 @@
 								<Entity>
 									<Components>
 										<c:Transform>
-											<Position X="0" Y="0.6"/>
+											<Position X="0" Y="0"/>
 											<Scale X="1.7" Y="0.03" Z="0.1"/>
 											<Orientation X="0" Y="1.57" Z="0"/>
 										</c:Transform>

resources/Schema/Types/Entity.xsd

@@ -14,6 +14,8 @@
 							<xs:element ref="c:Model" minOccurs="0"/>
 							<xs:element ref="c:Test" minOccurs="0"/>
 							<xs:element ref="c:RaptorCopter" minOccurs="0"/>
+							<xs:element ref="c:Player" minOccurs="0"/>
+							<xs:element ref="c:Health" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/GridFrustum.comp.glsl

@@ -0,0 +1,73 @@
+#version 430
+
+#define TILE_SIZE 16
+#define NUM_TILES 3600
+
+uniform mat4 P;
+uniform vec2 ScreenDimensions;
+
+struct Plane {
+	vec3 Normal;
+	float d;
+};
+struct Frustum {
+	Plane Planes[4];
+};
+
+layout (std430, binding = 0) buffer FrustumBuffer
+{
+	Frustum Data[3600];
+} Frustums;
+
+vec4 ConvertToView(vec4 ScreenCoords)
+{
+	vec2 normalizedScreenCoords = ScreenCoords.xy / ScreenDimensions;
+	vec4 clipSpace = vec4(  vec2(normalizedScreenCoords.x, normalizedScreenCoords.y) * 2.0 - 1.0, ScreenCoords.z, ScreenCoords.w);
+ 	vec4 view = inverse(P) * clipSpace;					
+ 	view = view / view.w;
+ 	return view;
+}
+
+Plane ComputePlane( vec3 p0, vec3 p1, vec3 p2 )
+{
+    Plane plane;
+ 
+    vec3 v0 = p1 - p0;
+    vec3 v2 = p2 - p0;
+ 
+    plane.Normal = normalize( cross( v0, v2 ) );
+    plane.d = dot( vec3(plane.Normal), p0 ); // Always 0 probably
+    return plane;
+}
+
+layout (local_size_x = 16, local_size_y = 16, local_size_z = 1) in;
+void main ()
+{
+	if(gl_GlobalInvocationID.x * TILE_SIZE < ScreenDimensions.x && gl_GlobalInvocationID.y * TILE_SIZE < ScreenDimensions.y) {
+		//Top-Left = 0 		| Top-Right = 1 
+		//Bottom-Left = 2 	| Bottom-Right = 3
+		vec4 ScreenCoords[4];
+		ScreenCoords[0] = vec4(gl_GlobalInvocationID.x 		 * TILE_SIZE, 	(gl_GlobalInvocationID.y + 1       ) * TILE_SIZE, -1.0, 1.0); // Z-axis might need to be 1
+		ScreenCoords[1] = vec4((gl_GlobalInvocationID.x + 1) * TILE_SIZE, 	(gl_GlobalInvocationID.y + 1) * TILE_SIZE, -1.0, 1.0);
+		ScreenCoords[2] = vec4(gl_GlobalInvocationID.x 		 * TILE_SIZE, 	(gl_GlobalInvocationID.y)	  * TILE_SIZE, 	-1.0, 1.0);
+		ScreenCoords[3] = vec4((gl_GlobalInvocationID.x + 1) * TILE_SIZE, 	(gl_GlobalInvocationID.y) 	  * TILE_SIZE, 	-1.0, 1.0);
+
+		vec3 ViewVectors[4];
+		for(int i = 0; i < 4; i++) {
+			ViewVectors[i] = vec3(ConvertToView(ScreenCoords[i]));
+		}
+	
+		vec3 EyePos = vec3(0,0,0);
+
+		Frustum f;
+		f.Planes[0] = ComputePlane(EyePos, ViewVectors[2], ViewVectors[0]);
+		f.Planes[1] = ComputePlane(EyePos, ViewVectors[1], ViewVectors[3]);
+		f.Planes[2] = ComputePlane(EyePos, ViewVectors[0], ViewVectors[1]);
+		f.Planes[3] = ComputePlane(EyePos, ViewVectors[3], ViewVectors[2]);
+
+
+
+	
+		Frustums.Data[gl_GlobalInvocationID.x + gl_GlobalInvocationID.y*80] = f;	
+	}
+}

resources/Shaders/cullLights.comp.glsl

@@ -0,0 +1,35 @@
+#version 430
+
+//in uvec3 gl_NumWorkGroups;
+//in uvec3 gl_WorkGroupID;
+//in uvec3 gl_LocalInvocationID;
+//in uvec3 gl_GlobalInvocationID;
+//in uint  gl_LocalInvocationIndex;
+
+
+
+#define NUM_LIGHTS 3
+#define MAX_LIGHTS_PER_TILE 200
+#define NUM_TILES 3600
+
+struct Plane {
+	vec3 Normal;
+	float d;
+};
+struct Frustum {
+	Plane Planes[4];
+};
+
+layout (std430, binding = 0) buffer FrustumBuffer
+{
+	Frustum Data[3600];
+} Frustums;
+
+
+
+layout (local_size_x = 16, local_size_y = 16, local_size_z = 1) in;
+void main ()
+{
+		if(1 == 1) {
+	}
+}

src/Engine/CMakeLists.txt

@@ -60,7 +60,6 @@ file(GLOB SOURCE_FILES_Rendering_Util
     "${INCLUDE_PATH}/Rendering/Util/*.h"
     "Rendering/Util/*.cpp"
 )
-
 source_group(Rendering FILES ${SOURCE_FILES_Rendering})
 source_group(Rendering\\Util FILES ${SOURCE_FILES_Rendering_Util})
 
@@ -70,6 +69,18 @@ file(GLOB SOURCE_FILES_GUI
 )
 source_group(GUI FILES ${SOURCE_FILES_GUI})
 
+file(GLOB SOURCE_FILES_Collision
+    "${INCLUDE_PATH}/Collision/*.h"
+    "Collision/*.cpp"
+)
+source_group(Collision FILES ${SOURCE_FILES_Collision})
+
+file(GLOB SOURCE_FILES_Editor
+	"${INCLUDE_PATH}/Editor/*.h"
+	"Editor/*.cpp"
+)
+source_group(Editor FILES ${SOURCE_FILES_Editor})
+
 set(SOURCE_FILES
     ${SOURCE_FILES_Core}
     ${SOURCE_FILES_Core_Util}
@@ -78,6 +89,11 @@ set(SOURCE_FILES
     ${SOURCE_FILES_GUI}
     ${SOURCE_FILES_Rendering}
     ${SOURCE_FILES_Rendering_Util}
+    ${SOURCE_FILES_Collision}
+	${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui.cpp
+	${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui_draw.cpp
+	${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui_demo.cpp
+	${SOURCE_FILES_Editor}
 )
 
 set(LIBRARIES
@@ -103,4 +119,4 @@ target_link_libraries(Engine
     ${LIBRARIES}
 )
 #set_target_properties(Engine PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${INCLUDE_PATH}/PrecompiledHeader.h")
-#cotire(Engine)
+#cotire(Engine)

src/Engine/Collision/Collision.cpp

@@ -0,0 +1,282 @@
+#include <algorithm>
+
+#include "Collision/Collision.h"
+#include "Engine/GLM.h"
+#include "Core/World.h"
+#include "Rendering/Model.h"
+
+namespace Collision
+{
+
+    //note: this one hasnt been delta adjusted like RayVsAABB has
+    bool RayAABBIntr(const Ray& ray, const AABB& box)
+    {
+        glm::vec3 w = 75.0f * ray.Direction();
+        glm::vec3 v = glm::abs(w);
+        glm::vec3 c = ray.Origin() - box.Center() + w;
+        glm::vec3 half = box.HalfSize();
+
+        if (abs(c.x) > v.x + half.x) {
+            return false;
+        }
+        if (abs(c.y) > v.y + half.y) {
+            return false;
+        }
+        if (abs(c.z) > v.z + half.z) {
+            return false;
+        }
+
+        if (abs(c.y*w.z - c.z*w.y) > half.y*v.z + half.z*v.y) {
+            return false;
+        }
+        if (abs(c.x*w.z - c.z*w.x) > half.x*v.z + half.z*v.x) {
+            return false;
+        }
+        return !(abs(c.x*w.y - c.y*w.x) > half.x*v.y + half.y*v.x);
+    }
+
+    bool RayVsAABB(const Ray& ray, const AABB& box)
+    {
+        float dummy;
+        return RayVsAABB(ray, box, dummy);
+    }
+
+    bool RayVsAABB(const Ray& ray, const AABB& box, float& outDistance)
+    {
+        glm::vec3 invdir = 1.0f / ray.Direction();
+        glm::vec3 origin = ray.Origin();
+
+        float t1 = (box.MinCorner().x - origin.x)*invdir.x;
+        float t2 = (box.MaxCorner().x - origin.x)*invdir.x;
+        float t3 = (box.MinCorner().y - origin.y)*invdir.y;
+        float t4 = (box.MaxCorner().y - origin.y)*invdir.y;
+        float t5 = (box.MinCorner().z - origin.z)*invdir.z;
+        float t6 = (box.MaxCorner().z - origin.z)*invdir.z;
+
+        float tmin = std::max(std::max(std::min(t1, t2), std::min(t3, t4)), std::min(t5, t6));
+        float tmax = std::min(std::min(std::max(t1, t2), std::max(t3, t4)), std::max(t5, t6));
+
+        //if (tmax < 0 || tmin > tmax)
+        //if tmin,tmax are almost the same (i.e. hitting exactly in the corner) then tmin might be slightly 
+        //greater than tmax becuase of floating-precision problems. fixed by adding a small delta to tmax
+        if (tmax < 0 || tmin>(tmax + 0.0001f))
+            return false;
+
+        outDistance = (tmin > 0) ? tmin : tmax;
+        return true;
+    }
+
+    bool AABBVsAABB(const AABB& a, const AABB& b)
+    {
+        const glm::vec3& aCenter = a.Center();
+        const glm::vec3& bCenter = b.Center();
+        const glm::vec3& aHSize = a.HalfSize();
+        const glm::vec3& bHSize = b.HalfSize();
+        //Test will probably exit because of the X and Z axes more often, so test them first.
+        if (abs(aCenter[0] - bCenter[0]) > (aHSize[0] + bHSize[0])) {
+            return false;
+        }
+        if (abs(aCenter[2] - bCenter[2]) > (aHSize[2] + bHSize[2])) {
+            return false;
+        }
+        return (abs(aCenter[1] - bCenter[1]) <= (aHSize[1] + bHSize[1]));
+    }
+
+    bool AABBVsAABB(const AABB& a, const AABB& b, glm::vec3& minimumTranslation)
+    {
+        minimumTranslation = glm::vec3(0, 0, 0);
+        const glm::vec3& aMax = a.MaxCorner();
+        const glm::vec3& bMax = b.MaxCorner();
+        const glm::vec3& aMin = a.MinCorner();
+        const glm::vec3& bMin = b.MinCorner();
+        const glm::vec3& bSize = b.Size();
+        const glm::vec3& aSize = a.Size();
+        float minOffset = INFINITY;
+        float off;
+        auto axisesIntersecting = glm::tvec3<bool, glm::highp>(false, false, false);
+        for (int i = 0; i < 3; ++i) {
+            off = bMax[i] - aMin[i];
+            if (off > 0 && off < bSize[i] + aSize[i]) {
+                if (off < minOffset) {
+                    minimumTranslation = glm::vec3();
+                    minimumTranslation[i] = minOffset = off;
+                }
+                axisesIntersecting[i] = true;
+            }
+            off = aMax[i] - bMin[i];
+            if (off > 0 && off < bSize[i] + aSize[i]) {
+                if (off < minOffset) {
+                    minOffset = off;
+                    minimumTranslation = glm::vec3();
+                    minimumTranslation[i] = -off;
+                }
+                axisesIntersecting[i] = true;
+            }
+        }
+        return glm::all(axisesIntersecting);
+    }
+
+    bool RayVsModel(const Ray& ray,
+        const std::vector<RawModel::Vertex>& modelVertices,
+        const std::vector<unsigned int>& modelIndices)
+    {
+        for (int i = 0; i < modelIndices.size(); ++i) {
+            glm::vec3 v0 = modelVertices[modelIndices[i]].Position;
+            glm::vec3 e1 = modelVertices[modelIndices[++i]].Position - v0;		//v1 - v0
+            glm::vec3 e2 = modelVertices[modelIndices[++i]].Position - v0;		//v2 - v0
+            glm::vec3 m = ray.Origin() - v0;
+            glm::vec3 MxE1 = glm::cross(m, e1);
+            glm::vec3 DxE2 = glm::cross(ray.Direction(), e2);
+            float DetInv = glm::dot(e1, DxE2);
+            if (std::abs(DetInv) < FLT_EPSILON) {
+                continue;
+            }
+            DetInv = 1.0f / DetInv;
+            float u = glm::dot(m, DxE2) * DetInv;
+            float v = glm::dot(ray.Direction(), MxE1) * DetInv;
+            //u,v can be very close to 0 but still negative sometimes. added a deltafactor to compensate for that problem
+            if ((u + 0.001f) < 0 || (v + 0.001f) < 0 || 1 < u + v) {
+                continue;
+            }
+            //Here, u and v are positive, u+v <= 1, and if distance is positive - triangle is hit.
+            if (0 <= glm::dot(e2, MxE1) * DetInv) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    bool RayVsModel(const Ray& ray,
+        const std::vector<RawModel::Vertex>& modelVertices,
+        const std::vector<unsigned int>& modelIndices,
+        float& outDistance,
+        float& outUCoord,
+        float& outVCoord)
+    {
+        outDistance = INFINITY;
+        bool hit = false;
+        for (int i = 0; i < modelIndices.size(); ++i) {
+            glm::vec3 v0 = modelVertices[modelIndices[i]].Position;
+            glm::vec3 e1 = modelVertices[modelIndices[++i]].Position - v0;		//v1 - v0
+            glm::vec3 e2 = modelVertices[modelIndices[++i]].Position - v0;		//v2 - v0
+            glm::vec3 m = ray.Origin() - v0;
+            glm::vec3 MxE1 = glm::cross(m, e1);
+            glm::vec3 DxE2 = glm::cross(ray.Direction(), e2);//pVec
+            float DetInv = glm::dot(e1, DxE2);
+            if (std::abs(DetInv) < FLT_EPSILON) {
+                continue;
+            }
+            DetInv = 1.0f / DetInv;
+            float dist = glm::dot(e2, MxE1) * DetInv;
+            if (dist >= outDistance) {
+                continue;
+            }
+            float u = glm::dot(m, DxE2) * DetInv;
+            float v = glm::dot(ray.Direction(), MxE1) * DetInv;
+
+            //u,v can be very close to 0 but still negative sometimes. added a deltafactor to compensate for that problem
+            //If u and v are positive, u+v <= 1, dist is positive, and less than closest.
+            if (0 <= (u + 0.001f) && 0 <= (v + 0.001f) && u + v <= 1 && 0 <= dist) {
+                outDistance = dist;
+                outUCoord = u;
+                outVCoord = v;
+                hit = true;
+            }
+        }
+        return hit;
+    }
+
+    bool RayVsModel(const Ray& ray,
+        const std::vector<RawModel::Vertex>& modelVertices,
+        const std::vector<unsigned int>& modelIndices,
+        glm::vec3& outHitPosition)
+    {
+        float u;
+        float v;
+        float dist;
+        bool hit = RayVsModel(ray, modelVertices, modelIndices, dist, u, v);
+        outHitPosition = ray.Origin() + dist * ray.Direction();
+        return hit;
+    }
+
+bool IsSameBoxProbably(const AABB& first, const AABB& second, const float epsilon)
+{
+    const glm::vec3& ma1 = first.MaxCorner();
+    const glm::vec3& ma2 = first.MaxCorner();
+    const glm::vec3& mi1 = second.MinCorner();
+    const glm::vec3& mi2 = second.MinCorner();
+    return (std::abs(ma1.x - ma2.x) < epsilon) &&
+        (std::abs(mi1.x - mi2.x) < epsilon) &&
+        (std::abs(ma1.z - ma2.z) < epsilon) &&
+        (std::abs(mi1.z - mi2.z) < epsilon) &&
+        (std::abs(ma1.y - ma2.y) < epsilon) &&
+        (std::abs(mi1.y - mi2.y) < epsilon);
+}
+
+bool attachAABBComponentFromModel(World* world, EntityID id)
+{
+    if (!world->HasComponent(id, "Model")) {
+        return false;
+    }
+    ComponentWrapper model = world->GetComponent(id, "Model");
+    ComponentWrapper collision = world->AttachComponent(id, "AABB");
+    Model* modelRes = ResourceManager::Load<Model>(model["Resource"]);
+    if (modelRes == nullptr) {
+        return false;
+    }
+
+    glm::mat4 modelMatrix = modelRes->m_Matrix;
+
+    glm::vec3 mini = glm::vec3(INFINITY, INFINITY, INFINITY);
+    glm::vec3 maxi = glm::vec3(-INFINITY, -INFINITY, -INFINITY);
+    for (const auto& v : modelRes->m_Vertices) {
+        const auto& wPos = modelMatrix * glm::vec4(v.Position.x, v.Position.y, v.Position.z, 1);
+        maxi.x = std::max(wPos.x, maxi.x);
+        maxi.y = std::max(wPos.y, maxi.y);
+        maxi.z = std::max(wPos.z, maxi.z);
+        mini.x = std::min(wPos.x, mini.x);
+        mini.y = std::min(wPos.y, mini.y);
+        mini.z = std::min(wPos.z, mini.z);
+    }
+    collision["BoxCenter"] = 0.5f * (maxi + mini);
+    collision["BoxSize"] = maxi - mini;
+    return true;
+}
+
+bool GetEntityBox(World* world, ComponentWrapper& AABBComponent, AABB& outBox)
+{
+    ComponentWrapper& cTrans = world->GetComponent(AABBComponent.EntityID, "Transform");
+    ComponentWrapper model = world->GetComponent(AABBComponent.EntityID, "Model");
+    Model* modelRes = ResourceManager::Load<Model>(model["Resource"]);
+    outBox.CreateFromCenter(AABBComponent["BoxCenter"], AABBComponent["BoxSize"]);
+    glm::vec3 mini = outBox.MinCorner();
+    glm::vec3 maxi = outBox.MaxCorner();
+
+    if (modelRes == nullptr) {
+        return false;
+    }
+    glm::mat4 modelMatrix = modelRes->m_Matrix *
+        glm::translate(glm::mat4(), (glm::vec3)cTrans["Position"]) *
+        glm::scale((glm::vec3)cTrans["Scale"]);
+
+    outBox = AABB(modelMatrix * glm::vec4(mini.x, mini.y, mini.z, 1),
+        modelMatrix * glm::vec4(maxi.x, maxi.y, maxi.z, 1));
+    return true;
+}
+
+bool GetEntityBox(World* world, EntityID entity, AABB& outBox, bool forceBoxFromModel)
+{
+    if (!world->HasComponent(entity, "AABB")) {
+        if (forceBoxFromModel) {
+            if (!attachAABBComponentFromModel(world, entity))
+                return false;
+        } else {
+            return false;
+        }
+    }
+
+    ComponentWrapper& cBox = world->GetComponent(entity, "AABB");
+    return GetEntityBox(world, cBox, outBox);
+}
+
+}

src/Engine/Collision/CollisionSystem.cpp

@@ -0,0 +1,40 @@
+#include "Collision/Collision.h"
+#include "Collision/CollisionSystem.h"
+#include "Core/AABB.h"
+
+void CollisionSystem::UpdateComponent(World * world, ComponentWrapper & cAABB, double dt)
+{
+    //Right now, cAABB is a component attached to any entity that should be collideable.
+    AABB thisBox;
+    if (!Collision::GetEntityBox(world, cAABB, thisBox)) {
+        return;
+    }
+    //Press 'Z' to enable/disable collision.
+    if (zPress) {
+        return;
+    }
+    //Here, mover should be an object that moves, currently only players.
+    for (auto& mover : *world->GetComponents("Player")) {
+        if (cAABB.EntityID == mover.EntityID) {
+            continue;
+        }
+        AABB otherBox;
+        if (!Collision::GetEntityBox(world, mover.EntityID, otherBox)) {
+            continue;
+        }
+        glm::vec3 resolveTranslation;
+        if (Collision::AABBVsAABB(otherBox, thisBox, resolveTranslation)) {
+            ComponentWrapper& trans = world->GetComponent(mover.EntityID, "Transform");
+            //TODO: Special treatment if both are movers.
+            trans["Position"] = (glm::vec3)trans["Position"] + resolveTranslation;
+        }
+    }
+}
+
+bool CollisionSystem::OnKeyUp(const Events::KeyUp & event)
+{
+    if (event.KeyCode == GLFW_KEY_Z) {
+        zPress = !zPress;
+    }
+    return false;
+}

src/Engine/Collision/TriggerSystem.cpp

@@ -0,0 +1,81 @@
+#include "Collision/TriggerSystem.h"
+#include "Collision/Collision.h"
+#include "Core/AABB.h"
+#include "Rendering/Model.h"
+
+void TriggerSystem::UpdateComponent(World* world, ComponentWrapper& trigger, double dt)
+{
+    //Currently only players can trigger things.
+    auto players = world->GetComponents("Player");
+    if (players == nullptr) {
+        return;
+    }
+    EntityID tId = trigger.EntityID;
+    AABB triggerBox;
+    //The trigger *should* have a bounding box, or something, to test against so it can be triggered.
+    if (!Collision::GetEntityBox(world, tId, triggerBox, true)) {
+        return;
+    }
+    for (auto& pc : *players) {
+        EntityID pId = pc.EntityID;
+        AABB playerBox;
+        //The player can't trigger anything without an AABB.
+        if (!Collision::GetEntityBox(world, pId, playerBox, true)) {
+            continue;
+        }
+        if (!Collision::AABBVsAABB(triggerBox, playerBox)) {
+            //Entity is not touching the trigger,
+            //Throw event if it was previously.
+            if (throwLeaveIfWasInTrigger(m_EntitiesTouchingTrigger[tId], pId, tId)) {
+                continue;
+            }
+            //This only occurs if the entity was completely inside the trigger one frame, 
+            //then completely outside the trigger, e.g. when dying and respawning.
+            throwLeaveIfWasInTrigger(m_EntitiesCompletelyInTrigger[tId], pId, tId);
+        } else {
+            //Entity is at least touching the trigger.
+            AABB completelyInsideBox;
+            completelyInsideBox.CreateFromCenter(triggerBox.Center(), triggerBox.Size() - 2.0f * playerBox.Size());
+            if (Collision::AABBVsAABB(completelyInsideBox, playerBox) &&
+                glm::all(glm::greaterThan(triggerBox.Size(), playerBox.Size()))) {
+                //Entity is completely inside the trigger.
+                //If it was only touching before, it is erased.
+                m_EntitiesTouchingTrigger[tId].erase(pId);
+                std::unordered_set<EntityID>& completeSet = m_EntitiesCompletelyInTrigger[tId];
+                if (completeSet.count(pId) == 0) {
+                    //If it wasn't completely in the trigger, throw Enter and add to the set.
+                    completeSet.insert(pId);
+                    publish<Events::TriggerEnter>(pId, tId);
+                }
+            } else {
+                //Entity is only touching the trigger.
+                std::unordered_set<EntityID>& touchSet = m_EntitiesTouchingTrigger[tId];
+                std::unordered_set<EntityID>& completeSet = m_EntitiesCompletelyInTrigger[tId];
+                const auto& it = completeSet.find(pId);
+                //If it was completely inside before.
+                if (it != completeSet.end()) {
+                    completeSet.erase(it);
+                    touchSet.insert(pId);
+                    //If it was completely outside before.
+                } else if (touchSet.count(pId) == 0) {
+                    publish<Events::TriggerTouch>(pId, tId);
+                    touchSet.insert(pId);
+                }
+                //Else, it was touching the trigger last frame too and nothing is done.
+            }
+        }
+    }
+}
+
+bool TriggerSystem::throwLeaveIfWasInTrigger(std::unordered_set<EntityID>& triggerSet, EntityID pId, EntityID tId)
+{
+    const auto& it = triggerSet.find(pId);
+    if (it != triggerSet.end()) {
+        //If it was in the trigger, but not anymore, throw leaveEvent and erase from the set.
+        triggerSet.erase(it);
+        publish<Events::TriggerLeave>(pId, tId);
+        return true;
+    }
+    return false;
+}
+

src/Engine/Core/AABB.cpp

@@ -0,0 +1,34 @@
+#include "Core/AABB.h"
+#include "Common.h"
+
+AABB::AABB(const glm::vec3& minPos, const glm::vec3& maxPos)
+    : m_MinCorner(minPos)
+    , m_MaxCorner(maxPos)
+    , m_Center(0.5f * (maxPos + minPos))
+    , m_HalfSize(0.5f * (maxPos - minPos))
+{
+    DEBUG_IF(glm::any(glm::lessThan(m_MaxCorner, m_MinCorner))) {
+        LOG_WARNING("AABB maxCorner coordinates are not greater than minCorner");
+        m_MaxCorner.x = glm::max(m_MaxCorner.x, m_MinCorner.x);
+        m_MinCorner.x = glm::min(m_MaxCorner.x, m_MinCorner.x);
+        m_MaxCorner.y = glm::max(m_MaxCorner.y, m_MinCorner.y);
+        m_MinCorner.y = glm::min(m_MaxCorner.y, m_MinCorner.y);
+        m_MaxCorner.z = glm::max(m_MaxCorner.z, m_MinCorner.z);
+        m_MinCorner.z = glm::min(m_MaxCorner.z, m_MinCorner.z);
+    }
+}
+
+AABB::AABB(const glm::vec4& minPos, const glm::vec4& maxPos)
+    : AABB(glm::vec3(minPos), glm::vec3(maxPos))
+{}
+
+void AABB::CreateFromCenter(const glm::vec3& center, const glm::vec3& size)
+{
+    m_Center = center;
+    m_HalfSize = 0.5f * size;
+    m_MinCorner = m_Center - m_HalfSize;
+    m_MaxCorner = m_Center + m_HalfSize;
+}
+
+AABB::~AABB()
+{}

src/Engine/Core/ComponentPool.cpp

@@ -19,7 +19,7 @@ bool ComponentPoolForwardIterator::operator!=(const ComponentPoolForwardIterator
     return m_MemoryPoolIterator != other.m_MemoryPoolIterator;
 }
 
-ComponentPoolForwardIterator& ComponentPoolForwardIterator::operator++(int)
+ComponentPoolForwardIterator ComponentPoolForwardIterator::operator++(int)
 {
     ComponentPoolForwardIterator copyIter(*this);
     operator++();
@@ -50,10 +50,16 @@ ComponentWrapper ComponentPool::GetByEntity(EntityID ent)
     return ComponentWrapper(m_ComponentInfo, m_EntityToComponent.at(ent));
 }
 
+
+bool ComponentPool::KnowsEntity(EntityID ent)
+{
+    return m_EntityToComponent.find(ent) != m_EntityToComponent.end();
+}
+
 void ComponentPool::Delete(ComponentWrapper& wrapper)
 {
     m_EntityToComponent.erase(wrapper.EntityID);
-    m_Pool.Free(wrapper.Data);
+    m_Pool.Free(wrapper.Data - sizeof(EntityID));
 }
 
 ComponentPool::iterator ComponentPool::begin() const

src/Engine/Core/ConfigFile.cpp

@@ -24,8 +24,11 @@ ConfigFile::ConfigFile(std::string path)
 	if (boost::filesystem::exists(m_Path)) {
 		try {
 			boost::property_tree::ini_parser::read_ini(m_Path.string(), m_PTreeOverrides);
-			for (auto& node : m_PTreeOverrides) {
-				m_PTreeMerged.put_child(node.first, node.second);
+			for (auto& topLevelNode : m_PTreeOverrides) {
+                auto& mergedTopLevelNode = m_PTreeMerged.find(topLevelNode.first);
+                for (auto& childOverrideNode : topLevelNode.second) {
+                    mergedTopLevelNode->second.put_child(childOverrideNode.first, childOverrideNode.second);
+                }
 			}
 		} catch (boost::property_tree::ptree_error& e) {
 			LOG_ERROR("Failed to parse \"%s\":\n%s", m_Path.filename().string().c_str(), e.what());

src/Engine/Core/EntityXMLFile.cpp

@@ -415,6 +415,7 @@ std::size_t EntityXMLFile::getTypeStride(std::string typeName)
     std::map<std::string, size_t> typeStrides{
         { "bool", sizeof(bool) },
         { "int", sizeof(int) },
+        { "float", sizeof(float) },
         { "double", sizeof(double) },
         { "string", sizeof(std::string) },
         { "Vector", sizeof(glm::vec3) },
@@ -430,12 +431,12 @@ float EntityXMLFile::getFloatAttribute(const xercesc::DOMElement* element, const
 {
     using namespace xercesc;
     XSValue::Status status;
-    XSValue* val = XSValue::getActualValue(element->getAttribute(XSTR(attribute)), xercesc::XSValue::DataType::dt_float, status);
+    XSValue* val = XSValue::getActualValue(element->getAttribute(XSTR(attribute)), xercesc::XSValue::DataType::dt_double, status);
     if (val == nullptr) {
         LOG_ERROR("Element \"%s\" doesn't have an \"%s\" attribute!", XSTR(element->getTagName()), attribute);
         return 0.f;
     } else {
-        return val->fData.fValue.f_float;
+        return static_cast<float>(val->fData.fValue.f_double);
     }
 }
 
@@ -443,39 +444,52 @@ void EntityXMLFile::writeData(const xercesc::DOMElement* element, std::string ty
 {
     using namespace xercesc;
 
-    XSValue::DataType dataType = XSValue::getDataType(XSTR(typeName.c_str()));
-    if (dataType == XSValue::DataType::dt_MAXCOUNT) {
-        if (typeName == "Vector") {
-            glm::vec3 vec;
-            vec.x = getFloatAttribute(element, "X");
-            vec.y = getFloatAttribute(element, "Y");
-            vec.z = getFloatAttribute(element, "Z");
-            memcpy(outData, reinterpret_cast<char*>(&vec), getTypeStride(typeName));
-        } else if (typeName == "Color") {
-            glm::vec4 vec;
-            vec.r = getFloatAttribute(element, "R");
-            vec.g = getFloatAttribute(element, "G");
-            vec.b = getFloatAttribute(element, "B");
-            vec.a = getFloatAttribute(element, "A");
-            memcpy(outData, reinterpret_cast<char*>(&vec), getTypeStride(typeName));
-        } else if (typeName == "Quaternion") {
-            glm::quat q;
-            q.x = getFloatAttribute(element, "X");
-            q.y = getFloatAttribute(element, "Y");
-            q.z = getFloatAttribute(element, "Z");
-            q.w = getFloatAttribute(element, "W");
-            memcpy(outData, reinterpret_cast<char*>(&q), getTypeStride(typeName));
-        }
-    } else if (dataType == XSValue::DataType::dt_string) {
-        char* str = XMLString::transcode(element->getTextContent());
-        std::string standardString(str);
-        new (outData) std::string(str);
-        XMLString::release(&str);
-        //memcpy(outData, reinterpret_cast<char*>(&standardString), getTypeStride(typeName));
-    } else {
+    if (typeName == "Vector") {
+        glm::vec3 vec;
+        vec.x = getFloatAttribute(element, "X");
+        vec.y = getFloatAttribute(element, "Y");
+        vec.z = getFloatAttribute(element, "Z");
+        memcpy(outData, reinterpret_cast<char*>(&vec), getTypeStride(typeName));
+    } else if (typeName == "Color") {
+        glm::vec4 vec;
+        vec.r = getFloatAttribute(element, "R");
+        vec.g = getFloatAttribute(element, "G");
+        vec.b = getFloatAttribute(element, "B");
+        vec.a = getFloatAttribute(element, "A");
+        memcpy(outData, reinterpret_cast<char*>(&vec), getTypeStride(typeName));
+    } else if (typeName == "Quaternion") {
+        glm::quat q;
+        q.x = getFloatAttribute(element, "X");
+        q.y = getFloatAttribute(element, "Y");
+        q.z = getFloatAttribute(element, "Z");
+        q.w = getFloatAttribute(element, "W");
+        memcpy(outData, reinterpret_cast<char*>(&q), getTypeStride(typeName));
+    } else if (typeName == "float") {
         XSValue::Status status;
-        XSValue* val = XSValue::getActualValue(element->getTextContent(), dataType, status);
-        memcpy(outData, reinterpret_cast<char*>(&val->fData.fValue), getTypeStride(typeName));
+        XSValue* val = XSValue::getActualValue(element->getTextContent(), xercesc::XSValue::DataType::dt_float, status);
+        memcpy(outData, reinterpret_cast<char*>(&val->fData.fValue.f_float), getTypeStride(typeName));
+    } else if (typeName == "double") {
+        XSValue::Status status;
+        XSValue* val = XSValue::getActualValue(element->getTextContent(), xercesc::XSValue::DataType::dt_double, status);
+        memcpy(outData, reinterpret_cast<char*>(&val->fData.fValue.f_double), getTypeStride(typeName));
+    } else if (typeName == "bool") {
+        XSValue::Status status;
+        XSValue* val = XSValue::getActualValue(element->getTextContent(), xercesc::XSValue::DataType::dt_boolean, status);
+        memcpy(outData, reinterpret_cast<char*>(&val->fData.fValue.f_bool), getTypeStride(typeName));
+    } else {
+        XSValue::DataType dataType = XSValue::getDataType(XSTR(typeName.c_str()));
+        if (dataType == XSValue::DataType::dt_string) {
+            char* str = XMLString::transcode(element->getTextContent());
+            std::string standardString(str);
+            new (outData) std::string(str);
+            XMLString::release(&str);
+            //memcpy(outData, reinterpret_cast<char*>(&standardString), getTypeStride(typeName));
+        } else {
+            //XSValue::Status status;
+            //XSValue* val = XSValue::getActualValue(element->getTextContent(), dataType, status);
+            //memcpy(outData, reinterpret_cast<char*>(&val->fData.fValue), getTypeStride(typeName));
+            LOG_WARNING("Unknown native data type: %s", typeName.c_str());
+        }
     }
 }
 

src/Engine/Core/EventBroker.cpp

@@ -2,21 +2,24 @@
 
 BaseEventRelay::~BaseEventRelay()
 {
-	if (m_Broker != nullptr) {
+    if (m_Broker != nullptr) {
 		m_Broker->Unsubscribe(*this);
-	}
+    }
 }
 
-void EventBroker::Unsubscribe(BaseEventRelay &relay) // ?
+void EventBroker::Unsubscribe(BaseEventRelay& relay) // ?
 {
-	if (m_IsProcessing) {
-		m_RelaysToUnsubscribe.push_back(&relay);
-	} else {
-		unsubscribeImmediate(relay);
-	}
+    auto identifier = std::make_tuple(relay.m_EventID, relay.m_ContextTypeName, relay.m_EventTypeName);
+
+    relay.m_Broker = nullptr;
+    if (m_IsProcessing) {
+        m_RelaysToUnsubscribe.push_back(identifier);
+    } else {
+        unsubscribeImmediate(identifier);
+    }
 }
 
-void EventBroker::Subscribe(BaseEventRelay &relay)
+void EventBroker::Subscribe(BaseEventRelay& relay)
 {
 	if (m_IsProcessing) {
 		m_RelaysToSubscribe.push_back(&relay);
@@ -38,12 +41,11 @@ int EventBroker::Process(std::string contextTypeName)
 
 	int eventsProcessed = 0;
 	for (auto &pair : *m_EventQueueRead) {
-		std::string &eventTypeName = pair.first;
+		std::string& eventTypeName = pair.first;
 		std::shared_ptr<Event> event = pair.second;
 
 		auto itpair = relays.equal_range(eventTypeName);
-		for (auto it2 = itpair.first; it2 != itpair.second; it2++)
-		{
+		for (auto it2 = itpair.first; it2 != itpair.second; it2++) {
 			std::string name = it2->first;
 			BaseEventRelay* relay = it2->second;
 			relay->Receive(event);
@@ -60,8 +62,8 @@ int EventBroker::Process(std::string contextTypeName)
 	m_RelaysToSubscribe.clear();
 
 	// Process pending unsubscriptions
-	for (auto& r : m_RelaysToUnsubscribe) {
-		unsubscribeImmediate(*r);
+	for (auto& identifier : m_RelaysToUnsubscribe) {
+		unsubscribeImmediate(identifier);
 	}
 	m_RelaysToUnsubscribe.clear();
 
@@ -81,21 +83,26 @@ void EventBroker::Clear()
 void EventBroker::subscribeImmediate(BaseEventRelay& relay)
 {
 	relay.m_Broker = this;
+    relay.m_EventID = m_NextEventID++;
 	m_ContextRelays[relay.m_ContextTypeName].insert(std::make_pair(relay.m_EventTypeName, &relay));
 }
 
-void EventBroker::unsubscribeImmediate(BaseEventRelay& relay)
+void EventBroker::unsubscribeImmediate(std::tuple<EventID, ContextTypeName_t, EventTypeName_t> identifier)
 {
-	auto contextIt = m_ContextRelays.find(relay.m_ContextTypeName);
+    EventID eventID;
+    ContextTypeName_t contextTypeName;
+    EventTypeName_t eventTypeName;
+    std::tie(eventID, contextTypeName, eventTypeName) = identifier;
+
+	auto contextIt = m_ContextRelays.find(contextTypeName);
 	if (contextIt == m_ContextRelays.end()) {
 		return;
 	}
 
 	auto eventRelays = contextIt->second;
-	auto itpair = eventRelays.equal_range(relay.m_EventTypeName);
+	auto itpair = eventRelays.equal_range(eventTypeName);
 	for (auto it = itpair.first; it != itpair.second; ++it) {
-		if (it->second == &relay) {
-			relay.m_Broker = nullptr;
+		if (it->second->m_EventID == eventID) {
 			eventRelays.erase(it);
 			break;
 		}

src/Engine/Core/InputManager.cpp

@@ -1,10 +1,17 @@
 #include "Core/InputManager.h"
 
+std::vector<unsigned int> InputManager::GLFWCharCallbackQueue;
+std::vector<std::pair<double, double>> InputManager::GLFWScrollCallbackQueue;
+std::vector<std::string> InputManager::GLFWDropCallbackQueue;
+
 void InputManager::Initialize()
 {
 	// TODO: Gamepad
 	//m_LastGamepadAxisState = std::array<GamepadAxisState, XUSER_MAX_COUNT>();
 	//m_LastGamepadButtonState = std::array<GamepadButtonState, XUSER_MAX_COUNT>();
+    glfwSetCharCallback(m_GLFWWindow, &InputManager::GLFWCharCallback);
+    glfwSetScrollCallback(m_GLFWWindow, &InputManager::GLFWScrollCallback);
+    glfwSetDropCallback(m_GLFWWindow, &InputManager::GLFWDropCallback);
 
 	EVENT_SUBSCRIBE_MEMBER(m_ELockMouse, &InputManager::OnLockMouse);
 	EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &InputManager::OnUnlockMouse);
@@ -36,6 +43,15 @@ void InputManager::Update(double dt)
 		}
 	}
 
+    // Keyboard text input
+    for (unsigned int& c : GLFWCharCallbackQueue) {
+        Events::KeyboardChar e;
+        e.Timestamp = glfwGetTime();
+        e.Char = c;
+        m_EventBroker->Publish(e);
+    }
+    GLFWCharCallbackQueue.clear();
+
 	// Mouse buttons
 	for (int i = 0; i <= GLFW_MOUSE_BUTTON_LAST; ++i) {
 		m_CurrentMouseState[i] = glfwGetMouseButton(m_GLFWWindow, i);
@@ -73,6 +89,22 @@ void InputManager::Update(double dt)
 		m_EventBroker->Publish(e);
 	}
 
+    // Mouse scroll
+    for (auto& pair : GLFWScrollCallbackQueue) {
+        Events::MouseScroll e;
+        std::tie(e.DeltaX, e.DeltaY) = pair;
+        m_EventBroker->Publish(e);
+    }
+    GLFWScrollCallbackQueue.clear();
+
+    // File drop
+    for (auto& path : GLFWDropCallbackQueue) {
+        Events::FileDropped e;
+        e.Path = path;
+        m_EventBroker->Publish(e);
+    }
+    GLFWDropCallbackQueue.clear();
+
 	// // Lock mouse while holding LMB
 	// if (m_CurrentMouseState[GLFW_MOUSE_BUTTON_LEFT])
 	// {
@@ -196,6 +228,25 @@ void InputManager::PublishGamepadButtonIfChanged(int gamepadID, Gamepad::Button
 	}
 }
 
+void InputManager::GLFWCharCallback(GLFWwindow* window, unsigned int c)
+{
+    GLFWCharCallbackQueue.push_back(c);
+}
+
+
+void InputManager::GLFWScrollCallback(GLFWwindow* window, double xoffset, double yoffset)
+{
+    GLFWScrollCallbackQueue.push_back(std::make_pair(xoffset, yoffset));
+}
+
+
+void InputManager::GLFWDropCallback(GLFWwindow* window, int count, const char* paths[])
+{
+    for (int i = 0; i < count; i++) {
+        GLFWDropCallbackQueue.push_back(std::string(paths[i]));
+    }
+}
+
 bool InputManager::OnLockMouse(const Events::LockMouse &event)
 {
 	m_MouseLocked = true;

src/Engine/Core/OctTree.cpp

@@ -0,0 +1,377 @@
+#include <vector>
+#include <algorithm>
+#include <bitset>
+
+#include "Core/OctTree.h"
+#include "Collision/Collision.h"
+
+namespace
+{
+//To be able to sort nodes based on distance to ray origin.
+struct ChildInfo
+{
+    int Index;
+    float Distance;
+};
+
+bool isFirstLower(const ChildInfo& first, const ChildInfo& second)
+{
+    return first.Distance < second.Distance;
+}
+
+}
+
+OctTree::OctTree()
+    : OctTree(AABB(), 0)
+{}
+
+OctTree::OctTree(const AABB& octTreeBounds, int subDivisions)
+    : m_Root(new OctChild(octTreeBounds, subDivisions, m_StaticObjects, m_DynamicObjects))
+    , m_UpdatedOnce(false)
+{}
+
+OctTree::~OctTree()
+{
+    delete m_Root;
+}
+
+void OctTree::AddDynamicObject(const AABB& box)
+{
+    m_Root->AddDynamicObject(box);
+    m_DynamicObjects.push_back(box);
+}
+
+void OctTree::AddStaticObject(const AABB& box)
+{
+    m_Root->AddStaticObject(box);
+    m_StaticObjects.push_back(box);
+}
+
+void OctTree::BoxesInSameRegion(const AABB& box, std::vector<AABB>& outBoxes)
+{
+    falsifyObjectChecks();
+    m_Root->BoxesInSameRegion(box, outBoxes);
+}
+
+void OctTree::ClearObjects()
+{
+    m_StaticObjects.clear();
+    m_DynamicObjects.clear();
+    m_Root->ClearObjects();
+}
+
+void OctTree::ClearDynamicObjects()
+{
+    m_DynamicObjects.clear();
+    m_Root->ClearDynamicObjects();
+}
+
+bool OctTree::RayCollides(const Ray& ray, Output& data)
+{
+    falsifyObjectChecks();
+    data.CollideDistance = -1;
+    return m_Root->RayCollides(ray, data);
+}
+
+bool OctTree::BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected)
+{
+    falsifyObjectChecks();
+    return m_Root->BoxCollides(boxToTest, outBoxIntersected);
+}
+
+void OctTree::falsifyObjectChecks()
+{
+    for (auto& obj : m_StaticObjects) {
+        obj.Checked = false;
+    }
+    for (auto& obj : m_DynamicObjects) {
+        obj.Checked = false;
+    }
+}
+
+OctTree::OctChild::OctChild(const AABB& octTreeBounds,
+    int subDivisions, 
+    std::vector<ContainedObject>& staticObjects,
+    std::vector<ContainedObject>& dynamicObjects)
+    : m_Box(octTreeBounds)
+    , m_StaticObjectsRef(staticObjects)
+    , m_DynamicObjectsRef(dynamicObjects)
+{
+    if (subDivisions == 0) {
+        for (OctChild*& c : m_Children) {
+            c = nullptr;
+        }
+    } else {
+        --subDivisions;
+        for (int i = 0; i < 8; ++i) {
+            glm::vec3 minPos, maxPos;
+            const glm::vec3& parentMin = m_Box.MinCorner();
+            const glm::vec3& parentMax = m_Box.MaxCorner();
+            const glm::vec3& parentCenter = m_Box.Center();
+            std::bitset<3> bits(i);
+            //If child is 4,5,6,7.
+            if (bits.test(2)) {
+                minPos.x = parentCenter.x;
+                maxPos.x = parentMax.x;
+            } else {
+                minPos.x = parentMin.x;
+                maxPos.x = parentCenter.x;
+            }
+
+            //If child is 2,3,6,7
+            if (bits.test(1)) {
+                minPos.y = parentCenter.y;
+                maxPos.y = parentMax.y;
+            } else {
+                minPos.y = parentMin.y;
+                maxPos.y = parentCenter.y;
+            }
+            //If child is 1,3,5,7
+            if (bits.test(0)) {
+                minPos.z = parentCenter.z;
+                maxPos.z = parentMax.z;
+            } else {
+                minPos.z = parentMin.z;
+                maxPos.z = parentCenter.z;
+            }
+            m_Children[i] = new OctChild(AABB(minPos, maxPos), subDivisions, m_StaticObjectsRef, m_DynamicObjectsRef);
+        }
+    }
+}
+
+OctTree::OctChild::~OctChild()
+{
+    for (OctChild*& c : m_Children) {
+        if (c != nullptr) {
+            delete c;
+            c = nullptr;
+        }
+    }
+}
+
+bool OctTree::OctChild::BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected) const
+{
+    if (hasChildren()) {
+        for (int i : childIndicesContainingBox(boxToTest)) {
+            if (m_Children[i]->BoxCollides(boxToTest, outBoxIntersected))
+                return true;
+        }
+    } else {
+        for (int i : m_StaticObjIndices) {
+            if (!m_StaticObjectsRef[i].Checked) {
+                const AABB& objBox = m_StaticObjectsRef[i].Box;
+                if (Collision::AABBVsAABB(boxToTest, objBox)) {
+                    outBoxIntersected = objBox;
+                    return true;
+                }
+                m_StaticObjectsRef[i].Checked = true;
+            }
+        }
+        for (int i : m_DynamicObjIndices) {
+            if (!m_DynamicObjectsRef[i].Checked) {
+                const AABB& objBox = m_DynamicObjectsRef[i].Box;
+                if (!Collision::IsSameBoxProbably(boxToTest, objBox) &&
+                    Collision::AABBVsAABB(boxToTest, objBox)) {
+                    outBoxIntersected = objBox;
+                    return true;
+                }
+                m_DynamicObjectsRef[i].Checked = true;
+            }
+        }
+    }
+    return false;
+}
+
+bool OctTree::OctChild::RayCollides(const Ray& ray, Output& data) const
+{
+    //If the node AABB is missed, everything it contains is missed.
+    if (Collision::RayAABBIntr(ray, m_Box)) {
+        //If the ray shoots the tree, and it is a parent to 8 children :o
+        if (hasChildren()) {
+            //Sort children according to their distance from the ray origin.
+            std::vector<ChildInfo> childInfos;
+            childInfos.reserve(8);
+            for (int i = 0; i < 8; ++i) {
+                childInfos.push_back({ i, glm::distance(ray.Origin(), m_Children[i]->m_Box.Center()) });
+            }
+            std::sort(childInfos.begin(), childInfos.end(), isFirstLower);
+            //Loop through the children, starting with the one closest to the ray origin. I.e the first to be hit.
+            for (const ChildInfo& info : childInfos) {
+                if (m_Children[info.Index]->RayCollides(ray, data)) {
+                    return true;
+                }
+            }
+        } else {
+            //Check against boxes in the node.
+            float minDist = INFINITY;
+            bool intersected = false;
+            for (int i : m_StaticObjIndices) {
+                float dist;
+                //If we haven't tested against this object before, and the ray hits.
+                if (!m_StaticObjectsRef[i].Checked &&
+                    Collision::RayVsAABB(ray, m_StaticObjectsRef[i].Box, dist)) {
+                    minDist = std::min(dist, minDist);
+                    intersected = true;
+                }
+                m_StaticObjectsRef[i].Checked = true;
+            }
+            for (int i : m_DynamicObjIndices) {
+                float dist;
+                //If we haven't tested against this object before, and the ray hits.
+                if (!m_DynamicObjectsRef[i].Checked &&
+                    Collision::RayVsAABB(ray, m_DynamicObjectsRef[i].Box, dist)) {
+                    minDist = std::min(dist, minDist);
+                    intersected = true;
+                }
+                m_DynamicObjectsRef[i].Checked = true;
+            }
+
+            data.CollideDistance = minDist;
+            return intersected;
+        }
+    }
+    return false;
+}
+
+
+void OctTree::OctChild::AddDynamicObject(const AABB& box)
+{
+    if (hasChildren()) {
+        for (auto i : childIndicesContainingBox(box)) {
+            m_Children[i]->AddDynamicObject(box);
+        }
+    } else {
+        //Since it hasn't been added yet to the real object list, the index is after the last =size.
+        m_DynamicObjIndices.push_back((int)m_DynamicObjectsRef.size());
+    }
+}
+
+void OctTree::OctChild::AddStaticObject(const AABB& box)
+{
+    if (hasChildren()) {
+        for (auto i : childIndicesContainingBox(box)) {
+            m_Children[i]->AddStaticObject(box);
+        }
+    } else {
+        //Since it hasn't been added yet to the real object list, the index is after the last =size.
+        m_StaticObjIndices.push_back((int)m_StaticObjectsRef.size());
+    }
+}
+
+void OctTree::OctChild::BoxesInSameRegion(const AABB& box, std::vector<AABB>& outBoxes) const
+{
+    if (hasChildren()) {
+        for (auto i : childIndicesContainingBox(box)) {
+            m_Children[i]->BoxesInSameRegion(box, outBoxes);
+        }
+    } else {
+        size_t startIndex = outBoxes.size();
+        int numDuplicates = 0;
+        outBoxes.resize(outBoxes.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;
+                outBoxes[startIndex + i - numDuplicates] = obj.Box;
+            }
+        }
+        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;
+                outBoxes[startIndex + i - numDuplicates] = obj.Box;
+            }
+        }
+        for (size_t i = 0; i < numDuplicates; ++i) {
+            outBoxes.pop_back();
+        }
+    }
+}
+
+void OctTree::OctChild::ClearObjects()
+{
+    if (hasChildren()) {
+        for (OctChild*& c : m_Children) {
+            c->ClearObjects();
+        }
+    } else {
+        m_DynamicObjIndices.clear();
+        m_StaticObjIndices.clear();
+    }
+}
+
+void OctTree::OctChild::ClearDynamicObjects()
+{
+    if (hasChildren()) {
+        for (OctChild*& c : m_Children) {
+            c->ClearObjects();
+        }
+    } else {
+        m_DynamicObjIndices.clear();
+    }
+}
+
+//:     3        7 
+//:
+//:        2         6 
+//:                           |
+//:     1        5          \ y
+//:                          z 
+//:        0         4        0  x-->
+//
+// child: 0 1 2 3 4 5 6 7
+//    x : - - - - + + + +
+//    y : - - + + - - + +
+//    z : - + - + - + - +
+int OctTree::OctChild::childIndexContainingPoint(const glm::vec3& point) const
+{
+    const glm::vec3& c = m_Box.Center();
+    return (1 << 2) * (point.x >= c.x) | (1 << 1) * (point.y >= c.y) | (point.z >= c.z);
+}
+
+std::vector<int> OctTree::OctChild::childIndicesContainingBox(const AABB& box) const
+{
+    int minInd = childIndexContainingPoint(box.MinCorner());
+    int maxInd = childIndexContainingPoint(box.MaxCorner());
+    //Because of the predictable ordering of the child indices, 
+    //the number of bits set when xor:ing the indices will determine the number of children containing the box.
+    std::bitset<3> bits(minInd ^ maxInd);
+    switch (bits.count()) {
+        //Box contained completely in one child.
+    case 0:
+        return{ minInd };
+        //Two children.
+    case 1:
+        return{ minInd, maxInd };
+        //Four children.
+    case 2:
+    {
+        std::vector<int> ret;
+        //Bit-hax to calculate the correct 4 children containing the box.
+        //This works because of the childrens index determine what part of 
+        //the dimensions they are responsible for (which octant).
+        bits.flip();
+        //At this point the bits necessarily have exactly one bit set.
+        for (int c = 0; c < 8; ++c) {
+            //If the child index have the same bit set as the bits, add box to it.
+            if (bits.to_ulong() & c) {
+                ret.push_back(c);
+            }
+        }
+        return ret;
+    }
+    case 3:                         //Eight children.
+        return{ 0,1,2,3,4,5,6,7 };
+    default:
+        return std::vector<int>();
+    }
+}
+
+inline bool OctTree::OctChild::hasChildren() const
+{
+    return m_Children[0] != nullptr;
+}

src/Engine/Core/ResourceManager.cpp

@@ -100,7 +100,7 @@ Resource* ResourceManager::Load(std::string resourceType, std::string resourceNa
 		LOG_WARNING("Hot-loading resource \"%s\"", resourceName.c_str());
 	}
 
-	return CreateResource(resourceType, resourceName, parent);
+    return CreateResource(resourceType, resourceName, parent);
 }
 
 Resource* ResourceManager::CreateResource(std::string resourceType, std::string resourceName, Resource* parent)
@@ -112,10 +112,16 @@ Resource* ResourceManager::CreateResource(std::string resourceType, std::string
 	}
 
 	// Call the factory function
-	Resource* resource = facIt->second(resourceName);
-	// Store IDs
-	resource->TypeID = GetTypeID(resourceType);
-	resource->ResourceID = GetNewResourceID(resource->TypeID);
+    Resource* resource;
+    try {
+        resource = facIt->second(resourceName);
+        // Store IDs
+        resource->TypeID = GetTypeID(resourceType);
+        resource->ResourceID = GetNewResourceID(resource->TypeID);
+    } catch (const std::exception& e) {
+        resource = nullptr;
+		LOG_ERROR("Failed to load resource \"%s\" of type \"%s\": %s", resourceName.c_str(), resourceType.c_str(), e.what());
+    }
 	// Cache
 	m_ResourceCache[std::make_pair(resourceType, resourceName)] = resource;
 	m_ResourceFromName[resourceName] = resource;

src/Engine/Core/World.cpp

@@ -11,12 +11,43 @@ EntityID World::CreateEntity(EntityID parent /*= 0*/)
 {
     EntityID newEntity = generateEntityID();
     m_EntityParents[newEntity] = parent;
-    if (parent != 0) {
-        m_EntityChildren.insert(std::make_pair(parent, newEntity));
-    }
+    m_EntityChildren.insert(std::make_pair(parent, newEntity));
     return newEntity;
 }
 
+
+void World::DeleteEntity(EntityID entity)
+{
+    // Delete components
+    for (auto& pair : m_ComponentPools) {
+        auto& pool = pair.second;
+        if (pool->KnowsEntity(entity)) {
+            auto& c = pool->GetByEntity(entity);
+            pool->Delete(c);
+        }
+    }
+
+    // Loop through children
+    std::vector<EntityID> childrenToDelete;
+    auto children = m_EntityChildren.equal_range(entity);
+    for (auto it = children.first; it != children.second; ++it) {
+        childrenToDelete.push_back(it->second);
+    }
+    for (auto& child : childrenToDelete) {
+        DeleteEntity(child);
+    }
+
+    EntityID parent = m_EntityParents.at(entity);
+    m_EntityParents.erase(entity);
+    auto parentChildren = m_EntityChildren.equal_range(parent);
+    for (auto it = parentChildren.first; it != parentChildren.second; ++it) {
+        if (it->second == entity) {
+            m_EntityChildren.erase(it);
+            break;
+        }
+    }
+}
+
 void World::RegisterComponent(ComponentInfo& ci)
 {
     m_ComponentPools[ci.Name] = new ComponentPool(ci);
@@ -35,12 +66,27 @@ ComponentWrapper World::AttachComponent(EntityID entity, std::string componentTy
     return c;
 }
 
+
+bool World::HasComponent(EntityID entity, std::string componentType)
+{
+    ComponentPool* pool = m_ComponentPools.at(componentType);
+    return pool->KnowsEntity(entity);
+}
+
 ComponentWrapper World::GetComponent(EntityID entity, std::string componentType)
 {
     ComponentPool* pool = m_ComponentPools.at(componentType);
     return pool->GetByEntity(entity);
 }
 
+
+void World::DeleteComponent(EntityID entity, std::string componentType)
+{
+    ComponentPool* pool = m_ComponentPools.at(componentType);
+    ComponentWrapper c = pool->GetByEntity(entity);
+    return pool->Delete(c);
+}
+
 const ComponentPool* World::GetComponents(std::string componentType)
 {
     auto it = m_ComponentPools.find(componentType);
@@ -53,6 +99,22 @@ EntityID World::GetParent(EntityID entity)
     return m_EntityParents.at(entity);
 }
 
+
+void World::SetParent(EntityID entity, EntityID parent)
+{
+    EntityID lastParent = m_EntityParents.at(entity);
+    auto parentChildren = m_EntityChildren.equal_range(lastParent);
+    for (auto it = parentChildren.first; it != parentChildren.second; it++) {
+        if (it->second == entity) {
+            m_EntityChildren.erase(it);
+            break;
+        }
+    }
+
+    m_EntityParents[entity] = parent;
+    m_EntityChildren.insert(std::make_pair(parent, entity));
+}
+
 EntityID World::generateEntityID()
 {
     // TODO: Make EntityID generation smarter

src/Engine/Editor/EditorSystem.cpp

@@ -0,0 +1,596 @@
+#include "Editor/EditorSystem.h"
+#define IMGUI_DEFINE_MATH_OPERATORS
+#include <imgui/imgui_internal.h>
+
+EditorSystem::EditorSystem(EventBroker* eventBroker, IRenderer* renderer) 
+    : ImpureSystem(eventBroker)
+    , m_Renderer(renderer)
+{
+    auto config = ResourceManager::Load<ConfigFile>("Config.ini");
+    m_Enabled = config->Get<bool>("Debug.EditorEnabled", false);
+    m_Visible = m_Enabled;
+
+    if (!m_Enabled) {
+        return;
+    }
+
+    EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &EditorSystem::OnInputCommand);
+    EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &EditorSystem::OnMousePress);
+    EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &EditorSystem::OnMouseRelease);
+    EVENT_SUBSCRIBE_MEMBER(m_EMouseMove, &EditorSystem::OnMouseMove);
+    EVENT_SUBSCRIBE_MEMBER(m_EPicking, &EditorSystem::OnPicking);
+    EVENT_SUBSCRIBE_MEMBER(m_EFileDropped, &EditorSystem::OnFileDropped);
+}
+
+void EditorSystem::Update(World* world, double dt)
+{
+    m_World = world;
+
+    if (!m_Enabled) {
+        return;
+    }
+
+    if (!m_Visible) {
+        return;
+    }
+
+    updateWidget();
+
+    drawUI(world, dt);
+
+    // Clear drop queue if it wasn't handled by any UI element
+    if (!m_LastDroppedFile.empty()) {
+        m_LastDroppedFile = "";
+    }
+}
+
+bool EditorSystem::OnInputCommand(const Events::InputCommand& e)
+{
+    if (e.Command == "ToggleEditor" && e.Value > 0) {
+        m_Visible = !m_Visible;
+    }
+
+    if (e.Command == "EditorToolMove" && e.Value > 0) {
+        setWidgetMode(WidgetMode::Translate);
+    }
+    if (e.Command == "EditorToolRotate" && e.Value > 0) {
+        setWidgetMode(WidgetMode::Rotate);
+    }
+    if (e.Command == "EditorToolScale" && e.Value > 0) {
+        setWidgetMode(WidgetMode::Scale);
+    }
+
+    if (e.Command == "EditorToggleTransformSpace" && e.Value > 0) {
+        if (m_WidgetSpace == WidgetSpace::Global) {
+            setWidgetSpace(WidgetSpace::Local);
+        } else if (m_WidgetSpace == WidgetSpace::Local) {
+            setWidgetSpace(WidgetSpace::Global);
+        }
+    }
+
+    return true;
+}
+
+bool EditorSystem::OnMousePress(const Events::MousePress& e)
+{
+    if (e.Button == GLFW_MOUSE_BUTTON_RIGHT) {
+        m_PickingQueue.push_back(glm::vec2((int)e.X, (int)e.Y));
+    }
+    return true;
+}
+
+bool EditorSystem::OnMouseMove(const Events::MouseMove& e)
+{
+    if (m_Widget == 0) {
+        return false;
+    }
+
+    if (m_Selection == 0) {
+        return false;
+    }
+    auto widgetTransform = m_World->GetComponent(m_Widget, "Transform");
+    glm::vec3 widgetOrientation = widgetTransform["Orientation"];
+
+    glm::quat  totalOrientation = m_Renderer->Camera()->Orientation() * glm::inverse(glm::quat(widgetOrientation));
+
+    int width;
+    int height;
+    glfwGetFramebufferSize(m_Renderer->Window(), &width, &height);
+    Rectangle res(width, height);
+
+    glm::vec2 delta2(res.Width / 2.f + e.DeltaX, res.Height / 2.f + -e.DeltaY);
+    glm::vec3 deltaWorld = ScreenCoords::ToWorldPos(
+        delta2,
+        m_WidgetPickingDepth,
+        res,
+        m_Renderer->Camera()->ProjectionMatrix(),
+        glm::toMat4(glm::inverse(totalOrientation))
+    );
+    glm::vec3 origin = ScreenCoords::ToWorldPos(
+        glm::vec2(res.Width / 2.f, res.Height / 2.f),
+        m_WidgetPickingDepth,
+        res,
+        m_Renderer->Camera()->ProjectionMatrix(),
+        glm::toMat4(glm::inverse(totalOrientation))
+    );
+    deltaWorld = deltaWorld - origin;
+    glm::vec3 movement = deltaWorld * m_WidgetCurrentAxis;
+
+    if (glm::length2(m_WidgetCurrentAxis) > 0.f) {
+        auto widgetTransform = m_World->GetComponent(m_Widget, "Transform");
+        if (m_WidgetMode == WidgetMode::Translate) {
+            if (m_WidgetSpace == WidgetSpace::Global) {
+                EntityID parent = m_World->GetParent(m_Selection);
+                glm::quat inverseParentOrientation;
+                if (parent != 0) {
+                    inverseParentOrientation = glm::inverse(RenderQueueFactory::AbsoluteOrientation(m_World, parent));
+                }
+                (glm::vec3&)m_World->GetComponent(m_Selection, "Transform")["Position"] += inverseParentOrientation * movement;
+            } else if (m_WidgetSpace == WidgetSpace::Local) {
+                auto selectionTransform = m_World->GetComponent(m_Selection, "Transform");
+                (glm::vec3&)selectionTransform["Position"] += glm::quat((glm::vec3)selectionTransform["Orientation"]) * movement;
+            }
+        } else if (m_WidgetMode == WidgetMode::Rotate) {
+            glm::vec3 finalMovement;
+            finalMovement.x = -deltaWorld.y * m_WidgetCurrentAxis.x;
+            finalMovement.y = deltaWorld.x * m_WidgetCurrentAxis.y;
+            finalMovement.z = deltaWorld.y * m_WidgetCurrentAxis.z;
+            if (m_WidgetSpace == WidgetSpace::Global) {
+                EntityID parent = m_World->GetParent(m_Selection);
+                glm::quat parentOrientation;
+                if (parent != 0) {
+                    parentOrientation = RenderQueueFactory::AbsoluteOrientation(m_World, parent);
+                }
+                glm::vec3& selectionOrientation = m_World->GetComponent(m_Selection, "Transform")["Orientation"];
+                //glm::quat currentOrientation = RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection);
+                glm::quat currentOrientation = parentOrientation * glm::quat(selectionOrientation);
+                glm::quat deltaOrientation(finalMovement);
+                selectionOrientation = glm::eulerAngles(glm::inverse(parentOrientation) * (deltaOrientation * currentOrientation));
+            } else if (m_WidgetSpace == WidgetSpace::Local) {
+                glm::vec3& selectionOrientation = m_World->GetComponent(m_Selection, "Transform")["Orientation"];
+                glm::quat currentOrientation(selectionOrientation);
+                glm::quat deltaOrientation(finalMovement);
+                selectionOrientation = glm::eulerAngles(currentOrientation * deltaOrientation);
+            }
+        } else if (m_WidgetMode == WidgetMode::Scale) {
+            glm::vec3& scaleX = m_World->GetComponent(m_WidgetX, "Transform")["Scale"];
+            glm::vec3& scaleY = m_World->GetComponent(m_WidgetY, "Transform")["Scale"];
+            glm::vec3& scaleZ = m_World->GetComponent(m_WidgetZ, "Transform")["Scale"];
+
+            if (m_WidgetCurrentAxis.x > 0 && m_WidgetCurrentAxis.y > 0 && m_WidgetCurrentAxis.z > 0) {
+                float movementLength = glm::length(movement);
+                float dot = glm::dot((glm::vec3)widgetOrientation, movement);
+                movement = glm::vec3(movementLength) * glm::sign(dot);
+                (glm::vec3&)m_World->GetComponent(m_WidgetOrigin, "Transform")["Scale"] += movement;
+            }
+            if (m_WidgetCurrentAxis.x > 0) {
+                scaleX.x += movement.x;
+            }
+            if (m_WidgetCurrentAxis.y > 0) {
+                scaleY.y += movement.y;
+            }
+            if (m_WidgetCurrentAxis.z > 0) {
+                scaleZ.z += movement.z;
+            }
+            (glm::vec3&)m_World->GetComponent(m_Selection, "Transform")["Scale"] += movement;
+        }
+    }
+
+
+    /*LOG_DEBUG("DELTA %f", e.DeltaX);
+    if (e.X < 0) {
+        glfwSetCursorPos(m_Renderer->Window(), width - 1, e.Y);
+    }
+    if (e.X >= width) {
+        glfwSetCursorPos(m_Renderer->Window(), 0, e.Y);
+    }*/
+
+    return true;
+}
+
+bool EditorSystem::OnMouseRelease(const Events::MouseRelease& e)
+{
+    if (glm::length2(m_WidgetCurrentAxis) > 0.f) {
+        m_WidgetCurrentAxis = glm::vec3(0.f);
+        //setWidgetMode(m_WidgetMode);
+    }
+
+    return true;
+}
+
+bool EditorSystem::OnPicking(const Events::Picking& e)
+{
+    for (auto& pos : m_PickingQueue) {
+        auto result = e.Pick(pos);
+        EntityID entity = result.Entity;
+        if (glm::length2(m_WidgetCurrentAxis) > 0.f) {
+        } else {
+            LOG_INFO("Selected %i", entity);
+            if (entity != 0) {
+                EntityID parent = m_World->GetParent(entity);
+                if (parent == m_Widget) {
+                    m_WidgetCurrentAxis = glm::vec3(
+                        (entity == m_WidgetX) || (entity == m_WidgetOrigin) || (entity == m_WidgetPlaneY || entity == m_WidgetPlaneZ),
+                        (entity == m_WidgetY) || (entity == m_WidgetOrigin) || (entity == m_WidgetPlaneX || entity == m_WidgetPlaneZ),
+                        (entity == m_WidgetZ) || (entity == m_WidgetOrigin) || (entity == m_WidgetPlaneX || entity == m_WidgetPlaneY)
+                    );
+                    m_WidgetPickingDepth = result.Depth;
+
+                    //auto widgetTransform = m_World->GetComponent(m_Widget, "Transform");
+                    //auto selectionTransform = m_World->GetComponent(m_Selection, "Transform");
+                    //widgetTransform["Position"] = (glm::vec3)selectionTransform["Position"];
+                } else {
+                    ImGui::SetActiveID(0, nullptr);
+                    m_Selection = entity;
+                    setWidgetMode(m_WidgetMode);
+                }
+            } else {
+                m_Selection = 0;
+            }
+        }
+    }
+    m_PickingQueue.clear();
+    return true;
+};
+
+bool EditorSystem::OnFileDropped(const Events::FileDropped& e)
+{
+    m_LastDroppedFile = boost::filesystem::path(e.Path).lexically_relative(boost::filesystem::current_path()).string();
+    std::replace(m_LastDroppedFile.begin(), m_LastDroppedFile.end(), '\\', '/');
+    return true;
+}
+
+void EditorSystem::updateWidget()
+{
+    if (m_Widget == 0) {
+        m_Widget = m_World->CreateEntity();
+        m_World->AttachComponent(m_Widget, "Transform");
+        m_WidgetX = m_World->CreateEntity(m_Widget);
+        m_World->AttachComponent(m_WidgetX, "Transform");
+        m_World->AttachComponent(m_WidgetX, "Model");
+        m_WidgetPlaneX = m_World->CreateEntity(m_Widget);
+        m_World->AttachComponent(m_WidgetPlaneX, "Transform");
+        m_World->AttachComponent(m_WidgetPlaneX, "Model");
+        m_World->GetComponent(m_WidgetPlaneX, "Model")["Resource"] = "Models/WidgetPlaneX.obj";
+        m_WidgetY = m_World->CreateEntity(m_Widget);
+        m_World->AttachComponent(m_WidgetY, "Transform");
+        m_World->AttachComponent(m_WidgetY, "Model");
+        m_WidgetPlaneY = m_World->CreateEntity(m_Widget);
+        m_World->AttachComponent(m_WidgetPlaneY, "Transform");
+        m_World->AttachComponent(m_WidgetPlaneY, "Model");
+        m_World->GetComponent(m_WidgetPlaneY, "Model")["Resource"] = "Models/WidgetPlaneY.obj";
+        m_WidgetZ = m_World->CreateEntity(m_Widget);
+        m_World->AttachComponent(m_WidgetZ, "Transform");
+        m_World->AttachComponent(m_WidgetZ, "Model");
+        m_WidgetPlaneZ = m_World->CreateEntity(m_Widget);
+        m_World->AttachComponent(m_WidgetPlaneZ, "Transform");
+        m_World->AttachComponent(m_WidgetPlaneZ, "Model");
+        m_World->GetComponent(m_WidgetPlaneZ, "Model")["Resource"] = "Models/WidgetPlaneZ.obj";
+        m_WidgetOrigin = m_World->CreateEntity(m_Widget);
+        m_World->AttachComponent(m_WidgetOrigin, "Transform");
+        m_World->AttachComponent(m_WidgetOrigin, "Model");
+        setWidgetMode(WidgetMode::Translate);
+    }
+
+    if (m_Selection != 0) {
+        auto widgetTransform = m_World->GetComponent(m_Widget, "Transform");
+        glm::vec3 selectionPosition = RenderQueueFactory::AbsolutePosition(m_World, m_Selection);
+        widgetTransform["Position"] = selectionPosition;
+        if (m_WidgetSpace == WidgetSpace::Local) {
+            widgetTransform["Orientation"] = glm::eulerAngles(RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection));
+        }
+    }
+}
+
+void EditorSystem::setWidgetMode(WidgetMode newMode)
+{
+    if (m_Widget == 0) {
+        return;
+    }
+
+    auto widgetTransform = m_World->GetComponent(m_Widget, "Transform");
+    widgetTransform["Orientation"] = glm::vec3(0.f);
+    m_World->GetComponent(m_WidgetX, "Transform")["Scale"] = glm::vec3(1.f);
+    m_World->GetComponent(m_WidgetPlaneX, "Model")["Visible"] = false;
+    m_World->GetComponent(m_WidgetY, "Transform")["Scale"] = glm::vec3(1.f);
+    m_World->GetComponent(m_WidgetPlaneY, "Model")["Visible"] = false;
+    m_World->GetComponent(m_WidgetZ, "Transform")["Scale"] = glm::vec3(1.f);
+    m_World->GetComponent(m_WidgetPlaneZ, "Model")["Visible"] = false;
+    m_World->GetComponent(m_WidgetOrigin, "Transform")["Scale"] = glm::vec3(1.f);
+    m_World->GetComponent(m_WidgetOrigin, "Model")["Visible"] = false;
+
+    if (newMode == WidgetMode::Translate) {
+        m_World->GetComponent(m_WidgetX, "Model")["Resource"] = "Models/TranslationWidgetX.obj";
+        m_World->GetComponent(m_WidgetY, "Model")["Resource"] = "Models/TranslationWidgetY.obj";
+        m_World->GetComponent(m_WidgetZ, "Model")["Resource"] = "Models/TranslationWidgetZ.obj";
+        // Temporarily disabled for local space until I can figure out what's wrong with the math 
+        if (m_WidgetSpace != WidgetSpace::Local) {
+            m_World->GetComponent(m_WidgetPlaneX, "Model")["Visible"] = true;
+            m_World->GetComponent(m_WidgetPlaneY, "Model")["Visible"] = true;
+            m_World->GetComponent(m_WidgetPlaneZ, "Model")["Visible"] = true;
+        }
+        if (m_Selection != 0) {
+            if (m_WidgetSpace == WidgetSpace::Local) {
+                auto selectionTransform = m_World->GetComponent(m_Selection, "Transform");
+                widgetTransform["Orientation"] = glm::eulerAngles(RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection));
+            }
+        }
+    } else if (newMode == WidgetMode::Scale) {
+        m_World->GetComponent(m_WidgetX, "Model")["Resource"] = "Models/ScaleWidgetX.obj";
+        m_World->GetComponent(m_WidgetY, "Model")["Resource"] = "Models/ScaleWidgetY.obj";
+        m_World->GetComponent(m_WidgetZ, "Model")["Resource"] = "Models/ScaleWidgetZ.obj";
+        m_World->GetComponent(m_WidgetOrigin, "Model")["Visible"] = true;
+        m_World->GetComponent(m_WidgetOrigin, "Model")["Resource"] = "Models/ScaleWidgetOrigin.obj";
+        if (m_Selection != 0) {
+            auto selectionTransform = m_World->GetComponent(m_Selection, "Transform");
+            widgetTransform["Orientation"] = glm::eulerAngles(RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection));
+        }
+    } else if (newMode == WidgetMode::Rotate) {
+        m_World->GetComponent(m_WidgetX, "Model")["Resource"] = "Models/RotationWidgetX.obj";
+        m_World->GetComponent(m_WidgetY, "Model")["Resource"] = "Models/RotationWidgetY.obj";
+        m_World->GetComponent(m_WidgetZ, "Model")["Resource"] = "Models/RotationWidgetZ.obj";
+        if (m_Selection != 0) {
+            auto selectionTransform = m_World->GetComponent(m_Selection, "Transform");
+            if (m_WidgetSpace == WidgetSpace::Local) {
+                widgetTransform["Orientation"] = glm::eulerAngles(RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection));
+            }
+        }
+    }
+    m_WidgetMode = newMode;
+}
+
+
+void EditorSystem::setWidgetSpace(WidgetSpace space)
+{
+    m_WidgetSpace = space;
+    setWidgetMode(m_WidgetMode);
+}
+
+void EditorSystem::drawUI(World* world, double dt)
+{
+    ImGui::ShowTestWindow();
+    //ImGui::ShowStyleEditor();
+
+    if (ImGui::BeginMainMenuBar()) {
+        if (ImGui::BeginMenu("File")) {
+
+            if (ImGui::MenuItem("New")) { }
+            if (ImGui::MenuItem("Open", "Ctrl+O")) { }
+            if (ImGui::MenuItem("Save", "Ctrl+S")) { }
+            if (ImGui::MenuItem("Save As...", "Ctrl+Shift+S")) { }
+            ImGui::Separator();
+            if (ImGui::MenuItem("Close Editor", "F1")) { }
+
+            ImGui::EndMenu();
+        }
+
+        ImGui::SameLine();
+        if (ImGui::Button("Move")) {
+            setWidgetMode(WidgetMode::Translate);
+        }
+        ImGui::SameLine();
+        if (ImGui::Button("Rotate")) {
+            setWidgetMode(WidgetMode::Rotate);
+        }
+        ImGui::SameLine();
+        if (ImGui::Button("Scale")) {
+            setWidgetMode(WidgetMode::Scale);
+        }
+        ImGui::SameLine();
+        if (m_WidgetSpace == WidgetSpace::Global) {
+            if (ImGui::Button("(Global)")) {
+                setWidgetSpace(WidgetSpace::Local);
+            }
+        } else if (m_WidgetSpace == WidgetSpace::Local) {
+            if (ImGui::Button("(Local)")) {
+                setWidgetSpace(WidgetSpace::Global);
+            }
+        }
+
+        ImGui::EndMainMenuBar();
+    }
+
+    std::string title = std::string("Components #") + std::to_string(m_Selection) + std::string("###Components");
+    if (ImGui::Begin(title.c_str())) {
+        if (m_Selection != 0) {
+            auto& pools = world->GetComponentPools();
+
+            std::vector<const char*> componentTypes;
+            for (auto& pair : pools) {
+                // Only add components the entity doesn't already have
+                if (!pair.second->KnowsEntity(m_Selection)) {
+                    componentTypes.push_back(pair.first.c_str());
+                }
+            }
+            int item = -1;
+            ImGui::PushItemWidth(ImGui::GetWindowContentRegionWidth() - 5.f);
+            if (ImGui::Combo("", &item, componentTypes.data(), componentTypes.size())) {
+                if (item != -1) {
+                    std::string chosenType = std::string(componentTypes.at(item));
+                    world->AttachComponent(m_Selection, chosenType);
+                }
+            }
+            ImGui::PopItemWidth();
+
+            for (auto& pair : pools) {
+                const std::string& componentType = pair.first;
+                auto pool = pair.second;
+                if (!pool->KnowsEntity(m_Selection)) {
+                    continue;
+                }
+                auto& ci = pool->ComponentInfo();
+
+                bool deletePressed = createDeleteButton(componentType);
+                if (deletePressed) {
+                    world->DeleteComponent(m_Selection, componentType);
+                    continue;
+                }
+
+                if (ImGui::CollapsingHeader(componentType.c_str())) {
+                    if (!ci.Meta.Annotation.empty()) {
+                        ImGui::Text(ci.Meta.Annotation.c_str());
+                    }
+
+                    auto& component = world->GetComponent(m_Selection, componentType);
+                    for (auto& pair : ci.FieldTypes) {
+                        const std::string& field = pair.first;
+                        const std::string& type = pair.second;
+                        
+                        ImGui::PushID(field.c_str());
+                        if (type == "Vector") {
+                            auto& val = component.Property<glm::vec3>(field);
+                            if (field == "Scale") {
+                                ImGui::DragFloat3("", glm::value_ptr(val), 0.1f, 0.f, std::numeric_limits<float>::max());
+                            } else if (field == "Orientation") {
+                                glm::vec3 tempVal = glm::fmod(val, glm::vec3(glm::two_pi<float>()));
+                                if (ImGui::SliderFloat3("", glm::value_ptr(tempVal), 0.f, glm::two_pi<float>())) {
+                                    val = tempVal;
+                                }
+                            } else {
+                                ImGui::DragFloat3("", glm::value_ptr(val), 0.1f, std::numeric_limits<float>::lowest(), std::numeric_limits<float>::max());
+                            }
+                        } else if (type == "Color") {
+                            auto& val = component.Property<glm::vec4>(field);
+                            ImGui::ColorEdit4("", glm::value_ptr(val), true);
+                        } else if (type == "string") {
+                            std::string& val = component.Property<std::string>(field);
+                            char tempString[1024];
+                            memcpy(tempString, val.c_str(), std::min(val.length() + 1, sizeof(tempString)));
+                            if (ImGui::InputText("", tempString, sizeof(tempString))) {
+                                val = std::string(tempString);
+                                LOG_DEBUG("%s::%s changed!", componentType.c_str(), field.c_str());
+                            }
+                            // DROP STUFF
+                            if (ImGui::IsItemHovered() && !m_LastDroppedFile.empty()) {
+                                val = m_LastDroppedFile;
+                                m_LastDroppedFile = "";
+                            }
+
+                        } else if (type == "double") {
+                            float tempVal = static_cast<float>(component.Property<double>(field));
+                            if (ImGui::InputFloat("", &tempVal, 0.01f, 1.f)) {
+                                component.SetProperty(field, static_cast<double>(tempVal));
+                            }
+                        } else if (type == "bool") {
+                            auto& val = component.Property<bool>(field);
+                            ImGui::Checkbox("", &val);
+                        } else {
+                            ImGui::TextDisabled(type.c_str());
+                        }
+                        ImGui::PopID();
+
+                        ImGui::SameLine();
+                        ImGui::Text(field.c_str());
+                        if (ImGui::IsItemHovered()) {
+                            ImGui::SetTooltip("field annotation goes here");
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+    ImGui::End();
+
+    if (ImGui::Begin("Entitites")) {
+        static EntityID draggingEntity = 0;
+        auto entityChildren = world->GetEntityChildren();
+        std::function<void(EntityID)> recurse = [&](EntityID parent) {
+            auto range = entityChildren.equal_range(parent);
+            for (auto it = range.first; it != range.second; it++) {
+
+                ImVec2 pos = ImGui::GetCursorScreenPos();
+                float width = ImGui::GetContentRegionAvailWidth();
+                ImRect bb(pos + ImVec2(20, 0), pos + ImVec2(width, 13));
+                auto window = ImGui::GetCurrentWindow();
+                if (m_Selection == it->second) {
+                    const ImU32 col = window->Color(ImGuiCol_HeaderActive);
+                    window->DrawList->AddRectFilled(bb.Min, bb.Max, col);
+                }
+                ImGuiID id = window->GetID((std::string("#SelectButton") + std::to_string(it->second)).c_str());
+                bool hovered = false;
+                bool held = false;
+                if (ImGui::ButtonBehavior(bb, id, &hovered, &held)) {
+                    m_Selection = it->second;
+                }
+                if (held) {
+                    ImVec2 entityDragDelta = ImGui::GetMouseDragDelta(0);
+                    if (std::abs(entityDragDelta.x) > 0 && std::abs(entityDragDelta.y) > 0) {
+                        if (draggingEntity == 0) {
+                            draggingEntity = it->second;
+                            LOG_DEBUG("Started drag of entity %i", draggingEntity);
+                        }
+                        ImGui::SetNextWindowPos(ImGui::GetIO().MousePos + ImVec2(20, 0));
+                        ImGui::Begin("Change parent", nullptr, ImVec2(0, 0), 0.3f, ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoSavedSettings);
+                        ImGui::Text("#%i", draggingEntity);
+                        ImGui::End();
+                    }
+                }
+
+                ImGui::SetNextTreeNodeOpened(true, ImGuiSetCond_Once);
+                if (ImGui::TreeNode((std::string("#") + std::to_string(it->second)).c_str())) {
+                    if (draggingEntity != 0 && ImGui::IsItemHoveredRect() && ImGui::IsMouseReleased(0)) {
+                        LOG_DEBUG("Changed parent of %i to %i", draggingEntity, it->second);
+                        changeParent(draggingEntity, it->second);
+                        draggingEntity = 0;
+                    }
+
+                    if (ImGui::BeginPopupContextItem("item context menu")) {
+                        if (ImGui::Button("Add")) {
+                            EntityID entity = world->CreateEntity(it->second);
+                            world->AttachComponent(entity, "Transform");
+                        }
+                        ImGui::SameLine();
+                        if (ImGui::Button("Delete")) {
+                            world->DeleteEntity(it->second);
+                            ImGui::CloseCurrentPopup();
+                            if (m_Selection == it->second) {
+                                m_Selection = 0;
+                            }
+                        }
+                        ImGui::EndPopup();
+                    }
+                    recurse(it->second);
+                    ImGui::TreePop();
+                }
+            }
+        };
+        recurse(0);
+    }
+    ImGui::End();
+}
+
+bool EditorSystem::createDeleteButton(std::string componentType)
+{
+    float width = ImGui::GetContentRegionAvailWidth();
+    ImGuiWindow* window = ImGui::GetCurrentWindow();
+    auto pos = ImGui::GetCursorScreenPos() + ImVec2(width - 14.f, 1);
+    ImRect bb = ImRect(pos, pos + ImVec2(14.f, 14.f));
+    std::string idString = "#DELETE";
+    idString += componentType;
+    ImGuiID id = window->GetID(idString.c_str());
+    bool hovered;
+    bool held;
+    bool pressed = ImGui::ButtonBehavior(bb, id, &hovered, &held);
+    //ImU32 col = window->Color((held && hovered) ? ImGuiCol_CloseButtonActive : hovered ? ImGuiCol_CloseButtonHovered : ImGuiCol_CloseButton);
+    ImU32 col = window->Color((held && hovered) ? ImGuiCol_CloseButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button);
+    window->DrawList->AddCircleFilled(bb.GetCenter(), 7.f, col, 16);
+    return pressed;
+}
+
+void EditorSystem::changeParent(EntityID entity, EntityID newParent)
+{
+    if (entity == newParent) {
+        return;
+    }
+
+    // An entity can't be a child to one of its own children
+    auto children = m_World->GetEntityChildren().equal_range(entity);
+    for (auto it = children.first; it != children.second; it++) {
+        if (it->second == newParent) {
+            return;
+        }
+    }
+
+    m_World->SetParent(entity, newParent);
+}

src/Engine/Input/InputProxy.cpp

@@ -1,221 +1,112 @@
 #include "Input/InputProxy.h"
-#include "Core/World.h"
+#include "Input/InputHandler.h"
 
-//InputProxy::InputProxy(EventBroker* eventBroker)
-//    : m_EventBroker(eventBroker)
-//{
-//	// Subscribe to events
-//	EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &InputProxy::OnMousePress);
-//	EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &InputProxy::OnMouseRelease);
-//	EVENT_SUBSCRIBE_MEMBER(m_EGamepadAxis, &InputProxy::OnGamepadAxis);
-//	EVENT_SUBSCRIBE_MEMBER(m_EGamepadButtonDown, &InputProxy::OnGamepadButtonDown);
-//	EVENT_SUBSCRIBE_MEMBER(m_EGamepadButtonUp, &InputProxy::OnGamepadButtonUp);
-//	EVENT_SUBSCRIBE_MEMBER(m_EBindKey, &InputProxy::OnBindKey);
-//	EVENT_SUBSCRIBE_MEMBER(m_EBindMouseButton, &InputProxy::OnBindMouseButton);
-//	EVENT_SUBSCRIBE_MEMBER(m_EBindGamepadAxis, &InputProxy::OnBindGamepadAxis);
-//	EVENT_SUBSCRIBE_MEMBER(m_EBindGamepadButton, &InputProxy::OnBindGamepadButton);
-//    
-//    SteamController()->Init();
-//    
-//}
-//
-//void InputProxy::Update(double dt)
-//{
-//    std::array<ControllerHandle_t, STEAM_CONTROLLER_MAX_COUNT> controllers;
-//    int numControllers = SteamController()->GetConnectedControllers(controllers.data());
-//
-//    ControllerDigitalActionHandle_t debug_reload_handle = SteamController()->GetDigitalActionHandle("debug_reload");
-//    SteamController()->
-//}
-//
-//bool InputProxy::OnKeyDown(const Events::KeyDown &event)
-//{
-//	auto range = m_KeyBindings.equal_range(event.KeyCode);
-//	for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) {
-//		std::string command;
-//		float value;
-//		std::tie(command, value) = bindingIt->second;
-//		m_CommandKeyboardValues[command][event.KeyCode] = value;
-//		PublishCommand(1, command, GetCommandTotalValue(command));
-//	}
-//
-//	return true;
-//}
-//
-//bool InputProxy::OnKeyUp(const Events::KeyUp &event)
-//{
-//	auto range = m_KeyBindings.equal_range(event.KeyCode);
-//	for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) {
-//		std::string command;
-//		float value;
-//		std::tie(command, value) = bindingIt->second;
-//		m_CommandKeyboardValues[command][event.KeyCode] = 0;
-//		PublishCommand(1, command, GetCommandTotalValue(command));;
-//	}
-//
-//	return true;
-//}
-//
-//bool InputProxy::OnMousePress(const Events::MousePress &event)
-//{
-//	auto range = m_MouseButtonBindings.equal_range(event.Button);
-//	for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) {
-//		std::string command;
-//		float value;
-//		std::tie(command, value) = bindingIt->second;
-//		m_CommandMouseButtonValues[command][event.Button] = value;
-//		PublishCommand(1, command, GetCommandTotalValue(command));
-//	}
-//
-//	return true;
-//}
-//
-//bool InputProxy::OnMouseRelease(const Events::MouseRelease &event)
-//{
-//	auto range = m_MouseButtonBindings.equal_range(event.Button);
-//	for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) {
-//		std::string command;
-//		float value;
-//		std::tie(command, value) = bindingIt->second;
-//		m_CommandMouseButtonValues[command][event.Button] = 0;
-//		PublishCommand(1, command, GetCommandTotalValue(command));
-//	}
-//
-//	return true;
-//}
-//
-//bool InputProxy::OnGamepadAxis(const Events::GamepadAxis &event)
-//{
-//	auto range = m_GamepadAxisBindings.equal_range(event.Axis);
-//	for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) {
-//		std::string command;
-//		float value;
-//		std::tie(command, value) = bindingIt->second;
-//		m_CommandGamepadAxisValues[command][event.Axis] = event.Value * value;
-//		PublishCommand(event.GamepadID + 1, command, GetCommandTotalValue(command));
-//	}
-//
-//	return true;
-//}
-//
-//bool InputProxy::OnGamepadButtonDown(const Events::GamepadButtonDown &event)
-//{
-//	auto range = m_GamepadButtonBindings.equal_range(event.Button);
-//	for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) {
-//		std::string command;
-//		float value;
-//		std::tie(command, value) = bindingIt->second;
-//		m_CommandGamepadButtonValues[command][event.Button] = value;
-//		PublishCommand(event.GamepadID + 1, command, GetCommandTotalValue(command));
-//	}
-//
-//	return true;
-//}
-//
-//bool InputProxy::OnGamepadButtonUp(const Events::GamepadButtonUp &event)
-//{
-//	auto range = m_GamepadButtonBindings.equal_range(event.Button);
-//	for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) {
-//		std::string command;
-//		float value;
-//		std::tie(command, value) = bindingIt->second;
-//		m_CommandGamepadButtonValues[command][event.Button] = 0;
-//		PublishCommand(event.GamepadID + 1, command, GetCommandTotalValue(command));
-//	}
-//
-//	return true;
-//}
-//
-//bool InputProxy::OnBindKey(const Events::BindKey &event)
-//{
-//	if (event.Command.empty()) {
-//		return false;
-//	}
-//
-//	m_KeyBindings.insert(std::make_pair(event.KeyCode, std::make_tuple(event.Command, event.Value)));
-//	LOG_DEBUG("Input: Bound key %i to %s", event.KeyCode, event.Command.c_str());
-//
-//	return true;
-//}
-//
-//bool InputProxy::OnBindMouseButton(const Events::BindMouseButton &event)
-//{
-//	if (event.Command.empty()) {
-//		return false;
-//	}
-//
-//	m_MouseButtonBindings.insert(std::make_pair(event.Button, std::make_tuple(event.Command, event.Value)));
-//	LOG_DEBUG("Input: Bound mouse button %i to %s", event.Button, event.Command.c_str());
-//
-//	return true;
-//}
-//
-//bool InputProxy::OnBindGamepadAxis(const Events::BindGamepadAxis &event)
-//{
-//	if (event.Command.empty()) {
-//		return false;
-//	}
-//
-//	m_GamepadAxisBindings.insert(std::make_pair(event.Axis, std::make_tuple(event.Command, event.Value)));
-//	LOG_DEBUG("Input: Bound gamepad axis %i to %s", event.Axis, event.Command.c_str());
-//
-//	return true;
-//}
-//
-//bool InputProxy::OnBindGamepadButton(const Events::BindGamepadButton &event)
-//{
-//	if (event.Command.empty()) {
-//		return false;
-//	}
-//
-//	m_GamepadButtonBindings.insert(std::make_pair(event.Button, std::make_tuple(event.Command, event.Value)));
-//	LOG_DEBUG("Input: Bound gamepad axis %i to %s", event.Button, event.Command.c_str());
-//
-//	return true;
-//}
-//
-//float InputProxy::GetCommandTotalValue(std::string command)
-//{
-//	float value = 0.f;
-//
-//	auto keyboardIt = m_CommandKeyboardValues.find(command);
-//	if (keyboardIt != m_CommandKeyboardValues.end()) {
-//		for (auto &key : keyboardIt->second) {
-//			value += key.second;
-//		}
-//	}
-//
-//	auto mouseButtonIt = m_CommandMouseButtonValues.find(command);
-//	if (mouseButtonIt != m_CommandMouseButtonValues.end()) {
-//		for (auto &button : mouseButtonIt->second) {
-//			value += button.second;
-//		}
-//	}
-//
-//	auto gamepadAxisIt = m_CommandGamepadAxisValues.find(command);
-//	if (gamepadAxisIt != m_CommandGamepadAxisValues.end()) {
-//		for (auto &axis : gamepadAxisIt->second) {
-//			value += axis.second;
-//		}
-//	}
-//
-//	auto gamepadButtonIt = m_CommandGamepadButtonValues.find(command);
-//	if (gamepadButtonIt != m_CommandGamepadButtonValues.end()) {
-//		for (auto &button : gamepadButtonIt->second) {
-//			value += button.second;
-//		}
-//	}
-//
-//	return std::max(-1.f, std::min(value, 1.f));
-//}
-//
-//void InputProxy::PublishCommand(int playerID, std::string command, float value)
-//{
-//	Events::InputCommand e;
-//	e.PlayerID = playerID;
-//	e.Command = command;
-//	e.Value = value;
-//	m_EventBroker->Publish(e);
-//
-//	LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, playerID);
-//}
+InputProxy::InputProxy(EventBroker* eventBroker) 
+    : m_EventBroker(eventBroker)
+{
+    EVENT_SUBSCRIBE_MEMBER(m_EBindOrigin, &InputProxy::OnBindOrigin);
+}
+
+InputProxy::~InputProxy()
+{
+    for (auto& handler : m_Handlers) {
+        delete handler;
+    }
+}
+
+void InputProxy::LoadBindings(std::string file)
+{
+    auto config = ResourceManager::Load<ConfigFile>(file);
+    for (auto& origin : config->GetAll<std::string>("Bindings")) {
+        Events::BindOrigin e;
+        e.Origin = origin.first;
+        e.Command = origin.second;
+        e.Value = 1.f;
+        if (!e.Command.empty()) {
+            char prefix = e.Command.at(0);
+            if (prefix == '+' || prefix == '-') {
+                e.Command = e.Command.substr(1);
+                if (prefix == '-') {
+                    e.Value *= -1.f;
+                }
+            }
+            OnBindOrigin(e);
+        }
+    }
+}
+
+void InputProxy::Update(double dt)
+{
+    m_EventBroker->Process<InputProxy>();
+    m_EventBroker->Process<InputHandler>();
+    for (auto& handler : m_Handlers) {
+        handler->Update(dt);
+    }
+}
+
+void InputProxy::Process()
+{
+    for (auto& pair : m_CommandHandlers) {
+        const std::string& command = pair.first;
+        auto handlers = pair.second;
+        m_CurrentCommandValues[command] = 0.f;
+        for (auto& handler : handlers) {
+            m_CurrentCommandValues[command] += handler->GetCommandValue(command);
+        }
+
+        auto last = m_LastCommandValues.find(command);
+        float currentValue = m_CurrentCommandValues[command];
+        if (last == m_LastCommandValues.end() || last->second != currentValue) {
+            Events::InputCommand e;
+            e.PlayerID = -1;
+            e.Command = command;
+            e.Value = currentValue;
+            m_EventBroker->Publish(e);
+            LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+            m_LastCommandValues[command] = currentValue;
+        }
+    }
+
+    // Accumulate the input values of all unique commands published by input handlers
+    for (auto& pair : m_CommandQueue) {
+        Events::InputCommand e;
+        e.PlayerID = pair.first.first;
+        e.Command = pair.first.second;
+        e.Value = 0;
+        for (auto& value : pair.second) {
+            e.Value += value;
+        }
+        //e.Value = std::max(-1.f, std::min(e.Value, 1.f));
+        m_EventBroker->Publish(e);
+        LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+    }
+    m_CommandQueue.clear();
+}
+
+void InputProxy::Publish(const Events::InputCommand& e)
+{
+    auto key = std::make_pair(e.PlayerID, e.Command);
+    m_CommandQueue[key].push_back(e.Value);
+}
+
+bool InputProxy::OnBindOrigin(const Events::BindOrigin& e)
+{
+    bool originBound = false;
+    for (auto& handler : m_Handlers) {
+        bool result = handler->BindOrigin(e.Origin, e.Command, e.Value);
+        if (result) {
+            m_CommandHandlers[e.Command].insert(handler);
+            m_LastCommandValues[e.Command] = 0.f;
+            if (originBound) {
+                LOG_WARNING("Multiple handlers responded to binding input origin \"%s\"!", e.Origin.c_str());
+            }
+            originBound = true;
+        }
+    }
+
+    if (!originBound) {
+        LOG_ERROR("No input handler responded to binding input origin \"%s\"!", e.Origin.c_str());
+    }
+
+    return originBound;
+}

src/Engine/Input/KeyboardInputHandler.cpp

@@ -0,0 +1,181 @@
+#include "Input/KeyboardInputHandler.h"
+
+KeyboardInputHandler::KeyboardInputHandler(EventBroker* eventBroker, InputProxy* inputProxy) : InputHandler(eventBroker, inputProxy)
+{
+    EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &KeyboardInputHandler::OnKeyDown);
+    EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &KeyboardInputHandler::OnKeyUp);
+
+    m_OriginKeyCodes["Space"] = GLFW_KEY_SPACE;
+    m_OriginKeyCodes["Apostrophe"] = GLFW_KEY_APOSTROPHE;
+    m_OriginKeyCodes["Comma"] = GLFW_KEY_COMMA;
+    m_OriginKeyCodes["Minus"] = GLFW_KEY_MINUS;
+    m_OriginKeyCodes["Period"] = GLFW_KEY_PERIOD;
+    m_OriginKeyCodes["Slash"] = GLFW_KEY_SLASH;
+    m_OriginKeyCodes["0"] = GLFW_KEY_0;
+    m_OriginKeyCodes["1"] = GLFW_KEY_1;
+    m_OriginKeyCodes["2"] = GLFW_KEY_2;
+    m_OriginKeyCodes["3"] = GLFW_KEY_3;
+    m_OriginKeyCodes["4"] = GLFW_KEY_4;
+    m_OriginKeyCodes["5"] = GLFW_KEY_5;
+    m_OriginKeyCodes["6"] = GLFW_KEY_6;
+    m_OriginKeyCodes["7"] = GLFW_KEY_7;
+    m_OriginKeyCodes["8"] = GLFW_KEY_8;
+    m_OriginKeyCodes["9"] = GLFW_KEY_9;
+    m_OriginKeyCodes["Semicolon"] = GLFW_KEY_SEMICOLON;
+    m_OriginKeyCodes["Equal"] = GLFW_KEY_EQUAL;
+    m_OriginKeyCodes["A"] = GLFW_KEY_A;
+    m_OriginKeyCodes["B"] = GLFW_KEY_B;
+    m_OriginKeyCodes["C"] = GLFW_KEY_C;
+    m_OriginKeyCodes["D"] = GLFW_KEY_D;
+    m_OriginKeyCodes["E"] = GLFW_KEY_E;
+    m_OriginKeyCodes["F"] = GLFW_KEY_F;
+    m_OriginKeyCodes["G"] = GLFW_KEY_G;
+    m_OriginKeyCodes["H"] = GLFW_KEY_H;
+    m_OriginKeyCodes["I"] = GLFW_KEY_I;
+    m_OriginKeyCodes["J"] = GLFW_KEY_J;
+    m_OriginKeyCodes["K"] = GLFW_KEY_K;
+    m_OriginKeyCodes["L"] = GLFW_KEY_L;
+    m_OriginKeyCodes["M"] = GLFW_KEY_M;
+    m_OriginKeyCodes["N"] = GLFW_KEY_N;
+    m_OriginKeyCodes["O"] = GLFW_KEY_O;
+    m_OriginKeyCodes["P"] = GLFW_KEY_P;
+    m_OriginKeyCodes["Q"] = GLFW_KEY_Q;
+    m_OriginKeyCodes["R"] = GLFW_KEY_R;
+    m_OriginKeyCodes["S"] = GLFW_KEY_S;
+    m_OriginKeyCodes["T"] = GLFW_KEY_T;
+    m_OriginKeyCodes["U"] = GLFW_KEY_U;
+    m_OriginKeyCodes["V"] = GLFW_KEY_V;
+    m_OriginKeyCodes["W"] = GLFW_KEY_W;
+    m_OriginKeyCodes["X"] = GLFW_KEY_X;
+    m_OriginKeyCodes["Y"] = GLFW_KEY_Y;
+    m_OriginKeyCodes["Z"] = GLFW_KEY_Z;
+    m_OriginKeyCodes["LeftBracket"] = GLFW_KEY_LEFT_BRACKET;
+    m_OriginKeyCodes["Backslash"] = GLFW_KEY_BACKSLASH;
+    m_OriginKeyCodes["RightBracket"] = GLFW_KEY_RIGHT_BRACKET;
+    m_OriginKeyCodes["Accent"] = GLFW_KEY_GRAVE_ACCENT;
+    m_OriginKeyCodes["W1"] = GLFW_KEY_WORLD_1;
+    m_OriginKeyCodes["W2"] = GLFW_KEY_WORLD_2;
+    m_OriginKeyCodes["Escape"] = GLFW_KEY_ESCAPE;
+    m_OriginKeyCodes["Enter"] = GLFW_KEY_ENTER;
+    m_OriginKeyCodes["Tab"] = GLFW_KEY_TAB;
+    m_OriginKeyCodes["Backspace"] = GLFW_KEY_BACKSPACE;
+    m_OriginKeyCodes["Insert"] = GLFW_KEY_INSERT;
+    m_OriginKeyCodes["Delete"] = GLFW_KEY_DELETE;
+    m_OriginKeyCodes["Right"] = GLFW_KEY_RIGHT;
+    m_OriginKeyCodes["Left"] = GLFW_KEY_LEFT;
+    m_OriginKeyCodes["Down"] = GLFW_KEY_DOWN;
+    m_OriginKeyCodes["Up"] = GLFW_KEY_UP;
+    m_OriginKeyCodes["PgUp"] = GLFW_KEY_PAGE_UP;
+    m_OriginKeyCodes["PgDn"] = GLFW_KEY_PAGE_DOWN;
+    m_OriginKeyCodes["Home"] = GLFW_KEY_HOME;
+    m_OriginKeyCodes["End"] = GLFW_KEY_END;
+    m_OriginKeyCodes["CapsLock"] = GLFW_KEY_CAPS_LOCK;
+    m_OriginKeyCodes["ScrollLock"] = GLFW_KEY_SCROLL_LOCK;
+    m_OriginKeyCodes["NumLock"] = GLFW_KEY_NUM_LOCK;
+    m_OriginKeyCodes["PrintScreen"] = GLFW_KEY_PRINT_SCREEN;
+    m_OriginKeyCodes["Pause"] = GLFW_KEY_PAUSE;
+    m_OriginKeyCodes["F1"] = GLFW_KEY_F1;
+    m_OriginKeyCodes["F2"] = GLFW_KEY_F2;
+    m_OriginKeyCodes["F3"] = GLFW_KEY_F3;
+    m_OriginKeyCodes["F4"] = GLFW_KEY_F4;
+    m_OriginKeyCodes["F5"] = GLFW_KEY_F5;
+    m_OriginKeyCodes["F6"] = GLFW_KEY_F6;
+    m_OriginKeyCodes["F7"] = GLFW_KEY_F7;
+    m_OriginKeyCodes["F8"] = GLFW_KEY_F8;
+    m_OriginKeyCodes["F9"] = GLFW_KEY_F9;
+    m_OriginKeyCodes["F10"] = GLFW_KEY_F10;
+    m_OriginKeyCodes["F11"] = GLFW_KEY_F11;
+    m_OriginKeyCodes["F12"] = GLFW_KEY_F12;
+    m_OriginKeyCodes["F13"] = GLFW_KEY_F13;
+    m_OriginKeyCodes["F14"] = GLFW_KEY_F14;
+    m_OriginKeyCodes["F15"] = GLFW_KEY_F15;
+    m_OriginKeyCodes["F16"] = GLFW_KEY_F16;
+    m_OriginKeyCodes["F17"] = GLFW_KEY_F17;
+    m_OriginKeyCodes["F18"] = GLFW_KEY_F18;
+    m_OriginKeyCodes["F19"] = GLFW_KEY_F19;
+    m_OriginKeyCodes["F20"] = GLFW_KEY_F20;
+    m_OriginKeyCodes["F21"] = GLFW_KEY_F21;
+    m_OriginKeyCodes["F22"] = GLFW_KEY_F22;
+    m_OriginKeyCodes["F23"] = GLFW_KEY_F23;
+    m_OriginKeyCodes["F24"] = GLFW_KEY_F24;
+    m_OriginKeyCodes["F25"] = GLFW_KEY_F25;
+    m_OriginKeyCodes["KP0"] = GLFW_KEY_KP_0;
+    m_OriginKeyCodes["KP1"] = GLFW_KEY_KP_1;
+    m_OriginKeyCodes["KP2"] = GLFW_KEY_KP_2;
+    m_OriginKeyCodes["KP3"] = GLFW_KEY_KP_3;
+    m_OriginKeyCodes["KP4"] = GLFW_KEY_KP_4;
+    m_OriginKeyCodes["KP5"] = GLFW_KEY_KP_5;
+    m_OriginKeyCodes["KP6"] = GLFW_KEY_KP_6;
+    m_OriginKeyCodes["KP7"] = GLFW_KEY_KP_7;
+    m_OriginKeyCodes["KP8"] = GLFW_KEY_KP_8;
+    m_OriginKeyCodes["KP9"] = GLFW_KEY_KP_9;
+    m_OriginKeyCodes["KPDecimal"] = GLFW_KEY_KP_DECIMAL;
+    m_OriginKeyCodes["KPDivide"] = GLFW_KEY_KP_DIVIDE;
+    m_OriginKeyCodes["KPMultiply"] = GLFW_KEY_KP_MULTIPLY;
+    m_OriginKeyCodes["KPSubtract"] = GLFW_KEY_KP_SUBTRACT;
+    m_OriginKeyCodes["KPAdd"] = GLFW_KEY_KP_ADD;
+    m_OriginKeyCodes["KPEnter"] = GLFW_KEY_KP_ENTER;
+    m_OriginKeyCodes["KPEqual"] = GLFW_KEY_KP_EQUAL;
+    m_OriginKeyCodes["LeftShift"] = GLFW_KEY_LEFT_SHIFT;
+    m_OriginKeyCodes["LeftControl"] = GLFW_KEY_LEFT_CONTROL;
+    m_OriginKeyCodes["LeftAlt"] = GLFW_KEY_LEFT_ALT;
+    m_OriginKeyCodes["LeftSuper"] = GLFW_KEY_LEFT_SUPER;
+    m_OriginKeyCodes["RightShift"] = GLFW_KEY_RIGHT_SHIFT;
+    m_OriginKeyCodes["RightControl"] = GLFW_KEY_RIGHT_CONTROL;
+    m_OriginKeyCodes["RightAlt"] = GLFW_KEY_RIGHT_ALT;
+    m_OriginKeyCodes["RightSuper"] = GLFW_KEY_RIGHT_SUPER;
+    m_OriginKeyCodes["Menu"] = GLFW_KEY_MENU;
+}
+
+bool KeyboardInputHandler::BindOrigin(std::string origin, std::string command, float value)
+{
+    auto originIt = m_OriginKeyCodes.find(origin);
+    if (originIt == m_OriginKeyCodes.end()) {
+        return false;
+    }
+
+    int keyCode = originIt->second;
+    m_KeyBindings[keyCode] = std::make_tuple(command, value);
+    return true;
+}
+
+bool KeyboardInputHandler::OnKeyDown(const Events::KeyDown& e)
+{
+    auto it = m_KeyBindings.find(e.KeyCode);
+    if (it == m_KeyBindings.end()) {
+        return false;
+    }
+
+    std::string command;
+    float value;
+    std::tie(command, value) = it->second;
+    m_CommandValues[command] += value;
+
+    return true;
+}
+
+bool KeyboardInputHandler::OnKeyUp(const Events::KeyUp& e)
+{
+    auto it = m_KeyBindings.find(e.KeyCode);
+    if (it == m_KeyBindings.end()) {
+        return false;
+    }
+
+    std::string command;
+    float value;
+    std::tie(command, value) = it->second;
+    m_CommandValues[command] -= value;
+
+    return true;
+}
+
+float KeyboardInputHandler::GetCommandValue(std::string command)
+{
+    auto it = m_CommandValues.find(command);
+    if (it != m_CommandValues.end()) {
+        return m_CommandValues[command];
+    } else {
+        return 0.f;
+    }
+}
+

src/Engine/Input/MouseInputHandler.cpp

@@ -0,0 +1,129 @@
+#include "Input/MouseInputHandler.h"
+
+MouseInputHandler::MouseInputHandler(EventBroker* eventBroker, InputProxy* inputProxy)
+    : InputHandler(eventBroker, inputProxy)
+{
+    EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &MouseInputHandler::OnMousePress);
+    EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &MouseInputHandler::OnMouseRelease);
+    EVENT_SUBSCRIBE_MEMBER(m_EMouseMove, &MouseInputHandler::OnMouseMove);
+
+    m_OriginCodes["Mouse1"] = GLFW_MOUSE_BUTTON_1;
+    m_OriginCodes["MouseLeft"] = GLFW_MOUSE_BUTTON_LEFT;
+    m_OriginCodes["Mouse2"] = GLFW_MOUSE_BUTTON_2;
+    m_OriginCodes["MouseRight"] = GLFW_MOUSE_BUTTON_RIGHT;
+    m_OriginCodes["Mouse3"] = GLFW_MOUSE_BUTTON_3;
+    m_OriginCodes["MouseMiddle"] = GLFW_MOUSE_BUTTON_MIDDLE;
+    m_OriginCodes["Mouse4"] = GLFW_MOUSE_BUTTON_4;
+    m_OriginCodes["Mouse5"] = GLFW_MOUSE_BUTTON_5;
+    m_OriginCodes["Mouse6"] = GLFW_MOUSE_BUTTON_6;
+    m_OriginCodes["Mouse7"] = GLFW_MOUSE_BUTTON_7;
+    m_OriginCodes["Mouse8"] = GLFW_MOUSE_BUTTON_8;
+
+    m_OriginAxes["MouseX"] = 'X';
+    m_OriginAxes["MouseY"] = 'Y';
+}
+
+bool MouseInputHandler::BindOrigin(std::string origin, std::string command, float value)
+{
+    auto originCode = m_OriginCodes.find(origin);
+    if (originCode != m_OriginCodes.end()) {
+        int code = originCode->second;
+        m_Bindings[code] = std::make_tuple(command, value);
+        return true;
+    }
+
+    auto originAxis = m_OriginAxes.find(origin);
+    if (originAxis != m_OriginAxes.end()) {
+        char axis = originAxis->second;
+        float multiplier = 1.f;
+        // Sensitivity
+        multiplier *= ResourceManager::Load<ConfigFile>("Input.ini")->Get<float>("Mouse.Sensitivity", 1.f);
+        if (axis == 'Y') {
+            if (ResourceManager::Load<ConfigFile>("Input.ini")->Get<bool>("Mouse.InvertPitch", false)) {
+                multiplier *= -1.f;
+            }
+        }
+        m_Axes[axis] = std::make_tuple(command, value * multiplier);
+        return true;
+    }
+
+    return false;
+}
+
+float MouseInputHandler::GetCommandValue(std::string command)
+{
+    auto it = m_CommandValues.find(command);
+    if (it != m_CommandValues.end()) {
+        return m_CommandValues[command];
+    } else {
+        return 0.f;
+    }
+}
+
+bool MouseInputHandler::OnMousePress(const Events::MousePress& e)
+{
+    auto it = m_Bindings.find(e.Button);
+    if (it == m_Bindings.end()) {
+        return false;
+    }
+
+    std::string command;
+    float value;
+    std::tie(command, value) = it->second;
+    m_CommandValues[command] += value;
+
+    return true;
+}
+
+bool MouseInputHandler::OnMouseRelease(const Events::MouseRelease& e)
+{
+    auto it = m_Bindings.find(e.Button);
+    if (it == m_Bindings.end()) {
+        return false;
+    }
+
+    std::string command;
+    float value;
+    std::tie(command, value) = it->second;
+    m_CommandValues[command] -= value;
+
+    return true;
+}
+
+bool MouseInputHandler::OnMouseMove(const Events::MouseMove& e)
+{
+    if (std::abs(e.DeltaX) > 0) {
+        auto it = m_Axes.find('X');
+        if (it != m_Axes.end()) {
+            Events::InputCommand ic;
+            ic.PlayerID = -1;
+            std::tie(ic.Command, ic.Value) = it->second;
+            ic.Value *= e.DeltaX;
+            m_InputProxy->Publish(ic);
+        }
+    }
+    
+    if (std::abs(e.DeltaY) > 0) {
+        auto it = m_Axes.find('Y');
+        if (it != m_Axes.end()) {
+            Events::InputCommand ic;
+            ic.PlayerID = -1;
+            std::tie(ic.Command, ic.Value) = it->second;
+            ic.Value *= e.DeltaY;
+            m_InputProxy->Publish(ic);
+        }
+    }
+
+    return true;
+}
+
+bool MouseInputHandler::hasOrigin(std::string origin)
+{
+    if (m_OriginCodes.find(origin) == m_OriginCodes.end()) {
+        return false;
+    }
+    if (m_OriginAxes.find(origin) == m_OriginAxes.end()) {
+        return false;
+    }
+    return true;
+}