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

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

@@ -16,6 +16,7 @@
 #include "ELockMouse.h"
 #include "EGamepadAxis.h"
 #include "EGamepadButton.h"
+#include "EFileDropped.h"
 
 class InputManager
 {
@@ -71,6 +72,8 @@ private:
     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/World.h

@@ -31,6 +31,8 @@ public:
     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
@@ -40,6 +42,7 @@ 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;