Reworked the Exporter.

Commited directly from GitHub. Blame it if something explodes.

.gitignore

@@ -4,3 +4,11 @@ bin/
 lib/
 # Because apparently nobody has any self control
 *.orig
+
+*.suo
+*.sdf
+tools/MayaExporter/MayaExporter/x64/Debug/
+tools/MayaExporter/x64/Debug/
+
+tools/MayaExporter/MayaExporter/Debug/
+tools/MayaExporter/MayaExporter/GeneratedFiles/

README.md

@@ -1,18 +1,16 @@
 #### Bundled libraries
 Libraries bundled along with binaries for Windows (MSVC14), available as a submodule in the *deps* directory of the source tree.
 
-| Project                                                          | Version      | License                                                                                                                                                                            |
-| ---------------------------------------------------------------- | ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **[GLFW](http://www.glfw.org)**                                  | 3.1.2        | [zlib/libpng License](http://www.glfw.org/license.html)                                                                                                                            |
-| **[GLM](http://glm.g-truc.net/0.9.5/index.html)**                | 0.9.7.1      | [MIT License](http://glm.g-truc.net/copying.txt)                                                                                                                                   |
-| **[GLEW](http://glew.sourceforge.net)**                          | 1.13.0       | [Modified BSD License](http://glew.sourceforge.net/glew.txt), [Mesa 3-D License](http://glew.sourceforge.net/mesa.txt), [Khronos License](http://glew.sourceforge.net/khronos.txt) |
-| **[Assimp](http://assimp.sourceforge.net)**                      | 3.1.1        | [BSD 3-Clause License](http://assimp.sourceforge.net/main_license.html)                                                                                                            |
-| **[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)                                                                              |
-| **[nativefiledialog](https://github.com/mlabbe/nativefiledialog)** | 2016-01-08   | [nativefiledialog Licence](https://github.com/mlabbe/nativefiledialog/blob/master/LICENSE)                                                                                                              |
-| **[OpenAL](https://www.openal.org/)**                            | 1.1          | [OpenAL License](resources/Licenses/OpenAL.txt)
+| Project                                                       | Version      | License                                                                                                                                                                            |
+| ------------------------------------------------------------- | ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **[GLFW](http://www.glfw.org)**                               | 3.1.2        | [zlib/libpng License](http://www.glfw.org/license.html)                                                                                                                            |
+| **[GLM](http://glm.g-truc.net/0.9.5/index.html)**             | 0.9.7.1      | [MIT License](http://glm.g-truc.net/copying.txt)                                                                                                                                   |
+| **[GLEW](http://glew.sourceforge.net)**                       | 1.13.0       | [Modified BSD License](http://glew.sourceforge.net/glew.txt), [Mesa 3-D License](http://glew.sourceforge.net/mesa.txt), [Khronos License](http://glew.sourceforge.net/khronos.txt) |
+| **[Assimp](http://assimp.sourceforge.net)**                   | 3.1.1        | [BSD 3-Clause License](http://assimp.sourceforge.net/main_license.html)                                                                                                            |
+| **[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.

include/Engine/Collision/CollidableOctreeSystem.h

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

include/Engine/Collision/Collision.h

@@ -6,14 +6,11 @@
 //or you will get "fatal error C1189: #error:  gl.h included before glew.h"
 
 #include <vector>
-#include <boost/optional.hpp>
 
-#include "../Core/Ray.h"
-#include "../Core/AABB.h"
-#include "../Rendering/RawModel.h"
-#include "../Core/Transform.h"
-#include "../Core/Entity.h"
-#include "../Core/EntityWrapper.h"
+#include "Core/Ray.h"
+#include "Core/AABB.h"
+#include "Engine/Rendering/RawModel.h"
+#include "Core/Entity.h"
 
 class World;
 struct ComponentWrapper;
@@ -46,12 +43,6 @@ bool RayVsModel(const Ray& ray,
     float& outUCoord,
     float& outVCoord);
 
-bool AABBvsTriangles(const AABB& box,
-    const std::vector<RawModel::Vertex>& modelVertices,
-    const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix,
-    glm::vec3& outResolutionVector);
-
 //Return true if the boxes are intersecting.
 bool AABBVsAABB(const AABB& a, const AABB& b);
 //Return true if the boxes are intersecting.
@@ -59,8 +50,9 @@ bool AABBVsAABB(const AABB& a, const AABB& b);
 bool AABBVsAABB(const AABB& a, const AABB& b, glm::vec3& minimumTranslation);
 bool IsSameBoxProbably(const AABB& first, const AABB& second, const float epsilon = 0.0001f);
 
-// Calculates an absolute AABB from an entity AABB component
-boost::optional<AABB> EntityAbsoluteAABB(EntityWrapper& entity);
+//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);
 
 }
 

include/Engine/Collision/CollisionSystem.h

@@ -4,31 +4,26 @@
 #include <GLFW/glfw3.h>
 #include <glm/common.hpp>
 
-#include "../Common.h"
-#include "../Core/System.h"
-#include "../Core/EventBroker.h"
-#include "../Core/EKeyUp.h"
-#include "../Core/Octree.h"
+#include "Common.h"
+#include "Core/System.h"
+#include "Core/EventBroker.h"
+#include "Core/EKeyUp.h"
 
 class CollisionSystem : public PureSystem
 {
 public:
-    CollisionSystem(EventBroker* eventBroker, Octree<AABB>* octree)
-        : System(eventBroker)
-        , PureSystem("Collidable")
-        , m_Octree(octree)
+    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, EntityWrapper& entity, ComponentWrapper& component, double dt) override;
+    virtual void UpdateComponent(World* world, ComponentWrapper& cAABB, double dt) override;
 
 private:
-    Octree<AABB>* m_Octree;
     bool zPress;
-
     EventRelay<CollisionSystem, Events::KeyUp> m_EKeyUp;
     bool OnKeyUp(const Events::KeyUp &event);
 };

include/Engine/Collision/TriggerSystem.h

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

include/Engine/Common.h

@@ -1,6 +1,5 @@
 #include <memory>
 #include <string>
-#include <sstream>
 #include <vector>
 #include <map>
 #include <unordered_map>

include/Engine/Core/AABB.h

@@ -11,18 +11,18 @@ public:
     AABB(const glm::vec3& minPos, const glm::vec3& maxPos);
     AABB(const glm::vec4& minPos, const glm::vec4& maxPos);
     //No checks are made. Size must consist of non-negative numbers.
-    static AABB FromOriginSize(const glm::vec3& origin, const glm::vec3& size);
+    virtual 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& Origin() const { return m_Origin; }
+    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_Origin;
+    glm::vec3 m_Center;
     glm::vec3 m_HalfSize;
 };
 

include/Engine/Core/ComponentInfo.h

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

include/Engine/Core/ComponentPool.h

@@ -43,7 +43,7 @@ public:
 
     ComponentPool(const ::ComponentInfo& ci) 
         : m_ComponentInfo(ci)
-        , m_Pool(ci.Meta->Allocation, sizeof(EntityID) + ci.Stride)
+        , m_Pool(ci.Meta.Allocation, sizeof(EntityID) + ci.Meta.Stride)
     { }
 	ComponentPool(const ComponentPool& other) = delete;
 	ComponentPool(const ComponentPool&& other) = delete;

include/Engine/Core/ComponentWrapper.h

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

include/Engine/Core/EComponentAttached.h

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

include/Engine/Core/Entity.h

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

include/Engine/Core/EntityFactory.h

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

include/Engine/Core/EntityFile.h

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

include/Engine/Core/EntityFileParser.h

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

include/Engine/Core/EntityFilePreprocessor.h

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

include/Engine/Core/EntityFileWriter.h

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

include/Engine/Core/EntityWrapper.h

@@ -1,32 +0,0 @@
-#ifndef EntityWrapper_h__
-#define EntityWrapper_h__
-
-#include <boost/optional.hpp>
-#include "ComponentWrapper.h"
-
-class World;
-struct EntityWrapper
-{
-    EntityWrapper()
-        : World(nullptr)
-        , ID(EntityID_Invalid)
-    { }
-
-    EntityWrapper(::World* world, EntityID id)
-        : World(world)
-        , ID(id)
-    { }
-
-    ::World* World;
-    EntityID ID;
-
-    static const EntityWrapper Invalid;
-
-    bool HasComponent(const std::string& componentName);
-
-    ComponentWrapper operator[](const std::string& componentName);
-    bool operator==(const EntityWrapper& e);
-    explicit operator EntityID();
-};
-
-#endif

include/Engine/Core/EntityXMLFile.h

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

include/Engine/Core/EventBroker.h

@@ -43,7 +43,7 @@ template <typename ContextType, typename EventType>
 class EventRelay : public BaseEventRelay
 {
 public:
-    typedef std::function<bool(EventType&)> CallbackType;
+    typedef std::function<bool(const EventType&)> CallbackType;
 
     EventRelay()
         : m_Callback(nullptr)
@@ -65,7 +65,7 @@ template <typename ContextType, typename EventType>
 bool EventRelay<ContextType, EventType>::Receive(const std::shared_ptr<Event> event)
 {
     if (m_Callback != nullptr) {
-        return m_Callback(*static_cast<EventType*>(event.get()));
+        return m_Callback(*static_cast<const EventType*>(event.get()));
     } else {
         return false;
     }

include/Engine/Core/MemoryPool.h

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

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

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

include/Engine/Core/Ray.h

@@ -2,7 +2,7 @@
 #define Ray_h__
 
 #include "../GLM.h"
-#include "../Common.h"
+#include "Common.h"
 
 class Ray
 {

include/Engine/Core/ResourceManager.h

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

include/Engine/Core/System.h

@@ -3,7 +3,6 @@
 
 #include "EventBroker.h"
 #include "World.h"
-#include "EntityWrapper.h"
 #include "ComponentWrapper.h"
 
 class System
@@ -11,9 +10,6 @@ class System
     friend class SystemPipeline;
 
 protected:
-    System()
-        : m_EventBroker(nullptr)
-    { }
     System(EventBroker* eventBroker)
         : m_EventBroker(eventBroker)
     { }
@@ -22,27 +18,30 @@ protected:
     EventBroker* m_EventBroker;
 };
 
-class PureSystem : public virtual System
+class PureSystem : public System
 {
     friend class SystemPipeline;
 
 protected:
-    PureSystem(std::string componentType)
-        : m_ComponentType(componentType)
+    PureSystem(EventBroker* eventBroker, std::string componentType)
+        : System(eventBroker)
+        , m_ComponentType(componentType)
     { }
     virtual ~PureSystem() = default;
 
     const std::string m_ComponentType;
 
-    virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) = 0;
+    virtual void UpdateComponent(World* world, ComponentWrapper& component, double dt) = 0;
 };
 
-class ImpureSystem : public virtual System
+class ImpureSystem : public System
 {
     friend class SystemPipeline;
 
 protected:
-    ImpureSystem() = default;
+    ImpureSystem(EventBroker* eventBroker)
+        : System(eventBroker)
+    { }
     virtual ~ImpureSystem() = default;
 
     virtual void Update(World* world, double dt) = 0;

include/Engine/Core/SystemPipeline.h

@@ -32,8 +32,8 @@ public:
         System* system = new T(m_EventBroker, args...);
         group.Systems[typeid(T).name()] = system;
 
-        PureSystem* pureSystem = dynamic_cast<PureSystem*>(system);
-        if (pureSystem != nullptr) {
+        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 {
@@ -41,8 +41,8 @@ public:
             }
         }
 
-        ImpureSystem* impureSystem = dynamic_cast<ImpureSystem*>(system);
-        if (impureSystem != nullptr) {
+        if (std::is_base_of<ImpureSystem, T>::value) {
+            ImpureSystem* impureSystem = static_cast<ImpureSystem*>(system);
             group.ImpureSystems.push_back(impureSystem);
         }
     }
@@ -56,9 +56,6 @@ public:
             }
 
             // Update
-            for (auto& system : group.ImpureSystems) {
-                system->Update(world, dt);
-            }
             for (auto& pair : group.PureSystems) {
                 const std::string& componentName = pair.first;
                 auto& systems = pair.second;
@@ -68,10 +65,13 @@ public:
                 }
                 for (auto& component : *pool) {
                     for (auto& system : systems) {
-                        system->UpdateComponent(world, EntityWrapper(world, component.EntityID), component, dt);
+                        system->UpdateComponent(world, component, dt);
                     }
                 }
             }
+            for (auto& system : group.ImpureSystems) {
+                system->Update(world, dt);
+            }
         }
     }
 

include/Engine/Core/Transform.h

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

include/Engine/Core/Util/XercesString.h

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

include/Engine/Core/World.h

@@ -16,43 +16,35 @@ public:
     EntityID CreateEntity(EntityID parent = 0);
     // Delete entity and all components within
     void DeleteEntity(EntityID entity);
-    // Check if an entity exists
-    bool ValidEntity(EntityID entity) const;
+
     // Register a component type and allocate space for it
     void RegisterComponent(ComponentInfo& ci);
     // Attach a component to an entity and fill it with default values
-    ComponentWrapper AttachComponent(EntityID entity, const std::string& componentType);
+    ComponentWrapper AttachComponent(EntityID entity, std::string componentType);
     // Check if an entity has a component
-    bool HasComponent(EntityID entity, const std::string& componentType) const;
+    bool HasComponent(EntityID entity, std::string componentType);
     // Get a component of an entity
-    ComponentWrapper GetComponent(EntityID entity, const std::string& componentType);
+    ComponentWrapper GetComponent(EntityID entity, std::string componentType);
     // Delete a component off an entity
-    void DeleteComponent(EntityID entity, const std::string& componentType);
+    void DeleteComponent(EntityID entity, std::string componentType);
     // Get all components of the specified type
-    const ComponentPool* GetComponents(const std::string& componentType);
+    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 children of an entity
-    const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetChildren(EntityID entity);
     // Get all component pools
     const std::unordered_map<std::string, ComponentPool*>& GetComponentPools() const { return m_ComponentPools; }
     // Get the entity children map
     const std::unordered_multimap<EntityID, EntityID>& GetEntityChildren() const { return m_EntityChildren; }
-    // Set the textual name of an entity
-    void SetName(EntityID entity, const std::string& name);
-    // Get the textual name of an entity
-    std::string GetName(EntityID entity) const;
 
 private:
-    EntityID m_CurrentEntityID = 0;
+    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;
-    std::unordered_map<EntityID, std::string> m_EntityNames;
 
     EntityID generateEntityID();
 };

include/Engine/Editor/EditorSystem.h

@@ -1,7 +1,6 @@
 #include <imgui/imgui.h>
 #include <glm/gtx/common.hpp>
 #include <boost/filesystem/path.hpp>
-#include <nativefiledialog/nfd.h>
 #include "../Core/System.h"
 #include "../Core/EMousePress.h"
 #include "../Core/EMouseRelease.h"
@@ -9,11 +8,9 @@
 #include "../Core/ConfigFile.h"
 #include "../Input/EInputCommand.h"
 #include "../Rendering/IRenderer.h"
-#include "../Core/Transform.h"
+#include "../Rendering/EPicking.h"
 #include "../Core/EFileDropped.h"
-#include "../Core/EntityFilePreprocessor.h"
-#include "../Core/EntityFileParser.h"
-#include "../Core/EntityFileWriter.h"
+#include "../Rendering/RenderQueueFactory.h"
 
 class EditorSystem : public ImpureSystem
 {
@@ -25,12 +22,9 @@ public:
 private:
     IRenderer* m_Renderer;
     World* m_World = nullptr;
-    Camera* m_Camera = nullptr;
 
     bool m_Enabled;
     bool m_Visible;
-    boost::filesystem::path m_DefaultEntityDir;
-    boost::filesystem::path m_CurrentFile;
     std::vector<glm::vec2> m_PickingQueue;
 
     enum class WidgetMode
@@ -47,27 +41,22 @@ private:
         Global
     } m_WidgetSpace = WidgetSpace::Global;
 
-    EntityID m_Widget = EntityID_Invalid;
-    EntityID m_WidgetX = EntityID_Invalid;
-    EntityID m_WidgetPlaneX = EntityID_Invalid;
-    EntityID m_WidgetY = EntityID_Invalid;
-    EntityID m_WidgetPlaneY = EntityID_Invalid;
-    EntityID m_WidgetZ = EntityID_Invalid;
-    EntityID m_WidgetPlaneZ = EntityID_Invalid;
-    EntityID m_WidgetOrigin = EntityID_Invalid;
+    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;
-    glm::vec3 m_WidgetPickingPosition = glm::vec3(0);
 
-    EntityID m_Selection = EntityID_Invalid;
-    EntityID m_LastSelection = EntityID_Invalid;
-    EntityID m_UIDraggingEntity = EntityID_Invalid;
+    EntityID m_Selection = 0;
+    EntityID m_LastSelection = 0;
     glm::vec3 m_Position;
     std::string m_LastDroppedFile;
 
-    static boost::filesystem::path openDialog(boost::filesystem::path defaultPath);
-    static boost::filesystem::path saveDialog(boost::filesystem::path defaultPath);
-
     EventRelay<EditorSystem, Events::InputCommand> m_EInputCommand;
     bool OnInputCommand(const Events::InputCommand& e);
     EventRelay<EditorSystem, Events::MouseRelease> m_EMouseRelease;
@@ -76,19 +65,15 @@ private:
     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 Picking();
-    void createWidget();
+
     void updateWidget();
     void setWidgetMode(WidgetMode newMode);
     void setWidgetSpace(WidgetSpace space);
     void drawUI(World* world, double dt);
     bool createDeleteButton(std::string componentType);
-    bool createEntityNode(World* world, EntityID entity);
     void changeParent(EntityID entity, EntityID newParent);
-    void fileImport(World* world);
-    void fileSave(World* world);
-    void fileSaveAs(World* world);
 };

include/Engine/GUI/Button.h

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

include/Engine/GUI/Frame.h

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

include/Engine/GUI/TextureFrame.h

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

include/Engine/Input/InputProxy.h

@@ -1,7 +1,6 @@
 #ifndef InputProxy_h__
 #define InputProxy_h__
 
-#include <boost/tokenizer.hpp>
 #include "../Common.h"
 #include "../Core/ResourceManager.h"
 #include "../Core/ConfigFile.h"

include/Engine/Network/Client.h

@@ -23,6 +23,7 @@ public:
     ~Client();
     void Start(World* world, EventBroker* eventBroker) override;
     void Update() override;
+    void Close();
 private:
     // Assio UDP logic
     boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
@@ -31,7 +32,7 @@ private:
 
     // Sending message to server logic
     int bytesRead = -1;
-    char readBuf[INPUTSIZE] = { 0 };
+    char readBuf[1024] = { 0 };
     int snapshotInterval = 33;
     std::clock_t previousSnapshotMessage = std::clock();
 
@@ -48,6 +49,7 @@ private:
     // 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
@@ -57,7 +59,7 @@ private:
     // Private member functions
     void readFromServer();
     void sendSnapshotToServer();
-    int  receive(char* data, size_t length);
+    int receive(char* data, size_t length);
     void send(Packet& packet);
     void connect();
     void disconnect();
@@ -65,7 +67,6 @@ private:
     void moveMessageHead(char*& data, size_t& length, size_t stepSize);
     void parseMessageType(Packet& packet);
     void parseEventMessage(Packet& packet);
-    void updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID, const std::string& componentType);
     void parseConnect(Packet& packet);
     void parsePing();
     void parseServerPing();

include/Engine/Network/Network.h

@@ -6,7 +6,7 @@
 #include "Network/Packet.h"
 
 #define MAXCONNECTIONS 8
-#define INPUTSIZE 4097
+#define INPUTSIZE 128
 
 class Network
 {

include/Engine/Network/Packet.h

@@ -14,17 +14,15 @@ public:
     Packet(MessageType type, unsigned int& packetID);
     // Used to create packet from already existing data buffer.
     Packet(char* data, const int sizeOfPacket);
+    
     ~Packet();
-    void Init(MessageType type, unsigned int& packetID);
-
     // Add primitive types like int, float, char...
     template<typename T>
     void WritePrimitive(T val)
     {
         // Check if we are trying to add more than the package can fit.
         if (m_MaxPacketSize < m_Offset + sizeof(T)) {
-            LOG_WARNING("Packet AddPrimitive(): You are trying to add more than we have allocated for! New size is %i bytes\n", m_MaxPacketSize*2);
-            resizeData();
+            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);
@@ -43,7 +41,7 @@ public:
         return returnValue;
     }
     // Add a string to the message
-    void WriteString(const std::string& str);
+    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.
@@ -52,15 +50,12 @@ public:
 
     int Size() { return m_Offset; };
     char* Data() { return m_Data; };
-    unsigned int DataReadSize() { return m_ReturnDataOffset; }
-    unsigned int MaxSize() { return m_MaxPacketSize; }
 
 private:
     char* m_Data;
     unsigned int m_ReturnDataOffset = 0;
     int m_Offset = 0;
-    unsigned int m_MaxPacketSize = 512;
-    void resizeData();
+    unsigned int m_MaxPacketSize = 128;
 };
 
 #endif

include/Engine/Network/Server.h

@@ -20,6 +20,8 @@ public:
     ~Server();
     void Start(World* m_world, EventBroker *eventBroker) override;
     void Update() override;
+    void Close();
+
 private:
     // UDP logic
     boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
@@ -28,7 +30,7 @@ private:
     PlayerDefinition m_PlayerDefinitions[MAXCONNECTIONS];
 
     // Sending messages to client logic
-    char readBuffer[INPUTSIZE] = { 0 };
+    char readBuffer[1024] = { 0 };
     int bytesRead = 0;
     // time for previouse message
     std::clock_t previousePingMessage = std::clock();
@@ -53,6 +55,9 @@ private:
     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);

include/Engine/Rendering/BaseTexture.h

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

include/Engine/Rendering/Camera.h

@@ -26,12 +26,13 @@ public:
 	glm::quat Orientation() const { return m_Orientation; }
 	void SetOrientation(glm::quat val);
 
+	/*float Pitch() const { return m_Pitch; }
+	void Pitch(float val);
+	float Yaw() const { return m_Yaw; }
+	void Yaw(float val);*/
+
 	glm::mat4 ProjectionMatrix() const { return m_ProjectionMatrix; }
-    void SetProjectionMatrix(glm::mat4 val);
-
 	glm::mat4 ViewMatrix() const { return m_ViewMatrix; }
-    void SetViewMatrix(glm::mat4 val);
-
 
 	float AspectRatio() const { return m_AspectRatio; }
 	void SetAspectRatio(float val);
@@ -45,10 +46,11 @@ public:
 	float FarClip() const { return m_FarClip; }
 	void SetFarClip(float val);
 
-    void UpdateViewMatrix();
-    void UpdateProjectionMatrix();
+	
 
 private:
+	void UpdateViewMatrix();
+	void UpdateProjectionMatrix();
 
 	glm::vec3 m_Position;
 	glm::quat m_Orientation;

include/Engine/Rendering/DebugCameraInputController.h

@@ -9,9 +9,6 @@ public:
         : FirstPersonInputController(eventBroker, playerID)
     { }
 
-    void SetPosition(const glm::vec3 position) { m_Position = position; }
-    void SetOrientation(const glm::quat orientation) { m_Orientation = orientation; }
-
     const glm::vec3 Position() const { return m_Position; }
     void SetBaseSpeed(float speed) { m_BaseSpeed = speed; }
 

include/Engine/Rendering/DrawFinalPass.h

@@ -18,7 +18,7 @@ public:
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
 
-    void Draw(RenderScene& scene);
+    void Draw(RenderQueueCollection& rq);
 
     //Getters
 

include/Engine/Rendering/DrawScenePass.h

@@ -17,7 +17,7 @@ public:
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
 
-    void Draw(RenderScene& scene);
+    void Draw(RenderQueueCollection& rq);
 
     //Getters
 
@@ -25,18 +25,12 @@ public:
 private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
 
-    static bool DepthSort(const std::shared_ptr<RenderJob> &i, const std::shared_ptr<RenderJob> &j)
-    {
-        return (i->Depth < j->Depth);
-    };
-
     Texture* m_WhiteTexture;
 
     const IRenderer* m_Renderer;
 
     ShaderProgram* m_BasicForwardProgram;
 
-
 };
 
 #endif 

include/Engine/Rendering/DummyRenderer.h

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

include/Engine/Rendering/EPicking.h

@@ -0,0 +1,74 @@
+#ifndef Events_Picking_h__
+#define Events_Picking_h__
+
+#include "../OpenGL.h"
+#include "../GLM.h"
+
+#include "../Core/EventBroker.h"
+#include "Util/ScreenCoords.h"
+#include "FrameBuffer.h"
+#include "../Core/Entity.h"
+#include "Util/UnorderedMapVec2.h"
+
+namespace Events
+{
+
+/** Thrown Every frame, use functions to pick*/
+struct Picking : Event
+{
+public:
+    Picking(FrameBuffer* pickingBuffer, GLuint* depthBuffer, glm::mat4 projectionMatrix, glm::mat4 viewMatrix, Rectangle resolution, const std::unordered_map<glm::vec2, EntityID>* pickingColorsToEntity)
+        : PickingBuffer(pickingBuffer)
+        , DepthBuffer(depthBuffer)
+        , ProjectionMatrix(projectionMatrix)
+        , ViewMatrix(viewMatrix)
+        , Resolution(resolution)
+        , PickingColorsToEntity(pickingColorsToEntity)
+    { }
+        
+    
+
+    struct PickData
+    {
+        //Picked Entity
+        EntityID Entity;
+        //World position of the "pick"
+        glm::vec3 Position;
+        // 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 = 0;
+        }
+        pickData.Position = ScreenCoords::ToWorldPos(screenCoord.x, screenCoord.y, data.Depth, Resolution, ProjectionMatrix, ViewMatrix);
+
+        return pickData;
+    }
+
+
+private:
+    FrameBuffer* PickingBuffer;
+    GLuint* DepthBuffer;
+    const glm::mat4 ProjectionMatrix;
+    const glm::mat4 ViewMatrix;
+    const Rectangle Resolution;
+    const std::unordered_map<glm::vec2, EntityID>* PickingColorsToEntity;
+    
+};
+
+}
+
+#endif

include/Engine/Rendering/ESetCamera.h

@@ -1,23 +0,0 @@
-#ifndef Events_SetCamera_h__
-#define Events_SetCamera_h__
-
-#include "../Core/EventBroker.h"
-#include "../Core/Entity.h"
-#include <string.h>
-
-namespace Events
-{
-
-struct SetCamera : Event
-{
-public:
-    SetCamera() { };
-    std::string Name;
-
-private:
-
-};
-
-}
-
-#endif

include/Engine/Rendering/IRenderer.h

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

include/Engine/Rendering/LightCullingPass.h

@@ -2,12 +2,11 @@
 #define LightCullingPass_h__
 
 #define TILE_SIZE 16 
-#define MAX_LIGHTS_PER_TILE 200
+#define NUM_LIGHTS 1000
 
 #include "IRenderer.h"
 #include "LightCullingPassState.h"
 #include "ShaderProgram.h"
-#include "RenderQueue.h"
 
 
 class LightCullingPass
@@ -16,11 +15,9 @@ public:
     LightCullingPass(IRenderer* renderer);
     ~LightCullingPass();
 
-    void GenerateNewFrustum(RenderScene& scene);
-    void OnResolutionChange();
-    void SetSSBOSizes();
-    void CullLights(RenderScene& scene);
-    void FillLightList(RenderScene& scene);
+    void GenerateNewFrustum();
+    void CullLights();
+    void FillLightList(RenderQueueCollection& rq);
 
     GLuint FrustumSSBO() const { return m_FrustumSSBO; }
     GLuint LightSSBO() const { return m_LightSSBO; }
@@ -43,8 +40,6 @@ private:
     ShaderProgram* m_CalculateFrustumProgram;
     ShaderProgram* m_LightCullProgram;
 
-    int m_NumberOfTiles = 0;
-
     struct Plane {
         glm::vec3 Normal;
         float d;
@@ -53,7 +48,7 @@ private:
     struct Frustum {
         Plane Planes[4];
     };
-    Frustum* m_Frustums;
+    Frustum m_Frustums[80*45]; //TODO: Renderer: Make this change with resolution
 
     //This should be a component
     struct PointLight {
@@ -72,11 +67,11 @@ private:
         glm::vec2 Padding;
     };
 
-    LightGrid* m_LightGrid;
+    LightGrid m_LightGrid[80*45]; //TODO: Renderer: Make this change with resolution
 
     int m_LightOffset = 0;
 
-    float* m_LightIndex;
+    float m_LightIndex[80*45*200]; //TODO: Renderer: Make this change with resolution
 };
 
 

include/Engine/Rendering/Model.h

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

include/Engine/Rendering/ModelJob.h

@@ -1,55 +0,0 @@
-#ifndef ModelJob_h__
-#define ModelJob_h__
-
-#include <cstdint>
-
-#include "../Common.h"
-#include "../GLM.h"
-#include "../Core/ComponentWrapper.h"
-#include "Texture.h"
-#include "Model.h"
-#include "RenderJob.h"
-#include "../Core/ResourceManager.h"
-#include "Camera.h"
-#include "../Core/World.h"
-
-struct ModelJob : RenderJob
-{
-    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialGroup matGroup, ComponentWrapper modelComponent, World* world)
-        : RenderJob()
-    {
-        Model = model;
-        TextureID = (matGroup.Texture) ? matGroup.Texture->ResourceID : 0;
-        DiffuseTexture = matGroup.Texture.get();
-        NormalTexture = matGroup.NormalMap.get();
-        SpecularTexture = matGroup.SpecularMap.get();
-        StartIndex = matGroup.StartIndex;
-        EndIndex = matGroup.EndIndex;
-        Matrix = matrix;
-        Color = modelComponent["Color"];
-        Entity = modelComponent.EntityID;
-        World = world;
-    };
-
-    unsigned int TextureID;
-    unsigned int ShaderID;
-
-    EntityID Entity;
-    glm::mat4 Matrix;
-    const Texture* DiffuseTexture;
-    const Texture* NormalTexture;
-    const Texture* SpecularTexture;
-    float Shininess = 0.f;
-    glm::vec4 Color;
-    const ::Model* Model = nullptr;
-    unsigned int StartIndex = 0;
-    unsigned int EndIndex = 0;
-    World* World;
-
-    void CalculateHash() override
-    {
-        Hash = TextureID;
-    }
-};
-
-#endif

include/Engine/Rendering/PickingPass.h

@@ -7,9 +7,9 @@
 #include "PickingPassState.h"
 #include "FrameBuffer.h"
 #include "ShaderProgram.h"
-#include "Util/UnorderedMapiVec2.h"
+#include "Util/UnorderedMapVec2.h"
 #include "../Core/EventBroker.h"
-#include "../Core/World.h"
+#include "EPicking.h"
 
 
 
@@ -22,19 +22,15 @@ public:
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
 
-    void Draw(RenderScene& scene);
-    void ClearPicking();
+    void Draw(RenderQueueCollection& rq);
 
     //Getters
     const ShaderProgram& PickingProgram() const { return *m_PickingProgram; }
-    //const std::unordered_map<glm::ivec2, EntityID>& PickingColorsToEntity() const { return m_PickingColorsToEntity; }
+    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; }
 
-    
-    PickData Pick(glm::vec2 screenCoord);
-
 private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
 
@@ -43,24 +39,13 @@ private:
     const IRenderer* m_Renderer;
 
     ShaderProgram* m_PickingProgram;
-    Camera* m_Camera;
 
-    struct PickingInfo
-    {
-        EntityID Entity;
-        const ::World* World;
-        ::Camera* Camera;
-    };
-
-    std::unordered_map<glm::ivec2, PickingInfo> m_PickingColorsToEntity;
+    std::unordered_map<glm::vec2, EntityID> m_PickingColorsToEntity;
 
     GLuint m_PickingTexture;
     GLuint m_DepthBuffer;
 
     FrameBuffer m_PickingBuffer;
-
-    int m_ColorCounter[2];
-    std::map<std::tuple<EntityID, const World*, Camera*>, glm::ivec2> m_EntityColors;
 };
 
 #endif 

include/Engine/Rendering/PointLightJob.h

@@ -1,39 +0,0 @@
-#ifndef PointLightJob_h__
-#define PointLightJob_h__
-
-#include <cstdint>
-
-#include "../Common.h"
-#include "../GLM.h"
-#include "../Core/ComponentWrapper.h"
-#include "RenderJob.h"
-#include "../Core/Transform.h"
-#include "../Core/World.h"
-
-struct PointLightJob : RenderJob
-{
-    PointLightJob(ComponentWrapper transformComponent, ComponentWrapper pointLightComponent, World* m_World)
-        : RenderJob()
-    {
-        Position = glm::vec4((glm::vec3)transformComponent["Position"], 1.0f);
-        Position = glm::vec4(Transform::AbsolutePosition(m_World, transformComponent.EntityID), 1.f);
-        Color = (glm::vec4)pointLightComponent["Color"];
-        Radius = (double)pointLightComponent["Radius"];
-        Intensity = (double)pointLightComponent["Intensity"];
-        Falloff = (double)pointLightComponent["Falloff"];
-    };
-
-    glm::vec4 Position;
-    glm::vec4 Color;
-    float Radius;
-    float Intensity;
-    float Falloff;
-    float padding = 123;
-
-    void CalculateHash() override
-    {
-        Hash = 0;
-    }
-};
-
-#endif

include/Engine/Rendering/RawModel.h

@@ -46,18 +46,14 @@ public:
 	struct MaterialGroup
 	{
 		float Shininess;
-        float Transparency;
-        std::string TexturePath;
 		std::shared_ptr<::Texture> Texture;
-        std::string NormalMapPath;
 		std::shared_ptr<::Texture> NormalMap;
-        std::string SpecularMapPath;
 		std::shared_ptr<::Texture> SpecularMap;
 		unsigned int StartIndex;
 		unsigned int EndIndex;
 	};
 
-	std::vector<MaterialGroup> MaterialGroups;
+	std::vector<MaterialGroup> TextureGroups;
 
 	std::vector<Vertex> m_Vertices;
 	std::vector<unsigned int> m_Indices;

include/Engine/Rendering/RenderJob.h

@@ -1,32 +0,0 @@
-#ifndef RenderJob_h__
-#define RenderJob_h__
-
-#include <cstdint>
-
-#include "../Common.h"
-#include "../GLM.h"
-#include "../Core/ComponentWrapper.h"
-#include "RenderQueue.h"
-
-
-struct RenderJob
-{
-    friend class RenderQueue;
-
-public:
-
-    float Depth;
-
-protected:
-    uint64_t Hash;
-
-    virtual void CalculateHash() = 0;
-
-    bool operator<(const RenderJob& rhs)
-    {
-        return this->Hash < rhs.Hash;
-    }
-
-};
-
-#endif

include/Engine/Rendering/RenderQueue.h

@@ -8,13 +8,61 @@
 #include "../GLM.h"
 #include "../Core/Util/Rectangle.h"
 #include "../Core/Entity.h"
-#include "Camera.h"
-#include "RenderJob.h"
-#include "ModelJob.h"
-#include "PointLightJob.h"
 
+class Model;
+class Skeleton;
+class Texture;
+class RenderQueue;
+
+//TODO: Render: Remove obsolete RenderJobs and fix standard values on variables.
+
+struct RenderJob
+{
+	friend class RenderQueue;
+
+	float Depth;
+
+protected:
+	uint64_t Hash;
+
+	virtual void CalculateHash() = 0;
+
+	bool operator<(const RenderJob& rhs)
+	{
+		return this->Hash < rhs.Hash;
+	}
+};
+
+struct ModelJob : RenderJob
+{
+	unsigned int ShaderID = 0;
+	unsigned int TextureID = 0;
+
+    //TODO: RENDERER: Not sure if the best solution for pickingColor to entity link is this
+    EntityID Entity;
+
+	glm::mat4 ModelMatrix;
+	const Texture* DiffuseTexture;
+	const Texture* NormalTexture;
+	const Texture* SpecularTexture;
+	float Shininess = 0.f;
+	glm::vec4 Color;
+	const Model* Model = nullptr;
+	unsigned int StartIndex = 0;
+	unsigned int EndIndex = 0;
+
+	// Animation
+	Skeleton* Skeleton = nullptr;
+	bool NoRootMotion = true;
+	std::string AnimationName;
+	double AnimationTime = 0;
+
+	void CalculateHash() override
+	{
+		Hash = TextureID;
+	}
+};
 
-/*
 struct SpriteJob : RenderJob
 {
 	unsigned int ShaderID = 0;
@@ -46,53 +94,62 @@ struct PointLightJob : RenderJob
 		Hash = 0;
 	}
 };
-*/
 
-struct RenderScene
+class RenderQueue
 {
-    ::Camera* Camera;
-    std::list<std::shared_ptr<RenderJob>> ForwardJobs;
-    std::list<std::shared_ptr<RenderJob>> PointLightJobs;
-    Rectangle Viewport;
+public:
+	template <typename T>
+	void Add(T &job)
+	{
+		job.CalculateHash();
+		Jobs.push_back(std::shared_ptr<T>(new T(job)));
+		m_Size++;
+	}
+
+	void Sort()
+	{
+		Jobs.sort();
+	}
 
 	void Clear()
 	{
-        ForwardJobs.clear();
-        PointLightJobs.clear();
+		Jobs.clear();
+		m_Size = 0;
+	}
+
+	int Size() const { return m_Size; }
+	std::list<std::shared_ptr<RenderJob>>::const_iterator begin()
+	{
+		return Jobs.begin();
+	}
+
+	std::list<std::shared_ptr<RenderJob>>::const_iterator end()
+	{
+		return Jobs.end();
+	}
+
+	std::list<std::shared_ptr<RenderJob>> Jobs;
+
+private:
+	int m_Size = 0;
+};
+
+struct RenderQueueCollection
+{
+	RenderQueue Forward;
+	RenderQueue Lights;
+
+	void Clear()
+	{
+		Forward.Clear();
+		Lights.Clear();
+	}
+
+	void Sort()
+	{
+		Forward.Sort();
+		Lights.Sort();
 	}
 };
 
-struct RenderFrame
-{
-public:
-
-    void Add(RenderScene &scene)
-    {
-        RenderScenes.push_back(std::shared_ptr<RenderScene>(new RenderScene(scene)));
-        m_Size++;
-    }
-
-    void Clear()
-    {
-        RenderScenes.clear();
-        m_Size = 0;
-    }
-
-    int Size() const { return m_Size; }
-    std::list<std::shared_ptr<RenderScene>>::const_iterator begin()
-    {
-        return RenderScenes.begin();
-    }
-
-    std::list<std::shared_ptr<RenderScene>>::const_iterator end()
-    {
-        return RenderScenes.end();
-    }
-
-    std::list<std::shared_ptr<RenderScene>> RenderScenes;
-    
-private:
-    int m_Size = 0;
-};
-
 #endif

include/Engine/Rendering/RenderQueueFactory.h

@@ -0,0 +1,31 @@
+#ifndef RenderQueueFactory_h__
+#define RenderQueueFactory_h__
+
+#include "../Core/World.h"
+#include "RenderQueue.h"
+#include "../Core/ResourceManager.h"
+#include "Model.h"
+#include "../GLM.h"
+
+class RenderQueueFactory
+{
+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;
+
+    void FillModels(World* world, RenderQueue* renderQueue);
+    void FillLights(World* world, RenderQueue* renderQueue);
+
+    glm::mat4 ModelMatrix(World* world, EntityID entity);
+};
+
+#endif

include/Engine/Rendering/RenderSystem.h

@@ -1,55 +0,0 @@
-#ifndef RenderSystem_h__
-#define RenderSystem_h__
-
-#include "../Core/System.h"
-#include "RenderQueue.h"
-#include "../GLM.h"
-#include "../OpenGL.h"
-#include "../Core/ResourceManager.h"
-#include "ESetCamera.h"
-#include "Model.h"
-#include "../Core/EKeyDown.h"
-#include "../Input/EInputCommand.h"
-#include "Camera.h"
-#include "ModelJob.h"
-#include "Renderer.h"
-#include "PointLightJob.h"
-#include "../Core/Transform.h"
-#include "DebugCameraInputController.h"
-
-class RenderSystem : public ImpureSystem
-{
-public:
-    RenderSystem(EventBroker* eventBrokerer, const IRenderer* renderer, RenderFrame* renderFrame);
-    ~RenderSystem();
-
-    virtual void Update(World* world, double dt) override;
-
-private:
-    World* m_World = nullptr;
-    const IRenderer* m_Renderer;
-
-    RenderFrame* m_RenderFrame;
-    bool m_SwitchCamera = false;
-    Camera* m_Camera;
-    DebugCameraInputController<RenderSystem>* m_DebugCameraInputController;
-    
-    std::list<ComponentWrapper> m_CameraComponents;
-
-    EventRelay<RenderSystem, Events::SetCamera> m_ESetCamera;
-    bool OnSetCamera(const Events::SetCamera &event);
-    EntityID m_CurrentCamera = EntityID_Invalid;
-
-    void switchCamera(EntityID entity);
-
-    void updateCamera(World* world, double dt);
-    void updateProjectionMatrix(ComponentWrapper& cameraComponent);
-    
-    void fillModels(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
-    void fillLight(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
-
-    EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;
-    bool OnInputCommand(const Events::InputCommand& e);
-};
-
-#endif

include/Engine/Rendering/Renderer.h

@@ -12,34 +12,34 @@
 #include "../Core/World.h"
 #include "PickingPass.h"
 #include "DrawScenePass.h"
+#include "DebugCameraInputController.h"
 #include "LightCullingPass.h"
 #include "DrawFinalPass.h"
+
 #include "../Core/EventBroker.h"
+#include "EPicking.h"
 #include "ImGuiRenderPass.h"
-#include "Camera.h"
-#include "../Core/Transform.h"
 
 class Renderer : public IRenderer
 {
 public:
-    Renderer(EventBroker* eventBroker, World* world) 
+    Renderer(EventBroker* eventBroker) 
         : m_EventBroker(eventBroker)
-        , m_World(world)
     { }
 
     virtual void Initialize() override;
     virtual void Update(double dt) override;
-    virtual void Draw(RenderFrame& frame) override;
-
-    virtual PickData Pick(glm::vec2 screenCoord) override;
+    virtual void Draw(RenderQueueCollection& rq) override;
 
 private:
     //----------------------Variables----------------------//
     EventBroker* m_EventBroker;
-    World* m_World;
+
+    std::shared_ptr<DebugCameraInputController<Renderer>> m_DebugCameraInputController;
 
     Texture* m_ErrorTexture;
     Texture* m_WhiteTexture;
+    float m_CameraMoveSpeed;
 
     Model* m_ScreenQuad;
     Model* m_UnitQuad;
@@ -61,8 +61,6 @@ private:
     //void PickingPass(RenderQueueCollection& rq);
     void DrawScreenQuad(GLuint textureToDraw);
 
-    static bool DepthSort(const std::shared_ptr<RenderJob> &i, const std::shared_ptr<RenderJob> &j) { return (i->Depth < j->Depth); }
-    void FillDepth(RenderScene& scene);
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
 	//--------------------ShaderPrograms-------------------//
 	ShaderProgram* m_BasicForwardProgram;

include/Engine/Rendering/Util/UnorderedMapiVec2.h

@@ -1,24 +0,0 @@
-#pragma once
-#ifndef UnorderedMapiVec2_h__
-#define UnorderedMapiVec2_h__
-
-#include <functional>
-#include <boost/functional/hash.hpp>
-#include <glm/vec2.hpp>
-
-template<>
-struct std::hash<glm::ivec2>
-{
-    inline std::size_t operator()(const glm::ivec2 &v) const
-    {
-        return boost::hash<float>()(v.x) ^ boost::hash<float>()(v.y);
-    }
-
-    inline bool operator()(const glm::ivec2& a, const glm::ivec2& b)const
-    {
-        return a.x == b.x && a.y == b.y;
-    }
-
-};
-
-#endif

include/Engine/Sound/EContinueSound.h

@@ -1,17 +0,0 @@
-#ifndef Events_ContinueSound_h__
-#define Events_ContinueSound_h__
-
-#include "Core/EventBroker.h"
-#include "Core/Entity.h"
-
-namespace Events
-{
-// Continues to play a sound from where it was paused.
-struct ContinueSound : Event
-{
-    EntityID EmitterID;
-};
-
-}
-
-#endif

include/Engine/Sound/EPauseSound.h

@@ -1,17 +0,0 @@
-#ifndef Events_PauseSound_h__
-#define Events_PauseSound_h__
-
-#include "Core/EventBroker.h"
-#include "Core/Entity.h"
-
-namespace Events
-{
-// Pauses a playing sound
-struct PauseSound : Event
-{
-    EntityID EmitterID;
-};
-
-}
-
-#endif

include/Engine/Sound/EPlayBackgroundMusic.h

@@ -1,18 +0,0 @@
-#ifndef Events_PlayBackgroundMusic_h__
-#define Events_PlayBackgroundMusic_h__
-
-#include <string>
-#include "Core/Entity.h"
-#include "Core/Event.h"
-
-namespace Events
-{
-// Play a sound that will be heared the same anywhere
-struct PlayBackgroundMusic : public Event
-{
-    std::string FilePath = "";
-};
-
-}
-
-#endif

include/Engine/Sound/EPlaySoundOnEntity.h

@@ -1,21 +0,0 @@
-#ifndef Events_PlaySoundOnEntity_h__
-#define Events_PlaySoundOnEntity_h__
-
-#include <string>
-#include "Core/Entity.h"
-#include "Core/Event.h"
-
-namespace Events
-{
-
-// Plays a sound on an entity with a SoundEmitter component attached.
-// Sound behavior is thereby specified in the SoundEmitter component.
-struct PlaySoundOnEntity : public Event
-{
-    EntityID EmitterID = 0;
-    std::string FilePath = "";
-};
-
-}
-
-#endif

include/Engine/Sound/EPlaySoundOnPosition.h

@@ -1,26 +0,0 @@
-#ifndef Events_PlaySoundOnPosition_h__
-#define Events_PlaySoundOnPosition_h__
-
-#include <string>
-#include <glm/common.hpp>
-#include "Core/Event.h"
-
-namespace Events
-{
-
-// Plays a sound on a given position. Idk if this would be useful.
-struct PlaySoundOnPosition : public Event
-{
-    glm::vec3 Position = glm::vec3(0);
-    std::string FilePath = "";
-    float Gain = 1;
-    float Pitch = 1;
-    bool Loop = false;
-    float MaxDistance = 20;
-    float RollOffFactor = 1;
-    float ReferenceDistance = 1;
-};
-
-}
-
-#endif

include/Engine/Sound/ESetBGMGain.h

@@ -1,16 +0,0 @@
-#ifndef Events_SetBGMGain_h__
-#define Events_SetBGMGain_h__
-
-#include "Core/Event.h"
-
-namespace Events
-{
-// Set the "volume" for all background sounds
-struct SetBGMGain : public Event
-{
-    float Gain;
-};
-
-}
-
-#endif

include/Engine/Sound/ESetSFXGain.h

@@ -1,16 +0,0 @@
-#ifndef Events_SetSFXGain_h__
-#define Events_SetSFXGain_h__
-
-#include "Core/Event.h"
-
-namespace Events
-{
-// Set the "volume" for all effect sounds
-struct SetSFXGain : public Event
-{
-    float Gain;
-};
-
-}
-
-#endif

include/Engine/Sound/EStopSound.h

@@ -1,17 +0,0 @@
-#ifndef Events_StopSound_h__
-#define Events_StopSound_h__
-
-#include "Core/EventBroker.h"
-#include "Core/Entity.h"
-
-namespace Events
-{
-// Stops a sound emitter, and will also delete it.
-struct StopSound : Event
-{
-    EntityID EmitterID;
-};
-
-}
-
-#endif

include/Engine/Sound/Sound.h

@@ -1,113 +0,0 @@
-#ifndef Sound_h__
-#define Sound_h__
-
-#include "Core/ResourceManager.h"
-
-class Sound : public Resource
-{
-    friend class ResourceManager;
-public:
-    Sound(std::string path) { m_Buffer = LoadFile(path); m_Path = path; }
-    ~Sound() { ClearBuffer(); }
-    ALuint Buffer() { return m_Buffer; }
-    std::string Path() { return m_Path; }
-    float Gain() { return m_Gain; }
-    void SetGain(float value) { m_Gain = value; }
-    void ClearBuffer() { alDeleteBuffers(1, &m_Buffer); m_BufferCache.clear(); };
-
-private:
-    float m_Gain = 1;
-    ALuint m_Buffer;
-    std::string m_Path;
-
-    // File info
-    char m_Type[4];
-    unsigned long m_Size, m_ChunkSize;
-    short m_FormatType, m_Channels;
-    unsigned long m_SampleRate, m_AvgBytesPerSec;
-    short m_BytesPerSample, m_BitsPerSample;
-    unsigned int m_DataSize;
-    std::map<std::string, ALuint> m_BufferCache;
-
-    ALuint LoadFile(std::string path)
-    {
-        if (m_BufferCache.find(path) != m_BufferCache.end()) {
-            return m_BufferCache[path];
-        }
-
-        // Open file
-        FILE *fp = fopen(path.c_str(), "rb");
-        if (!fp) {
-            printf("Sound: Failed to open file %s, no such file exists", path.c_str());
-            return 0;
-        }
-
-        //CHECK FOR VALID WAVE-FILE
-        fread(m_Type, sizeof(char), 4, fp);
-        if (m_Type[0] != 'R' || m_Type[1] != 'I' || m_Type[2] != 'F' || m_Type[3] != 'F') {
-            printf("ERROR: No RIFF in WAVE-file");
-            return 0;
-        }
-
-        fread(&m_Size, 4 * sizeof(char), 1, fp);
-        fread(m_Type, sizeof(char), 4, fp);
-        if (m_Type[0] != 'W' || m_Type[1] != 'A' || m_Type[2] != 'V' || m_Type[3] != 'E') {
-            printf("ERROR: Not WAVE-file");
-            return 0;
-        }
-
-        fread(m_Type, sizeof(char), 4, fp);
-        if (m_Type[0] != 'f' || m_Type[1] != 'm' || m_Type[2] != 't' || m_Type[3] != ' ') {
-            printf("ERROR: No fmt in WAVE-file");
-            return 0;
-        }
-
-        // READ THE DATA FROM WAVE-FILE
-        fread(&m_ChunkSize, 4 * sizeof(char), 1, fp);
-        fread(&m_FormatType, 2 * sizeof(char), 1, fp);
-        fread(&m_Channels, 2 * sizeof(char), 1, fp);
-        fread(&m_SampleRate, 4 * sizeof(char), 1, fp);
-        fread(&m_AvgBytesPerSec, 4 * sizeof(char), 1, fp);
-        fread(&m_BytesPerSample, 2 * sizeof(char), 1, fp);
-        fread(&m_BitsPerSample, 2 * sizeof(char), 1, fp);
-
-        fread(m_Type, sizeof(char), 4, fp);
-        if (m_Type[0] != 'd' || m_Type[1] != 'a' || m_Type[2] != 't' || m_Type[3] != 'a') {
-            printf("ERROR: WAVE-file Missing data");
-            return 0;
-        }
-
-        fread(&m_DataSize, 4 * sizeof(char), 1, fp);
-
-        unsigned char* buf = new unsigned char[m_DataSize];
-        fread(buf, sizeof(char), m_DataSize, fp);
-        fclose(fp);
-
-        // Create buffer
-        ALuint format = 0;
-        if (m_BitsPerSample == 8) {
-            if (m_Channels == 1) {
-                format = AL_FORMAT_MONO8;
-            } else if (m_Channels == 2) {
-                format = AL_FORMAT_STEREO8;
-            }
-        }
-        if (m_BitsPerSample == 16) {
-            if (m_Channels == 1) {
-                format = AL_FORMAT_MONO16;
-            } else if (m_Channels == 2) {
-                format = AL_FORMAT_STEREO16;
-            }
-        }
-
-        ALuint buffer;
-        alGenBuffers(1, &buffer);
-        alBufferData(buffer, format, buf, m_DataSize, m_SampleRate);
-        delete[] buf;
-
-        m_BufferCache[path] = buffer;
-        return buffer;
-    }
-};
-
-#endif

include/Engine/Sound/SoundSystem.h

@@ -1,101 +0,0 @@
-#ifndef SoundSystem_h__
-#define SoundSystem_h__
-
-#include <unordered_map>
-
-#include "glm/common.hpp"
-#include "glm/gtx/rotate_vector.hpp" // Calculate Up vector
-#include "OpenAL/al.h"
-#include "OpenAL/alc.h"
-
-#include "Core/World.h"
-#include "Core/EventBroker.h"
-#include "Core/Transform.h" // Absolute transform
-#include "Sound/Sound.h"
-#include "Sound/EPlaySoundOnEntity.h"
-#include "Sound/EPlaySoundOnPosition.h"
-#include "Sound/EPlayBackgroundMusic.h"
-#include "Sound/EPauseSound.h"
-#include "Sound/EContinueSound.h"
-#include "Sound/EStopSound.h"
-#include "Sound/ESetBGMGain.h"
-#include "Sound/ESetSFXGain.h"
-
-enum class SoundType {
-    SFX,
-    BGM
-};
-
-struct Source
-{
-    Source() { }
-    Sound* SoundResource = nullptr;
-    ALuint ALsource;
-    SoundType Type;
-};
-
-class SoundSystem
-{
-public:
-    SoundSystem() { }
-    SoundSystem(World* world, EventBroker* eventBroker, bool editorMode);
-    ~SoundSystem();
-    // Update emitters / listener
-    void Update(double dt); 
-private:
-    // Help functions for working with OpenaAL
-    void setListenerPos(glm::vec3 pos) { alListener3f(AL_POSITION, pos.x, pos.y, pos.z); };
-    void setListenerVel(glm::vec3 vel) { alListener3f(AL_VELOCITY, vel.x, vel.y, vel.z); };
-    void setListenerOri(glm::vec3 ori);
-    glm::vec3 listnerPos() { glm::vec3 pos; alGetListener3f(AL_POSITION, &pos.x, &pos.y, &pos.z); return pos; };
-    glm::vec3 listenerVel() { glm::vec3 vel; alGetListener3f(AL_VELOCITY, &vel.x, &vel.y, &vel.z); return vel; };
-    glm::vec3 listenerOri() { glm::vec3 ori; alGetListener3f(AL_ORIENTATION, &ori.x, &ori.y, &ori.z); return ori; };
-    void setSourcePos(ALuint source, glm::vec3 pos) { ALfloat spos[3] = { pos.x, pos.y, pos.z };  alSourcefv(source, AL_POSITION, spos); };
-    void setSourceVel(ALuint source, glm::vec3 vel) { ALfloat svel[3] = { vel.x, vel.y, vel.z };  alSourcefv(source, AL_VELOCITY, svel); };
-
-    // Logic 
-    void initOpenAL();
-    void updateEmitters(double dt);
-    void updateListener(double dt);
-    void deleteInactiveEmitters();
-    void addNewEmitters(double dt);
-    Source* createSource(std::string filePath);
-    void playSound(Source* source);
-    void stopSound(Source* source);
-    void stopEmitters();
-    ALenum getSourceState(ALuint source);
-    void setGain(Source* source, float gain);
-    void setSoundProperties(ALuint source, ComponentWrapper* soundComponent);
-
-    // OpenAL system variables
-    ALCdevice* m_ALCdevice = nullptr;
-    ALCcontext* m_ALCcontext = nullptr;
-
-    // Logic
-    World* m_World = nullptr;
-    EventBroker* m_EventBroker = nullptr;
-    std::unordered_map<EntityID, Source*> m_Sources;
-    float m_BGMVolumeChannel = 1.0f;
-    float m_SFXVolumeChannel = 1.f;
-    bool m_EditorEnabled = false;
-
-    // Events
-    EventRelay<SoundSystem, Events::PlaySoundOnEntity> m_EPlaySoundOnEntity;
-    bool OnPlaySoundOnEntity(const Events::PlaySoundOnEntity &e);
-    EventRelay<SoundSystem, Events::PlaySoundOnPosition> m_EPlaySoundOnPosition;
-    bool OnPlaySoundOnPosition(const Events::PlaySoundOnPosition &e);
-    EventRelay<SoundSystem, Events::PlayBackgroundMusic> m_EPlayBackgroundMusic;
-    bool OnPlayBackgroundMusic(const Events::PlayBackgroundMusic &e);
-    EventRelay<SoundSystem, Events::PauseSound> m_EPauseSound;
-    bool OnPauseSound(const Events::PauseSound &e);
-    EventRelay<SoundSystem, Events::StopSound> m_EStopSound;
-    bool OnStopSound(const Events::StopSound &e);
-    EventRelay<SoundSystem, Events::ContinueSound> m_EContinueSound;
-    bool OnContinueSound(const Events::ContinueSound &e);
-    EventRelay<SoundSystem, Events::SetBGMGain> m_ESetBGMGain; 
-    bool OnSetBGMGain(const Events::SetBGMGain &e); // Not tested
-    EventRelay<SoundSystem, Events::SetSFXGain> m_ESetSFXGain; 
-    bool OnSetSFXGain(const Events::SetSFXGain &e); // Not tested
-};
-
-#endif

include/Game/Events/ESpawnerSpawn.h

@@ -1,18 +0,0 @@
-#ifndef ESpawnerSpawn_h__
-#define ESpawnerSpawn_h__
-
-#include "Core/Event.h"
-#include "Core/EntityWrapper.h"
-
-namespace Events
-{
-
-struct SpawnerSpawn : Event
-{
-    EntityWrapper Spawner;
-    EntityWrapper Parent;
-};
-
-}
-
-#endif

include/Game/Game.h

@@ -8,17 +8,16 @@
 #include "Core/InputManager.h"
 #include "GUI/Frame.h"
 #include "Core/World.h"
+#include "Rendering/RenderQueueFactory.h"
 #include "Input/InputProxy.h"
 #include "Input/KeyboardInputHandler.h"
 #include "Input/MouseInputHandler.h"
 #include "Core/EKeyDown.h"
-#include "Core/EntityFilePreprocessor.h"
+#include "Core/EntityXMLFile.h"
 #include "Core/SystemPipeline.h"
+#include "RaptorCopterSystem.h"
+#include "PlayerSystem.h"
 #include "Editor/EditorSystem.h"
-#include "Core/EntityFile.h"
-#include "Rendering/RenderSystem.h"
-#include "Core/EntityFileParser.h"
-#include "Core/Octree.h"
 
 // Network
 #include <boost/thread.hpp>
@@ -26,8 +25,6 @@
 #include "Network/Server.h"
 #include "Network/Client.h"
 
-// Sound
-#include "Sound/SoundSystem.h"
 
 class Game
 {
@@ -47,10 +44,8 @@ private:
     InputProxy* m_InputProxy;
 	GUI::Frame* m_FrameStack;
     World* m_World;
-    Octree<AABB>* m_OctreeCollision;
-    Octree<AABB>* m_OctreeFrustrumCulling;
     SystemPipeline* m_SystemPipeline;
-    RenderFrame* m_RenderFrame;
+    RenderQueueFactory* m_RenderQueueFactory;
     // Network variables
     boost::thread m_NetworkThread;
 
@@ -59,11 +54,8 @@ private:
     Network* m_ClientOrServer;
     bool m_IsClientOrServer = false;
 
-    // Sound
-    SoundSystem* m_SoundSystem;
-
-    //EventRelay<Game, Events::InputCommand> m_EInputCommand;
-    //bool debugOnInputCommand(const Events::InputCommand& e);
+    EventRelay<Game, Events::InputCommand> m_EInputCommand;
+    bool debugOnInputCommand(const Events::InputCommand& e);
 
     void debugInitialize();
     void debugTick(double dt);

include/Game/HealthSystem.h

@@ -6,9 +6,9 @@
 
 #include "Common.h"
 #include "Core/System.h"
-#include "Core/EPlayerDamage.h"
-#include "Core/EPlayerHealthPickup.h"
-#include "Core/EPlayerDeath.h"
+#include "Core\EPlayerDamage.h";
+#include "Core\EPlayerHealthPickup.h";
+#include "Core\EPlayerDeath.h";
 
 #include <tuple>
 #include <vector>
@@ -19,7 +19,7 @@ public:
     HealthSystem(EventBroker* eventBroker);
 
     //updatecomponent
-    virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) override;
+    virtual void UpdateComponent(World* world, ComponentWrapper& health, double dt) override;
 
 private:
     //methods which will take care of specific events

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

@@ -0,0 +1,16 @@
+#include "Common.h"
+#include "Core/System.h"
+
+class RaptorCopterSystem : public PureSystem
+{
+public:
+    RaptorCopterSystem(EventBroker* eventBroker)
+        : PureSystem(eventBroker, "RaptorCopter")
+    { }
+
+    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"];
+    }
+};

include/Game/Systems/PlayerMovementSystem.h

@@ -1,14 +0,0 @@
-#include "Common.h"
-#include "GLM.h"
-#include "Core/System.h"
-
-class PlayerMovementSystem : public PureSystem
-{
-public:
-    PlayerMovementSystem(EventBroker* eventBroker)
-        : System(eventBroker)
-        , PureSystem("Player")
-    { }
-
-    virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt);
-};

include/Game/Systems/PlayerSpawnSystem.h

@@ -1,18 +0,0 @@
-#include "Core/System.h"
-#include "Input/EInputCommand.h"
-#include "Systems/SpawnerSystem.h"
-#include "Events/ESpawnerSpawn.h"
-
-class PlayerSpawnSystem : public ImpureSystem
-{
-public:
-    PlayerSpawnSystem(EventBroker* eventBroker);
-
-    virtual void Update(World* world, double dt) override;
-
-private:
-    EventRelay<PlayerSpawnSystem, Events::InputCommand> m_OnInputCommand;
-    bool OnInputCommand(const Events::InputCommand& e);
-
-    std::vector<int> m_SpawnRequests;
-};

include/Game/Systems/RaptorCopterSystem.h

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

include/Game/Systems/SpawnerSystem.h

@@ -1,25 +0,0 @@
-#ifndef SpawnerSystem_h__
-#define SpawnerSystem_h__
-
-#include <random>
-#include "Common.h"
-#include "GLM.h"
-#include "Core/System.h"
-#include "Events/ESpawnerSpawn.h"
-#include "Core/Transform.h"
-#include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
-
-class SpawnerSystem : public System
-{
-public:
-    SpawnerSystem(EventBroker* eventBroker);
-
-    static EntityWrapper Spawn(EntityWrapper spawner, EntityWrapper parent = EntityWrapper::Invalid);
-
-private:
-    EventRelay<SpawnerSystem, Events::SpawnerSpawn> m_OnSpawnerSpawn;
-    bool OnSpawnerSpawn(Events::SpawnerSpawn& e);
-};
-
-#endif

resources/DefaultConfig.ini

@@ -2,9 +2,7 @@
 LogLevel=1
 LoadMap=
 EditorEnabled=false
-; if true -> Pool allocation is not used when calling Allocate/Free, just use regular dynamic allocation. 
-; if false -> Use pool allocation.
-DisableMemoryPool=false
+
 
 [Video]
 Fullscreen=false
@@ -18,7 +16,4 @@ StartNetwork=false
 IsServer=false
 Name=Bob
 Address=127.0.0.1
-Port=13
-
-[Multithreading]
-ResourceLoading=true
+Port=13

resources/DefaultInput.ini

@@ -6,10 +6,10 @@ InvertPitch=false
 MouseLeft=PrimaryFire
 MouseX=Yaw
 MouseY=Pitch
-W=Forward,1
-S=Forward,-1
-D=Right,1
-A=Right,-1
+W=+Forward
+S=-Forward
+D=+Right
+A=-Right
 R=Reload
 Space=Jump
 LeftControl=Crouch

resources/Licenses/OpenAL.txt

@@ -1,510 +0,0 @@
-This file is part of the OpenAL software.
-
-The licenses which components of this software fall under are as follows.
-All components are under a LGPL license.
-
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-

resources/Schema/Components.xsd

@@ -2,20 +2,12 @@
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="components" elementFormDefault="qualified">
 	<xs:include schemaLocation="Components/Transform.xsd"/>
-	<xs:include schemaLocation="Components/Physics.xsd"/>
 	<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/Camera.xsd"/>
 	<xs:include schemaLocation="Components/AABB.xsd"/>
 	<xs:include schemaLocation="Components/PointLight.xsd"/>
 	<xs:include schemaLocation="Components/Trigger.xsd"/>
 	<xs:include schemaLocation="Components/Health.xsd"/>
-	<xs:include schemaLocation="Components/Listener.xsd"/>
-	<xs:include schemaLocation="Components/SoundEmitter.xsd"/>
-	<xs:include schemaLocation="Components/Collidable.xsd"/>
-	<xs:include schemaLocation="Components/Spawner.xsd"/>
-	<xs:include schemaLocation="Components/SpawnPoint.xsd"/>
-	<xs:include schemaLocation="Components/PlayerSpawn.xsd"/>
-	<xs:include schemaLocation="Components/Team.xsd"/>
 </xs:schema>

resources/Schema/Components/AABB.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<AABB xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="AABB.xsd">
-	<Origin X="0" Y="0" Z="0"/>
-	<Size X="1" Y="1" Z="1"/>
-</AABB>
+<c:AABB>
+	<BoxCenter X="0" Y="0" Z="0"/>
+	<BoxSize X="1" Y="1" Z="1"/>
+</c:AABB>

resources/Schema/Components/AABB.xsd

@@ -6,12 +6,8 @@
 	<xs:element name="AABB">
 		<xs:complexType>
 			<xs:all>
-				<xs:element name="Origin" type="t:Vector" minOccurs="0">
-					<xs:annotation><xs:documentation>Middle point of the bounding box</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="Size" type="t:Vector" minOccurs="0">
-					<xs:annotation><xs:documentation>Size of the bounding box</xs:documentation></xs:annotation>
-				</xs:element>
+				<xs:element name="BoxCenter" type="t:Vector" minOccurs="0"/>
+				<xs:element name="BoxSize" type="t:Vector" minOccurs="0"/>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/Camera.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Camera xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Camera.xsd">
-	<Name>cam</Name>
-	<FOV>45</FOV>
-	<NearClip>0.01</NearClip>
-	<FarClip>5000</FarClip>
-</Camera>

resources/Schema/Components/Camera.xsd

@@ -1,21 +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="Camera">
-		<xs:annotation>
-			<xs:documentation>It's a camera thingy!</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="Name" type="t:string" minOccurs="0"/>
-				<xs:element name="FOV" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>Vertical Field of View in degrees</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="NearClip" type="t:double" minOccurs="0"/>
-				<xs:element name="FarClip" type="t:double" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Collidable.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Collidable xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Collidable.xsd">
-</Collidable>

resources/Schema/Components/Collidable.xsd

@@ -1,8 +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="Collidable">
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Health.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Health xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Health.xsd">
+<c:Health>
 	<Health>100</Health>
 	<MaxHealth>100</MaxHealth>
-</Health>
+</c:Health>

resources/Schema/Components/Listener.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Listener xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Listener.xsd"/>

resources/Schema/Components/Listener.xsd

@@ -1,8 +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="Listener">
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Model.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Model.xsd">
+<c:Model>
 	<Resource></Resource>
 	<Color R="1" G="1" B="1" A="1"/>
 	<Visible>true</Visible>
-</Model>
+</c:Model>

resources/Schema/Components/Physics.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Physics xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Physics.xsd">
-	<Velocity X="0" Y="0" Z="0"/>
-	<Gravity>true</Gravity>
-</Physics>

resources/Schema/Components/Physics.xsd

@@ -1,17 +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="Physics">
-		<xs:annotation>
-			<xs:documentation>Physics stuff</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="Velocity" type="t:Vector" minOccurs="0"/>
-				<xs:element name="Gravity" type="t:bool" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Player.xml

@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Player xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Player.xsd">
+<c:Player>
 	<Velocity X="0" Y="0" Z="0"/>
 	<Forward>false</Forward>
 	<Left>false</Left>
 	<Back>false</Back>
 	<Right>false</Right>
-</Player>
+</c:Player>

resources/Schema/Components/PlayerSpawn.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<PlayerSpawn xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="PlayerSpawn.xsd"/>