Commitiing assets

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "assets"]
 	path = assets
-	url = https://imon.nu/git/BTH/Axyz-assets.git
+	url = tacticalz@1.drake.imon.nu:TacticalZ-assets
 [submodule "deps"]
 	path = deps
-	url = https://imon.nu/git/BTH/Axyz-deps.git
+	url = tacticalz@1.drake.imon.nu:TacticalZ-deps

include/Engine/Collision/Collision.h

@@ -12,7 +12,7 @@
 #include "../Core/AABB.h"
 #include "Rendering/RawModelCustom.h"
 //#include "Rendering/RawModelAssimp.h"
-#include "../Core/TransformSystem.h"
+#include "../Core/Transform.h"
 #include "../Core/Entity.h"
 #include "../Core/EntityWrapper.h"
 #include "EntityAABB.h"
@@ -48,13 +48,13 @@ bool RayVsTriangle(const Ray& ray,
     bool trueOnNegativeDistance = false);
 //Return true if the ray hits any of the triangles in the model. Stops checking when a hit is detected.
 bool RayVsModel(const Ray& ray,
-    const std::vector<glm::vec3>& modelVertices,
+    const RawModel::Vertex* modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix);
 //Return true if the ray hits any of the triangles in the model.
 //Also returns the position of the intersection point. Will loop through all the whole model indices.
 bool RayVsModel(const Ray& ray,
-    const std::vector<glm::vec3>& modelVertices,
+    const RawModel::Vertex* modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix,
     glm::vec3& outHitPosition);
@@ -62,7 +62,7 @@ bool RayVsModel(const Ray& ray,
 //Also returns the distance from the ray origin to the closest 
 //intersection point, and the barycentric u,v-coordinates. Will loop through all the whole model indices.
 bool RayVsModel(const Ray& ray,
-    const std::vector<glm::vec3>& modelVertices,
+    const RawModel::Vertex* modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix,
     float& outDistance,
@@ -70,7 +70,7 @@ bool RayVsModel(const Ray& ray,
     float& outVCoord);
 
 bool AABBvsTriangles(const AABB& box,
-    const std::vector<glm::vec3>& modelVertices,
+    const RawModel::Vertex* modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix,
     glm::vec3& boxVelocity,
@@ -80,19 +80,7 @@ bool AABBvsTriangles(const AABB& box,
 
 //Detects collision, but does not resolve.
 bool AABBvsTriangles(const AABB& box,
-    const std::vector<glm::vec3>& modelVertices,
+    const RawModel::Vertex* modelVertices,
-    const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix);
-
-enum Output
-{
-    OutContained,
-    OutSeparated,
-    OutIntersecting
-};
-//Detects intersection and containment.
-Output AABBvsTrianglesWContainment(const AABB& box,
-    const std::vector<glm::vec3>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix);
 

include/Engine/Collision/CollisionSystem.h

@@ -24,7 +24,6 @@ public:
 private:
     Octree<EntityAABB>* m_Octree;
     std::vector<EntityAABB> m_OctreeResult;
-    std::unordered_map<EntityWrapper, glm::vec3> m_PrevPositions;
 };
 
 #endif

include/Engine/Core/ComponentInfo.h

@@ -2,7 +2,6 @@
 #define ComponentInfo_h__
 
 #include "../Common.h"
-#include "Entity.h"
 #include <boost/shared_array.hpp>
 
 struct ComponentInfo
@@ -22,7 +21,6 @@ struct ComponentInfo
     {
         std::string Name;
         std::string Type;
-        unsigned char Index;
         unsigned int Offset;
         unsigned int Stride;
     };
@@ -34,16 +32,6 @@ struct ComponentInfo
     unsigned int Stride = 0;
     boost::shared_array<char> Defaults = nullptr;
 	std::shared_ptr<Meta_t> Meta = nullptr;
-
-    std::size_t GetHeaderSize() const
-    {
-        std::size_t size = 0;
-
-        // A component block starts with an entity ID
-        size += sizeof(EntityID);
-
-        return size;
-    }
 };
 
 template<>

include/Engine/Core/ComponentPool.h

@@ -5,15 +5,16 @@
 #include "MemoryPool.h"
 #include "ComponentInfo.h"
 #include "ComponentWrapper.h"
-#include "DirtySet.h"
 
-
-class ComponentPool;
 class ComponentPoolForwardIterator
 	: public std::iterator<std::forward_iterator_tag, ComponentWrapper>
 {
 public:
-    ComponentPoolForwardIterator(ComponentPool* pool, const MemoryPool<char>::iterator begin, const MemoryPool<char>::iterator end);
+    ComponentPoolForwardIterator(const ComponentInfo& componentInfo, const MemoryPool<char>::iterator begin, const MemoryPool<char>::iterator end) 
+        : m_ComponentInfo(componentInfo)
+        , m_MemoryPoolIterator(begin)
+        , m_MemoryPoolEnd(end)
+    { }
 
 	ComponentPoolForwardIterator(const ComponentPoolForwardIterator& other) = default;
 	ComponentPoolForwardIterator(ComponentPoolForwardIterator&& other) = default;
@@ -26,7 +27,6 @@ public:
 	ComponentWrapper operator*() const;
 
 private:
-    ComponentPool* m_ComponentPool;
     const ComponentInfo& m_ComponentInfo;
 	MemoryPool<char>::iterator m_MemoryPoolIterator;
 	const MemoryPool<char>::iterator m_MemoryPoolEnd;
@@ -34,7 +34,6 @@ private:
 
 class ComponentPool
 {
-    friend class ComponentPoolForwardIterator;
 public:
 	typedef ComponentPoolForwardIterator iterator;
 	typedef ptrdiff_t difference_type;
@@ -43,10 +42,9 @@ public:
 	typedef ComponentWrapper* pointer;
 	typedef ComponentWrapper& reference;
 
-    ComponentPool(const ::ComponentInfo& ci, World* world) 
+    ComponentPool(const ::ComponentInfo& ci) 
         : m_ComponentInfo(ci)
-        , m_Pool(ci.Meta->Allocation, ci.GetHeaderSize() + ci.Stride)
+        , m_Pool(ci.Meta->Allocation, sizeof(EntityID) + ci.Stride)
-        , m_World(world)
     { }
     ~ComponentPool();
 	ComponentPool(const ComponentPool& other);
@@ -63,8 +61,8 @@ public:
     // Delete a component and free its memory
     void Delete(ComponentWrapper& wrapper);
 
-    iterator begin();
+	iterator begin() const;
-	iterator end();
+	iterator end() const;
     size_t size() const;
 
 	//Dumps information about what the pool memory looks like right now 
@@ -82,8 +80,6 @@ private:
     ::ComponentInfo m_ComponentInfo;
     MemoryPool<char> m_Pool;
     std::unordered_map<EntityID, char*> m_EntityToComponent;
-    DirtySet m_DirtySet;
-    World* m_World;
 };
 
 #endif

include/Engine/Core/ComponentWrapper.h

@@ -4,32 +4,46 @@
 #include <boost/shared_array.hpp>
 #include <boost/any.hpp>
 #include "../Common.h"
-#include "../GLM.h"
 #include "Entity.h"
 #include "ComponentInfo.h"
-#include "DirtySet.h"
 #include "Util/Any.h"
 
-class World;
+template <typename T, typename Enable = void>
+struct ComponentField { };
+
+template <typename T>
+struct ComponentField<T, typename std::enable_if<std::is_trivially_copyable<T>::value>::type>
+{
+    static T& Get(const ComponentInfo::Field_t& info, char* data) { return *reinterpret_cast<T*>(data); }
+    static void Set(const ComponentInfo::Field_t& info, char* data, const T& value) { Get(data) = value; }
+};
+
+template <>
+struct ComponentField<std::string, void>
+{
+    static std::string& Get(const ComponentInfo::Field_t& info, char* data) { return **reinterpret_cast<std::string**>(data); }
+    static void Set(const ComponentInfo::Field_t& info, char* data, const std::string& value) { Get(info, data) = value; }
+};
 
 struct ComponentWrapper
 {
-    ComponentWrapper(const ComponentInfo& componentInfo, char* data, ::DirtyBitField* dirtyBitField, World* world);
+    ComponentWrapper(const ComponentInfo& componentInfo, char* data)
+        : Info(componentInfo)
+        , EntityID(*reinterpret_cast<::EntityID*>(data))
+        , Data(data + sizeof(::EntityID))
+    { }
 
-    World* m_World;
     const ComponentInfo& Info;
     const ::EntityID EntityID;
     char* Data;
-    ::DirtyBitField* DirtyBitField = nullptr;
 
-    ComponentInfo::EnumType Enum(const char* fieldName, const char* enumKey);
+    ComponentInfo::EnumType Enum(const char* fieldName, const char* enumKey)
-
+    {
-    bool Dirty(DirtySetType type, const std::string& fieldName);
+        return Info.Meta->FieldEnumDefinitions.at(fieldName).at(enumKey);
-    void SetDirty(DirtySetType type, const std::string& fieldName, bool dirty = true);
+    }
-    void SetAllDirty(const std::string& fieldName, bool dirty = true);
 
     template <typename T>
-    T& Field(const std::string& name)
+    T& Field(std::string name)
     {
         const ComponentInfo::Field_t& field = Info.Fields.at(name);
         if (sizeof(T) > field.Stride) {
@@ -41,15 +55,13 @@ struct ComponentWrapper
     }
 
     template <typename T>
-    void SetField(const std::string& name, const T& value) 
+    void SetField(std::string name, const T value) { Field<T>(name) = value; }
-    { 
+    //template <typename T>
-        Field<T>(name) = value; 
+    //void SetField(std::string name, T& value) { Field<T>(name) = value; }
-        SetAllDirty(name);
-    }
 
     // Specialization for string literals
     template <std::size_t N>
-    void SetField(const std::string& name, const char(&value)[N]) { SetField(name, std::string(value)); }
+    void SetField(std::string name, const char(&value)[N]) { Field<std::string>(name) = std::string(value); }
 
     void Copy(ComponentWrapper& destination)
     {
@@ -83,163 +95,40 @@ struct ComponentWrapper
     struct SubscriptProxy
     {
         friend struct ComponentWrapper;
-  
+    private:
-    public:
+        SubscriptProxy(ComponentWrapper* component, std::string propertyName)
-        SubscriptProxy(ComponentWrapper* component, std::string fieldName)
             : m_Component(component)
-            , m_FieldName(fieldName)
+            , m_PropertyName(propertyName)
         { }
 
         ComponentWrapper* m_Component;
-        std::string m_FieldName;
+        std::string m_PropertyName;
 
     public:
         // Return the integer value of an enum type key for this field
-        ComponentInfo::EnumType Enum(const char* enumKey) { return m_Component->Enum(m_FieldName.c_str(), enumKey); }
+        ComponentInfo::EnumType Enum(const char* enumKey) { return m_Component->Enum(m_PropertyName.c_str(), enumKey); }
-        bool Dirty(DirtySetType type) { return m_Component->Dirty(type, m_FieldName); }
-        void SetDirty(DirtySetType type, bool dirty = true) { m_Component->SetDirty(type, m_FieldName, dirty); }
-        void SetAllDirty(bool dirty = true) { m_Component->SetAllDirty(m_FieldName, dirty); }
 
-        operator const double&() { return m_Component->Field<double>(m_FieldName); }
-        operator const float&() { return m_Component->Field<float>(m_FieldName); }
-        operator const int&() { return m_Component->Field<int>(m_FieldName); }
-        operator const glm::vec3&() { return m_Component->Field<glm::vec3>(m_FieldName); }
-        operator const glm::vec4&() { return m_Component->Field<glm::vec4>(m_FieldName); }
-        operator const glm::quat&() { return m_Component->Field<glm::quat>(m_FieldName); }
-        operator const bool&() { return m_Component->Field<bool>(m_FieldName); }
-        operator const std::string&() { return m_Component->Field<std::string>(m_FieldName); }
-
-        // Don't allow non-const references
-        // If this wasn't deleted, the above overloads would still get called for some reason...
-        template <
-            typename T,
-            typename = typename std::enable_if<!std::is_base_of<::FIELDLOL, T>::value>::type
-        >
-        //operator T&() = delete;
-        operator T&() { static_assert(constexpr(false), "https://github.com/teamfisk/TacticalZ/pull/212"); }
-
-        // Value assignment
         template <typename T>
-        void operator=(const T& val) { m_Component->SetField<T>(m_FieldName, val); }
+        operator T&() { return m_Component->Field<T>(m_PropertyName); }
+
+        template <typename T>
+        void operator=(const T val) { m_Component->SetField<T>(m_PropertyName, val); }
+        // TODO: Pass by reference and rvalue (universal reference?)
+        //template <typename T>
+        //void operator=(T& val) { m_Component->SetField<T>(m_PropertyName, val); }
 
         // Specialization for string literals
         template <std::size_t N>
-        void operator=(const char(&val)[N]) { m_Component->SetField<N>(m_FieldName, val); }
+        void operator=(const char(&val)[N]) { m_Component->SetField<N>(m_PropertyName, val); }
     };
-    SubscriptProxy operator[](const std::string& propertyName) { return SubscriptProxy(this, propertyName); }
+    SubscriptProxy operator[](std::string propertyName) { return SubscriptProxy(this, propertyName); }
 };
 
-struct FIELDLOL { }; // lol
-
-template <typename T>
-struct FieldBase : FIELDLOL
-{
-    FieldBase(ComponentWrapper::SubscriptProxy& Proxy)
-        : Proxy(Proxy)
-        , Data(Proxy.m_Component->Field<T>(Proxy.m_FieldName))
-    { }
-
-    void SetAllDirty() { Proxy.SetAllDirty(); }
-
-    FieldBase& operator=(const FieldBase& rhs) { Data = rhs.Data; SetAllDirty(); return *this; }
-    FieldBase& operator=(const T& rhs) { Data = rhs; SetAllDirty(); return *this; }
-
-    template <typename T2> FieldBase& operator+=(const T2& rhs) { Data += rhs; SetAllDirty(); return *this; }
-    template <typename T2> FieldBase& operator-=(const T2& rhs) { Data -= rhs; SetAllDirty(); return *this; }
-    template <typename T2> FieldBase& operator*=(const T2& rhs) { Data *= rhs; SetAllDirty(); return *this; }
-    template <typename T2> FieldBase& operator/=(const T2& rhs) { Data /= rhs; SetAllDirty(); return *this; }
-    template <typename T2> FieldBase& operator%=(const T2& rhs) { Data %= rhs; SetAllDirty(); return *this; }
-    template <typename T2> FieldBase& operator&=(const T2& rhs) { Data &= rhs; SetAllDirty(); return *this; }
-    template <typename T2> FieldBase& operator|=(const T2& rhs) { Data |= rhs; SetAllDirty(); return *this; }
-    template <typename T2> FieldBase& operator^=(const T2& rhs) { Data ^= rhs; SetAllDirty(); return *this; }
-    template <typename T2> FieldBase& operator<<=(const T2& rhs) { Data <<= rhs; SetAllDirty(); return *this; }
-    template <typename T2> FieldBase& operator>>=(const T2& rhs) { Data >>= rhs; SetAllDirty(); return *this; }
-
-    T operator+() const { return +Data; }
-    T operator-() const { return -Data; }
-    T operator~() const { return ~Data; }
-
-    FieldBase& operator++() { Data++; SetAllDirty(); return *this; }
-    T operator++(int) { T tmp = Data; operator++(); return tmp; }
-    FieldBase& operator--() { Data--; SetAllDirty(); return *this; }
-    T operator--(int) { T tmp = Data; operator--(); return tmp; }
-
-    operator const T&() const { return Data; }
-    const T& operator*() const { return operator const T&(); }
-
-protected:
-    ComponentWrapper::SubscriptProxy Proxy;
-    T& Data;
-};
-
-template <typename T>
-struct Field : FieldBase<T>
-{
-    using FieldBase<T>::FieldBase;
-    using FieldBase<T>::operator=;
-};
-
-template <>
-struct Field<glm::vec3> : FieldBase<glm::vec3>
-{
-    using FieldBase<glm::vec3>::FieldBase;
-    using FieldBase<glm::vec3>::operator=;
-
-    glm::vec3::value_type x() const { return Data.x; }
-    void x(glm::vec3::value_type val) { Data.x = val; SetAllDirty(); }
-    glm::vec3::value_type y() const { return Data.y; }
-    void y(glm::vec3::value_type val) { Data.y = val; SetAllDirty(); }
-    glm::vec3::value_type z() const { return Data.z; }
-    void z(glm::vec3::value_type val) { Data.z = val; SetAllDirty(); }
-
-    template <typename T> friend glm::vec3 operator+(const Field<glm::vec3>& lhs, const T& rhs) { return static_cast<glm::vec3>(lhs) + glm::vec3(rhs); }
-    template <typename T> friend glm::vec3 operator-(const Field<glm::vec3>& lhs, const T& rhs) { return static_cast<glm::vec3>(lhs) - glm::vec3(rhs); }
-    template <typename T> friend glm::vec3 operator*(const Field<glm::vec3>& lhs, const T& rhs) { return static_cast<glm::vec3>(lhs) * glm::vec3(rhs); }
-    template <typename T> friend glm::vec3 operator/(const Field<glm::vec3>& lhs, const T& rhs) { return static_cast<glm::vec3>(lhs) / glm::vec3(rhs); }
-    template <typename T> friend glm::vec3 operator+(const T& lhs, const Field<glm::vec3>& rhs) { return glm::vec3(lhs) + static_cast<glm::vec3>(rhs); }
-    template <typename T> friend glm::vec3 operator-(const T& lhs, const Field<glm::vec3>& rhs) { return glm::vec3(lhs) - static_cast<glm::vec3>(rhs); }
-    template <typename T> friend glm::vec3 operator*(const T& lhs, const Field<glm::vec3>& rhs) { return glm::vec3(lhs) * static_cast<glm::vec3>(rhs); }
-    template <typename T> friend glm::vec3 operator/(const T& lhs, const Field<glm::vec3>& rhs) { return glm::vec3(lhs) / static_cast<glm::vec3>(rhs); }
-
-    friend glm::vec3& operator+=(glm::vec3& lhs, const Field<glm::vec3>& rhs) { lhs += *rhs; return lhs; }
-};
-
-template <>
-struct Field<glm::vec4> : FieldBase<glm::vec4>
-{
-    //Field(glm::vec4& Data)
-    //    : FieldBase(Data)
-    //{ }
-    using FieldBase<glm::vec4>::FieldBase;
-    using FieldBase<glm::vec4>::operator=;
-
-    glm::vec4::value_type x() const { return Data.x; }
-    void x(glm::vec4::value_type val) { Data.x = val; SetAllDirty(); }
-    glm::vec4::value_type y() const { return Data.y; }
-    void y(glm::vec4::value_type val) { Data.y = val; SetAllDirty(); }
-    glm::vec4::value_type z() const { return Data.z; }
-    void z(glm::vec4::value_type val) { Data.z = val; SetAllDirty(); }
-    glm::vec4::value_type w() const { return Data.w; }
-    void w(glm::vec4::value_type val) { Data.w = val; SetAllDirty(); }
-
-    template <typename T> friend glm::vec4 operator+(const Field<glm::vec4>& lhs, const T& rhs) { return static_cast<glm::vec4>(lhs) + glm::vec4(rhs); }
-    template <typename T> friend glm::vec4 operator-(const Field<glm::vec4>& lhs, const T& rhs) { return static_cast<glm::vec4>(lhs) - glm::vec4(rhs); }
-    template <typename T> friend glm::vec4 operator*(const Field<glm::vec4>& lhs, const T& rhs) { return static_cast<glm::vec4>(lhs) * glm::vec4(rhs); }
-    template <typename T> friend glm::vec4 operator/(const Field<glm::vec4>& lhs, const T& rhs) { return static_cast<glm::vec4>(lhs) / glm::vec4(rhs); }
-    template <typename T> friend glm::vec4 operator+(const T& lhs, const Field<glm::vec4>& rhs) { return glm::vec4(lhs) + static_cast<glm::vec4>(rhs); }
-    template <typename T> friend glm::vec4 operator-(const T& lhs, const Field<glm::vec4>& rhs) { return glm::vec4(lhs) - static_cast<glm::vec4>(rhs); }
-    template <typename T> friend glm::vec4 operator*(const T& lhs, const Field<glm::vec4>& rhs) { return glm::vec4(lhs) * static_cast<glm::vec4>(rhs); }
-    template <typename T> friend glm::vec4 operator/(const T& lhs, const Field<glm::vec4>& rhs) { return glm::vec4(lhs) / static_cast<glm::vec4>(rhs); }
-
-    friend glm::vec4& operator+=(glm::vec4& lhs, const Field<glm::vec4>& rhs) { lhs += *rhs; return lhs; }
-};
-
-
 // A component wrapper that "owns" its data through a shared pointer
 struct SharedComponentWrapper : ComponentWrapper
 {
     SharedComponentWrapper(const ComponentInfo& componentInfo, boost::shared_array<char> data)
-        : ComponentWrapper(componentInfo, data.get(), nullptr, nullptr)
+        : ComponentWrapper(componentInfo, data.get())
         , m_DataReference(data)
     { }
 

include/Engine/Core/DirtySet.h

@@ -1,16 +0,0 @@
-#ifndef DirtySet_h__
-#define DirtySet_h__
-
-#include <set>
-#include "ComponentInfo.h"
-
-enum class DirtySetType
-{
-    Transform,
-    Network
-};
-
-typedef std::unordered_map<DirtySetType, std::set<decltype(ComponentInfo::Field_t::Index)>> DirtyBitField;
-typedef std::unordered_map<EntityID, DirtyBitField> DirtySet;
-
-#endif

include/Engine/Core/ECaptured.h

@@ -1,5 +1,5 @@
-#ifndef Events_Captured_h__
+#ifndef ECaptured_h__
-#define Events_Captured_h__
+#define ECaptured_h__
 
 #include "EventBroker.h"
 #include "../Core/Entity.h"
@@ -12,9 +12,7 @@ namespace Events
 struct Captured : Event
 {
     int TeamNumberThatCapturedCapturePoint;
-    EntityID CapturePointTakenID;
+    EntityID CapturePointID;
-    EntityWrapper BlueTeamNextCapturePoint;
-    EntityWrapper RedTeamNextCapturePoint;
 };
 
 }

include/Engine/Core/EEntityDeleted.h

@@ -2,14 +2,14 @@
 #define EEntityDeleted_h__
 
 #include "Event.h"
-#include "EntityWrapper.h"
+#include "Entity.h"
 
 namespace Events
 {
 
 struct EntityDeleted : Event
 {
-    EntityWrapper DeletedEntity;
+    EntityID DeletedEntity;
     // True if the entity deletion was triggered because the entity's parent was deleted before it
     bool Cascaded;
 };

include/Engine/Core/EPlayerDeath.h

@@ -10,9 +10,8 @@ namespace Events
 struct PlayerDeath : Event
 {
     //KilledBy,KilledByWhat is optional for now. It might be used later in the playerlog-system
-    EntityWrapper Player = EntityWrapper::Invalid;
+    EntityWrapper Player;
-    EntityWrapper Killer = EntityWrapper::Invalid;
+    std::string KilledByWhat;
-    std::string KilledByWhat = "";
 };
 
 }

include/Engine/Core/EntityFile.h

@@ -1,21 +1,164 @@
 #ifndef EntityFile_h__
 #define EntityFile_h__
 
-#include "World.h"
+#include <stack>
-#include "EntityXMLFile.h"
+#include <boost/lexical_cast.hpp>
-#include "EntityXMLFilePreprocessor.h"
+#include <xercesc/util/XercesDefs.hpp>
-#include "EntityXMLFileParser.h"
+#include <xercesc/util/PlatformUtils.hpp>
-#include "EntityWrapper.h"
+#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>
 
-class EntityFile : private World, public Resource
+#include "../GLM.h"
+#include "Util/XercesString.h"
+#include "ResourceManager.h"
+#include "Entity.h"
+#include "ComponentInfo.h"
+
+class EntityFileHandler
 {
+    friend class EntityFileSAXHandler;
 public:
-    EntityFile(std::string path);
+    // @param EntityID The entity found
-
+    // @param EntityID The parent of the entity
-    EntityWrapper MergeInto(World* other);
+    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:
-    EntityID m_RootEntity = EntityID_Invalid;
+    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 unsigned int 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,19 +1,18 @@
-#ifndef EntityXMLFileParser_h__
+#ifndef EntityFileParser_h__
-#define EntityXMLFileParser_h__
+#define EntityFileParser_h__
 
-#include "EntityXMLFile.h"
+#include "EntityFile.h"
 #include "World.h"
 
-class EntityXMLFileParser
+class EntityFileParser
 {
-    friend class EntityFile;
 public:
-    EntityXMLFileParser(const EntityXMLFile* entityFile);
+    EntityFileParser(const EntityFile* entityFile);
 
-private:
     EntityID MergeEntities(World* world, EntityID baseParent = EntityID_Invalid);
 
-    const EntityXMLFile* m_EntityFile;
+private:
+    const EntityFile* m_EntityFile;
     EntityFileHandler m_Handler;
     World* m_World = nullptr;
     EntityID m_FirstEntity = EntityID_Invalid;

include/Engine/Core/EntityFilePreprocessor.h

@@ -1,5 +1,5 @@
-#ifndef EntityXMLFilePreprocessor_h__
+#ifndef EntityFilePreprocessor_h__
-#define EntityXMLFilePreprocessor_h__
+#define EntityFilePreprocessor_h__
 
 #include <xercesc/framework/psvi/XSElementDeclaration.hpp>
 #include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
@@ -17,18 +17,17 @@
 #include "Util/XercesString.h"
 #include "ResourceManager.h"
 #include "World.h"
-#include "EntityXMLFile.h"
+#include "EntityFile.h"
 
-class EntityXMLFilePreprocessor
+class EntityFilePreprocessor
 {
-    friend class EntityFile;
 public:
-    EntityXMLFilePreprocessor(const EntityXMLFile* entityFile);
+    EntityFilePreprocessor(const EntityFile* entityFile);
 
-private:
     void RegisterComponents(World* world);
 
-    const EntityXMLFile* m_EntityFile;
+private:
+    const EntityFile* m_EntityFile;
     std::map<std::string, unsigned int> m_ComponentCounts;
 	std::map<std::string, ComponentInfo> m_ComponentInfo;
 

include/Engine/Core/EntityFileWriter.h

@@ -1,5 +1,5 @@
-#ifndef EntityXMLFileWriter_h__
+#ifndef EntityFileWriter_h__
-#define EntityXMLFileWriter_h__
+#define EntityFileWriter_h__
 
 #include <boost/filesystem.hpp>
 #include <xercesc/dom/DOM.hpp>
@@ -8,13 +8,13 @@
 #include <xercesc/framework/LocalFileFormatTarget.hpp>
 
 #include "Util/XercesString.h"
-#include "EntityXMLFile.h"
+#include "EntityFile.h"
 #include "World.h"
 
-class EntityXMLFileWriter
+class EntityFileWriter
 {
 public:
-    EntityXMLFileWriter(boost::filesystem::path file)
+    EntityFileWriter(boost::filesystem::path file)
         : m_FilePath(file)
     {
         using namespace xercesc;

include/Engine/Core/EntityWrapper.h

@@ -23,31 +23,22 @@ struct EntityWrapper
 
     static const EntityWrapper Invalid;
 
-    const std::string Name() const;
+    const std::string Name();
     bool HasComponent(const std::string& componentType);
     void AttachComponent(const char* componentName);
     EntityWrapper Parent();
-    EntityWrapper FirstParentByName(const std::string& parentEntityName);
     EntityWrapper FirstChildByName(const std::string& name);
-    EntityWrapper FirstLevelChildByName(const std::string& name);
     EntityWrapper FirstParentWithComponent(const std::string& componentType);
-    EntityWrapper Clone(EntityWrapper parent = EntityWrapper::Invalid);
-    std::vector<EntityWrapper> ChildrenWithComponent(const std::string& componentType);
-    void DeleteChildren();
     bool IsChildOf(EntityWrapper potentialParent);
     bool Valid() const;
 
     ComponentWrapper operator[](const char* componentName);
-    ComponentWrapper operator[](const std::string& componentName);
     bool operator==(const EntityWrapper& e) const;
     bool operator!=(const EntityWrapper& e) const;
     explicit operator EntityID() const;
 
 private:
     EntityWrapper firstChildByNameRecursive(const std::string& name, EntityID parent);
-    void childrenWithComponentRecursive(const std::string& componentType, EntityWrapper& entity, std::vector<EntityWrapper>& childrenWithComponent);
-    static void fillRelationships(std::unordered_multimap<EntityWrapper, EntityWrapper>& relationMap, EntityWrapper entity);
-    static void recreateRelationships(const std::unordered_multimap<EntityWrapper, EntityWrapper>& relationMap, EntityWrapper templateEntity, EntityWrapper parent = EntityWrapper::Invalid);
 };
 
 namespace std

include/Engine/Core/EntityXMLFile.h

@@ -1,164 +0,0 @@
-#ifndef EntityXMLFile_h__
-#define EntityXMLFile_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 EntityXMLFile : public Resource
-{
-    friend class ResourceManager;
-    friend class EntityFileSAXHandler;
-private:
-    EntityXMLFile(boost::filesystem::path path);
-    ~EntityXMLFile();
-
-public:
-    static unsigned int 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/MemoryPool.h

@@ -118,6 +118,9 @@ public:
 		else {
 			m_ExtraMemory.push_back((char*)malloc(m_Stride));
 			//We should preferably not enter here to avoid performance issues. Set more numMaxElements in constructor instead.
+            if (!DisableMemoryPool::Value) {
+			    LOG_DEBUG("Allocated slots exceed Pool size, extra memory allocated dynamically. Pool size: %u, dynamic size: %u.", m_NumSlots, m_ExtraMemory.size());
+            }
 			return m_ExtraMemory.back();
 		}
 	}

include/Engine/Core/PerformanceTimer.h

@@ -2,11 +2,8 @@
 #define PerformanceTimer_h__
 
 #include "../Common.h"
-
-#ifdef DEBUG
 #include <boost/timer/timer.hpp>
 using boost::timer::cpu_timer;
-#endif //DEBUG
 
 class PerformanceTimer
 {
@@ -20,11 +17,9 @@ public:
     static void CreateExcelData();
 
 private:
-#ifdef DEBUG
     static std::map<std::string, cpu_timer> timers;
     static cpu_timer m_Timer;
     static std::string currentTimerRunning;
-#endif //DEBUG
 };
 
 #endif

include/Engine/Core/ResourceManager.h

@@ -19,7 +19,6 @@ class Resource
 
 protected:
 	Resource() { }
-    virtual ~Resource() = default;
 
 public:
     //Should be thrown in a Resource's constructor if it cannot complete because another resource is still loading.

include/Engine/Core/System.h

@@ -68,7 +68,7 @@ protected:
 
     const std::string m_ComponentType;
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cFade, double dt) = 0;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPlayer, double dt) = 0;
 };
 
 class ImpureSystem : public virtual System

include/Engine/Core/SystemPipeline.h

@@ -81,7 +81,7 @@ public:
             for (auto& pair : group.PureSystems) {
                 const std::string& componentName = pair.first;
                 auto& systems = pair.second;
-                ComponentPool* pool = m_World->GetComponents(componentName);
+                const ComponentPool* pool = m_World->GetComponents(componentName);
                 if (pool == nullptr) {
                     continue;
                 }

include/Engine/Core/Transform.h

@@ -0,0 +1,25 @@
+#ifndef Transform_h__
+#define Transform_h__
+
+#include "../GLM.h"
+#include "World.h"
+#include "EntityWrapper.h"
+
+namespace Transform
+{
+
+glm::mat4 AbsoluteTransformation(EntityWrapper entity);
+glm::vec3 AbsolutePosition(EntityWrapper entity);
+glm::vec3 AbsolutePosition(World* world, EntityID entity);
+glm::vec3 AbsoluteOrientationEuler(EntityWrapper entity);
+glm::quat AbsoluteOrientation(EntityWrapper entity);
+glm::quat AbsoluteOrientation(World* world, EntityID entity);
+glm::vec3 AbsoluteScale(EntityWrapper entity);
+glm::vec3 AbsoluteScale(World* world, EntityID entity);
+glm::mat4 ModelMatrix(EntityWrapper entity);
+glm::mat4 ModelMatrix(EntityID entity, World* world);
+glm::vec3 TransformPoint(const glm::vec3& point, const glm::mat4& matrix);
+
+}
+
+#endif

include/Engine/Core/TransformSystem.h

@@ -1,39 +0,0 @@
-#ifndef Transform_h__
-#define Transform_h__
-
-#include "../GLM.h"
-#include "System.h"
-#include "EEntityDeleted.h"
-
-class TransformSystem : public System
-{
-public:
-    TransformSystem(SystemParams params);
-
-    //glm::mat4 AbsoluteTransformation(EntityWrapper entity);
-    static glm::vec3 AbsolutePosition(EntityWrapper entity);
-    static glm::vec3 AbsolutePosition(World* world, EntityID entity);
-    static glm::vec3 AbsoluteOrientationEuler(EntityWrapper entity);
-    static glm::quat AbsoluteOrientation(EntityWrapper entity);
-    static glm::quat AbsoluteOrientation(World* world, EntityID entity);
-    static glm::vec3 AbsoluteScale(EntityWrapper entity);
-    static glm::vec3 AbsoluteScale(World* world, EntityID entity);
-    static glm::mat4 ModelMatrix(EntityWrapper entity);
-    static glm::mat4 ModelMatrix(EntityID entity, World* world);
-    static glm::vec3 TransformPoint(const glm::vec3& point, const glm::mat4& matrix);
-
-    static int RecalculatedPositions;
-    static int RecalculatedOrientations;
-    static int RecalculatedScales;
-
-private:
-    static std::unordered_map<EntityWrapper, glm::vec3> PositionCache;
-    static std::unordered_map<EntityWrapper, glm::quat> OrientationCache;
-    static std::unordered_map<EntityWrapper, glm::vec3> ScaleCache;
-    static std::unordered_map<EntityWrapper, glm::mat4> MatrixCache;
-
-    EventRelay<TransformSystem, Events::EntityDeleted> m_EEntityDeleted;
-    bool OnEntityDeleted(const Events::EntityDeleted& e);
-};
-
-#endif

include/Engine/Core/World.h

@@ -6,7 +6,6 @@
 #include "ObjectPool.h"
 #include "ComponentPool.h"
 #include "EventBroker.h"
-struct EntityWrapper;
 
 class World
 {
@@ -19,13 +18,13 @@ public:
     World(const World& other);
 
     // Create empty entity
-    EntityID CreateEntity(EntityID parent = EntityID_Invalid);
+    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(const ComponentInfo& ci);
+    void RegisterComponent(ComponentInfo& ci);
     // Attach a component to an entity and fill it with default values
     ComponentWrapper AttachComponent(EntityID entity, const std::string& componentType);
     // Check if an entity has a component
@@ -35,13 +34,13 @@ public:
     // Delete a component off an entity
     void DeleteComponent(EntityID entity, const std::string& componentType);
     // Get all components of the specified type
-    ComponentPool* GetComponents(const std::string& componentType);
+    const ComponentPool* GetComponents(const std::string& componentType);
     // Get entity parent
     EntityID GetParent(EntityID entity);
     // Change the parent of an entity
     void SetParent(EntityID entity, EntityID parent);
     // Get children of an entity
-    const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetDirectChildren(EntityID 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
@@ -50,12 +49,6 @@ public:
     void SetName(EntityID entity, const std::string& name);
     // Get the textual name of an entity
     std::string GetName(EntityID entity) const;
-    // Get the first entity in the world with the name.
-    EntityWrapper GetFirstEntityByName(const std::string& name);
-
-    // Merge another world into this one
-    // Returns a map that maps entities from the other world to their copies in this one
-    std::unordered_map<EntityID, EntityID> Merge(const World* other);
 
 private:
     EventBroker* m_EventBroker = nullptr;

include/Engine/Editor/EditorCameraInputController.h

@@ -12,8 +12,8 @@ template <typename EventContext>
 class EditorCameraInputController : public FirstPersonInputController<EventContext>
 {
 public:
-    EditorCameraInputController(EventBroker* eventBroker, unsigned int playerID, EntityWrapper playerEntity)
+    EditorCameraInputController(EventBroker* eventBroker, unsigned int playerID)
-        : FirstPersonInputController(eventBroker, playerID, playerEntity)
+        : FirstPersonInputController(eventBroker, playerID)
     {
         EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &EditorCameraInputController::OnMousePress);
         EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &EditorCameraInputController::OnMouseRelease);
@@ -104,11 +104,6 @@ protected:
         if (!m_Enabled) {
             return false;
         }
-            
-        ImGuiIO& io = ImGui::GetIO();
-        if (io.WantCaptureMouse || io.WantCaptureKeyboard) {
-            return false;
-        }
 
         m_SpeedMultiplier += e.DeltaY * (0.1 * m_SpeedMultiplier);
         m_Config->Set("Editor.CameraSpeed", m_SpeedMultiplier);

include/Engine/Editor/EditorGUI.h

@@ -22,7 +22,6 @@
 #include "../Core/ELockMouse.h"
 #include "../Core/EFileDropped.h"
 #include "../Rendering/Texture.h"
-#include "Game/Events/ESpawnerSpawn.h"
 
 class EditorGUI
 {
@@ -74,12 +73,6 @@ public:
     // Called when the user means to rename an entity.
     typedef std::function<void(EntityWrapper, const std::string&)> OnEntityChangeName_t;
     void SetEntityChangeNameCallback(OnEntityChangeName_t f) { m_OnEntityChangeName = f; }
-    // Called when the user pastes an entity previously "copied"
-    // @param EntityWrapper The entity to copy
-    // @param EntityWrapper The entity to parent the new copy to
-    // @return The new copy of the entity
-    typedef std::function<EntityWrapper(EntityWrapper, EntityWrapper)> OnEntityPaste_t;
-    void SetEntityPasteCallback(OnEntityPaste_t f) { m_OnEntityPaste = f; }
     // Called when the user means to attach a new component to an entity.
     typedef std::function<void(EntityWrapper, const std::string&)> OnComponentAttach_t;
     void SetComponentAttachCallback(OnComponentAttach_t f) { m_OnComponentAttach = f; }
@@ -118,7 +111,6 @@ private:
     std::string m_DroppedFile = "";
     bool m_Paused = false;
     bool m_MouseLocked = false;
-    EntityWrapper m_CopyTarget = EntityWrapper::Invalid;
 
     // Callbacks
     OnEntitySelectedCallback_t m_OnEntitySelected = nullptr;
@@ -132,7 +124,6 @@ private:
     OnComponentDelete_t m_OnComponentDelete = nullptr;
     OnWidgetMode_t m_OnWidgetMode = nullptr;
     OnWidgetSpace_t m_OnWidgetSpace = nullptr;
-    OnEntityPaste_t m_OnEntityPaste = nullptr;
 
     // Events
     EventRelay<EditorGUI, Events::KeyDown> m_EKeyDown;

include/Engine/Editor/EditorSystem.h

@@ -5,8 +5,9 @@
 #include "../Core/World.h"
 #include "../Core/SystemPipeline.h"
 #include "../Core/ResourceManager.h"
-#include "../Core/EntityFile.h"
+#include "../Core/EntityFilePreprocessor.h"
-#include "../Core/EntityXMLFileWriter.h"
+#include "../Core/EntityFileParser.h"
+#include "../Core/EntityFileWriter.h"
 #include "../Core/EMousePress.h"
 #include "../Input/EInputCommand.h"
 #include "EditorGUI.h"
@@ -47,7 +48,6 @@ private:
     // Utility functions
     EntityWrapper importEntity(EntityWrapper parent, boost::filesystem::path filePath);
     void setWidgetMode(EditorGUI::WidgetMode mode);
-    bool isAnyParentMissingTransform(EntityID entityID);
 
     // GUI callbacks
     void OnEntitySelected(EntityWrapper entity);
@@ -56,7 +56,6 @@ private:
     void OnEntityDelete(EntityWrapper entity);
     void OnEntityChangeParent(EntityWrapper entity, EntityWrapper parent);
     void OnEntityChangeName(EntityWrapper entity, const std::string& name);
-    EntityWrapper OnEntityPaste(EntityWrapper entityToCopy, EntityWrapper parent);
     void OnComponentAttach(EntityWrapper entity, const std::string& componentType);
     void OnComponentDelete(EntityWrapper entity, const std::string& componentType);
     void OnWidgetSpace(EditorGUI::WidgetSpace widgetSpace);

include/Engine/GUI/MainMenuSystem.h

@@ -0,0 +1,33 @@
+#ifndef MainMenuSystem_h__
+#define MainMenuSystem_h__
+
+#include "../Core/System.h"
+#include "../Rendering/IRenderer.h"
+#include "../Core/ResourceManager.h"
+#include "../Core/Event.h"
+
+
+#include "EButtonClicked.h"
+#include "EButtonPressed.h"
+#include "EButtonReleased.h"
+
+
+class MainMenuSystem : public ImpureSystem
+{
+public:
+    MainMenuSystem(SystemParams params, IRenderer* renderer);
+    virtual void Update(double dt) override;
+
+private:
+    IRenderer* m_Renderer;
+
+    EventRelay<MainMenuSystem, Events::ButtonClicked> m_EClicked;
+    bool OnButtonClick(const Events::ButtonClicked& e);
+    EventRelay<MainMenuSystem, Events::ButtonReleased> m_EReleased;
+    bool OnButtonRelease(const Events::ButtonReleased& e);
+    EventRelay<MainMenuSystem, Events::ButtonPressed> m_EPressed;
+    bool OnButtonPress(const Events::ButtonPressed& e);
+
+};
+
+#endif

include/Engine/Input/FirstPersonInputController.h

@@ -6,20 +6,17 @@
 #include "../Core/ELockMouse.h"
 #include "../Game/Events/EDashAbility.h"
 #include "InputHandler.h"
-#include "Rendering/EAutoAnimationBlend.h"
-#include "Rendering/ESetBlendWeight.h"
 
 template <typename EventContext>
 class FirstPersonInputController : public InputController<EventContext>
 {
 public:
-    FirstPersonInputController(EventBroker* eventBroker, int playerID, EntityWrapper playerEntity);
+    FirstPersonInputController(EventBroker* eventBroker, int playerID);
 
     virtual const glm::vec3 Movement() const { return m_Movement; }
     virtual const glm::vec3 Rotation() const { return m_Rotation; }
     virtual bool Jumping() const { return m_Jumping; }
     virtual bool Crouching() const { return m_Crouching; }
-    virtual bool CrouchingLastFrame() const { return m_CrouchingLastFrame; }
     virtual bool DoubleJumping() const { return m_DoubleJumping; }
     virtual void SetDoubleJumping(bool isDoubleJumping) {
         m_DoubleJumping = isDoubleJumping;
@@ -30,24 +27,21 @@ public:
     virtual bool OnCommand(const Events::InputCommand& e) override;
     virtual void Reset();
 
-    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, Field<double> assaultDashCoolDownTimer, EntityID playerID);
+    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer);
     virtual bool AssaultDashDoubleTapped() const { return m_AssaultDashDoubleTapped; }
     virtual bool PlayerIsDashing() const { return m_PlayerIsDashing; }
-    bool SpecialAbilityKeyDown() const { return m_SpecialAbilityKeyDown; }
 
 protected:
     const int m_PlayerID;
-    EntityWrapper m_PlayerEntity;
-
     bool m_MouseLocked = false;
     glm::vec3 m_Rotation;
     glm::vec3 m_Movement;
     bool m_Jumping = false;
     bool m_DoubleJumping = false;
     bool m_Crouching = false;
-    bool m_CrouchingLastFrame = false;
     //assault dash membervariables - needed to calculate the doubletap- and dashlogic
     double m_AssaultDashDoubleTapDeltaTime = 0.0;
+    double m_AssaultDashCoolDownTimer = 0.0;
     //i will let m_AssaultDashDoubleTapSensitivityTimer stay hardcoded, its not really a gamevariable (more an inputvariable), 
     //and its very unlikely that someone wants to change that value
     const float m_AssaultDashDoubleTapSensitivityTimer = 0.25f;
@@ -58,7 +52,7 @@ protected:
     bool m_ShiftDashing = false;
     bool m_ValidDoubleTap = false;
 
-    //specialabilities
+    //specialabilitys
     bool m_MovementKeyDown = false;
     bool m_SpecialAbilityKeyDown = false;
     int m_NumberOfMovementKeysDown = 0;
@@ -70,10 +64,9 @@ protected:
 };
 
 template <typename EventContext>
-FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID, EntityWrapper playerEntity)
+FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID)
     : InputController(eventBroker)
     , m_PlayerID(playerID)
-    , m_PlayerEntity(playerEntity)
 {
     EVENT_SUBSCRIBE_MEMBER(m_ELockMouse, &FirstPersonInputController::OnLockMouse);
     EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &FirstPersonInputController::OnUnlockMouse);
@@ -84,7 +77,6 @@ void FirstPersonInputController<EventContext>::Reset()
 {
     m_Rotation = glm::vec3(0.f, 0.f, 0.f);
     m_Jumping = false;
-    m_CrouchingLastFrame = m_Crouching;
 }
 
 template <typename EventContext>
@@ -113,6 +105,7 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
     if (e.Command == "Pitch") {
         float val = glm::radians(e.Value);
         m_Rotation.x += -val;
+        //m_Rotation.x = glm::clamp(m_Rotation.x, -glm::half_pi<float>(), glm::half_pi<float>());
     }
 
     if (e.Command == "Yaw") {
@@ -124,180 +117,16 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
         if (e.Command == "Forward") {
             float val = glm::clamp(e.Value, -1.f, 1.f);
             m_Movement.z = -val;
-
-            //Animation
-            if (m_PlayerEntity.Valid()) {
-                EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
-                if (playerModel.Valid()) {
-                    if (val > 0) {  // Walk/Run
-                        Events::AutoAnimationBlend aeb;
-                        aeb.Duration = 0.1;
-                        if (m_Crouching) {
-                            aeb.NodeName = "Walk";
-                        } else {
-                            aeb.NodeName = "Run";
-                        }
-                        aeb.RootNode = playerModel;
-                        aeb.Start = true;
-                        aeb.SingleLevelBlend = true;
-                        m_EventBroker->Publish(aeb);
-                    } else if (val < 0) {   // Walk/run Backwards
-                        Events::AutoAnimationBlend aeb;
-                        aeb.Duration = 0.1;
-                        if (m_Crouching) {
-                            aeb.NodeName = "Walk";
-                        } else {
-                            aeb.NodeName = "Run";
-                        }
-                        aeb.RootNode = playerModel;
-                        aeb.Start = true;
-                        aeb.SingleLevelBlend = true;
-                        aeb.Reverse = true;
-                        m_EventBroker->Publish(aeb);
-                    }
-                }
-
-
-                EntityWrapper firstPersonModel = m_PlayerEntity.FirstChildByName("Hands");
-                if (firstPersonModel.Valid()) {
-                    if (val > 0) {  // Walk/Run
-                        if (!m_Crouching) {
-                            Events::AutoAnimationBlend aeb;
-                            aeb.Duration = 0.1;
-                            aeb.NodeName = "Run";
-                            aeb.RootNode = firstPersonModel;
-                            aeb.SingleLevelBlend = true;
-                            aeb.Start = true;
-                            m_EventBroker->Publish(aeb);
-                        }
-                    } else if (val < 0) {   // Walk/run Backwards
-                        if (!m_Crouching) {
-                            Events::AutoAnimationBlend aeb;
-                            aeb.Duration = 0.1;
-                            aeb.NodeName = "Run";
-                            aeb.RootNode = firstPersonModel;
-                            aeb.SingleLevelBlend = true;
-                            aeb.Start = true;
-                            aeb.Reverse = true;
-                            m_EventBroker->Publish(aeb);
-                        }
-                    }
-                }
-            }
         }
         if (e.Command == "Right") {
             float val = glm::clamp(e.Value, -1.f, 1.f);
             m_Movement.x = val;
-
+        }
-
+        if (glm::length2(m_Movement) > 0) {
-            //Animation
+            m_Movement = glm::normalize(m_Movement);
-            if (m_PlayerEntity.Valid()) {
-                EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
-                if (playerModel.Valid()) { //Right Strafe
-                    if (val > 0) {
-                        Events::AutoAnimationBlend aeb;
-                        aeb.Duration = 0.1;
-                        aeb.NodeName = "Right";
-                        aeb.RootNode = playerModel;
-                        aeb.SingleLevelBlend = true;
-                        aeb.Start = true;
-                        m_EventBroker->Publish(aeb);
-                    } else if (val < 0) { //LeftStrafe
-                        Events::AutoAnimationBlend aeb;
-                        aeb.Duration = 0.1;
-                        aeb.NodeName = "Left";
-                        aeb.RootNode = playerModel;
-                        aeb.SingleLevelBlend = true;
-                        aeb.Start = true;
-                        m_EventBroker->Publish(aeb);
-                    }
-                }
-
-                EntityWrapper firstPersonModel = m_PlayerEntity.FirstChildByName("Hands");
-                if (firstPersonModel.Valid()) {
-                    if (val > 0) {  // Walk/Run
-                        if (!m_Crouching) {
-                            Events::AutoAnimationBlend aeb;
-                            aeb.Duration = 0.1;
-                            aeb.NodeName = "Run";
-                            aeb.RootNode = firstPersonModel;
-                            aeb.SingleLevelBlend = true;
-                            aeb.Start = true;
-                            m_EventBroker->Publish(aeb);
-                        }
-                    } else if (val < 0) {   // Walk/run Backwards
-                        if (!m_Crouching) {
-                            Events::AutoAnimationBlend aeb;
-                            aeb.Duration = 0.1;
-                            aeb.NodeName = "Run";
-                            aeb.RootNode = firstPersonModel;
-                            aeb.SingleLevelBlend = true;
-                            aeb.Start = true;
-                            aeb.Reverse = true;
-                            m_EventBroker->Publish(aeb);
-                        }
-                    }
-                }
-            }
         }
     }
 
-    if (m_PlayerEntity.Valid()) {
-        glm::vec2 movementXZ = glm::vec2(m_Movement.x, m_Movement.z);
-        if (glm::length(movementXZ) < 0.1f) {
-            //Blend to Idle
-            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
-            if (playerModel.Valid()) {
-                Events::AutoAnimationBlend aeb;
-                aeb.Duration = 0.1;
-                aeb.NodeName = "Idle";
-                aeb.RootNode = playerModel;
-                aeb.Start = true;
-                m_EventBroker->Publish(aeb);
-            }
-            EntityWrapper firstPersonModel = m_PlayerEntity.FirstChildByName("Hands");
-            if (firstPersonModel.Valid()) {
-                Events::AutoAnimationBlend aeb;
-                aeb.Duration = 0.1;
-                aeb.NodeName = "Idle";
-                aeb.RootNode = firstPersonModel;
-                aeb.Start = true;
-                m_EventBroker->Publish(aeb);
-            }
-        } else {
-            //Blend to movement
-            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
-            if (playerModel.Valid()) {
-                Events::AutoAnimationBlend aeb;
-                aeb.Duration = 0.1;
-                aeb.NodeName = "DirectionBlend";
-                aeb.RootNode = playerModel;
-                m_EventBroker->Publish(aeb);
-            }
-        }
-    }
-
-    if (glm::length(m_Movement) > 0) {
-        m_Movement = glm::normalize(m_Movement);
-
-        //Animation
-        // movement direction blend
-        if (m_PlayerEntity.Valid()) {
-            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
-            if (playerModel.Valid()) {
-                glm::vec2 direction = glm::normalize(glm::vec2(m_Movement.x, m_Movement.z));
-                double weight = glm::abs(glm::dot(glm::vec2(1, 0), direction));
-                Events::SetBlendWeight sbw;
-                sbw.NodeName = "DirectionBlend";
-                sbw.Weight = weight;
-                sbw.RootNode = playerModel;
-                m_EventBroker->Publish(sbw);
-            }
-        }
-    }
-
-        
-
     if (e.Command == "Forward" || e.Command == "Right") {
         if (e.Value != 0) {
             m_CurrentDirectionVector = e.Command == "Right" ? (e.Value > 0 ? "Right" : "Left") : (e.Value > 0 ? "Forward" : "Backward");
@@ -316,10 +145,10 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
             if (m_NumberOfMovementKeysDown == 0) {
                 m_MovementKeyDown = false;
             }
-            //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
+                //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
-            m_AssaultDashTapDirection = m_CurrentDirectionVector;
+                m_AssaultDashTapDirection = m_CurrentDirectionVector;
-            m_AssaultDashDoubleTapDeltaTime = 0.f;
+                m_AssaultDashDoubleTapDeltaTime = 0.f;
-
+            
         }
     }
 
@@ -329,41 +158,20 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
 
     if (e.Command == "Crouch") {
         m_Crouching = e.Value > 0;
-
-
-        //Animation
-        if (m_PlayerEntity.Valid()) {
-            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
-            if (playerModel.Valid()) {
-                if (e.Value == 0.f) {
-                    Events::AutoAnimationBlend aeb;
-                    aeb.Duration = 0.3;
-                    aeb.NodeName = "StandMovement";
-                    aeb.RootNode = playerModel;
-                    aeb.Start = true;
-                    aeb.Restart = true;
-                    aeb.SingleLevelBlend = true;
-                    m_EventBroker->Publish(aeb);
-                } else if(e.Value == 1.0f) {
-                    Events::AutoAnimationBlend aeb;
-                    aeb.Duration = 0.3;
-                    aeb.NodeName = "CrouchMovement";
-                    aeb.RootNode = playerModel;
-                    aeb.Start = true;
-                    aeb.Restart = true;
-                    aeb.SingleLevelBlend = true;
-                    m_EventBroker->Publish(aeb);
-                }
-            }
-        }
-        
     }
 
     if (e.Command == "SpecialAbility") {
-        m_SpecialAbilityKeyDown = e.Value > 0;
+        if (e.Value > 0) {
+            m_SpecialAbilityKeyDown = true;
+        } else {
+            m_SpecialAbilityKeyDown = false;
+        }
+    }
+    if (m_SpecialAbilityKeyDown && m_MovementKeyDown) {
+        m_ShiftDashing = true;
+    } else {
+        m_ShiftDashing = false;
     }
-
-    m_ShiftDashing = m_SpecialAbilityKeyDown && m_MovementKeyDown;
 
     return true;
 }
@@ -383,27 +191,23 @@ bool FirstPersonInputController<EventContext>::OnLockMouse(const Events::LockMou
 }
 
 template <typename EventContext>
-void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, Field<double> assaultDashCoolDownTimer, EntityID playerID) {
+void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer) {
     m_AssaultDashDoubleTapDeltaTime += dt;
-    assaultDashCoolDownTimer -= dt;
+    m_AssaultDashCoolDownTimer -= dt;
     //cooldown = assaultDashCoolDownMaxTimer sec, pretend the dash lasts 0.25 sec (for friction to do its work)
-    if (assaultDashCoolDownTimer > (assaultDashCoolDownMaxTimer - 0.25f)) {
+    if (m_AssaultDashCoolDownTimer > (assaultDashCoolDownMaxTimer - 0.25f)) {
         m_PlayerIsDashing = true;
     } else {
         m_PlayerIsDashing = false;
     }
 
     //dashing with shift
-    if (m_ShiftDashing && assaultDashCoolDownTimer <= 0.0f) {
+    if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f) {
         //player is dashing with shift
         //the wanted-direction is set in playermovement already so we dont need to check what direction we want to dash in!
-        assaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
+        m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
         m_AssaultDashDoubleTapped = true;
         m_AssaultDashDoubleTapDeltaTime = 0.f;
-
-        Events::DashAbility e;
-        e.Player = playerID;
-        m_EventBroker->Publish(e);
         return;
     }
 
@@ -423,7 +227,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     }
     m_ValidDoubleTap = false;
 
-    if (!(assaultDashCoolDownTimer <= 0.0f)) {
+    if (!(m_AssaultDashCoolDownTimer <= 0.0f)) {
         //if we cant dash at the moment, then just reset the tap-sensitivity-timer
         m_AssaultDashDoubleTapDeltaTime = 0.f;
         return;
@@ -431,10 +235,9 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     //ok, we have a valid tap, lets do it
     m_AssaultDashDoubleTapped = true;
     m_AssaultDashDoubleTapDeltaTime = 0.f;
-    assaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
+    m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
 
     Events::DashAbility e;
-    e.Player = playerID;
     m_EventBroker->Publish(e);
 }
 

include/Engine/Input/InputProxy.h

@@ -18,7 +18,7 @@ public:
     
     void LoadBindings(std::string file);
 	void Update(double dt);
-    void Process(bool suppressNewEvents = false);
+    void Process();
     template <typename T>
     void AddHandler();
     void Publish(const Events::InputCommand& e);

include/Engine/Network/Client.h

@@ -10,33 +10,20 @@
 #include <boost/asio.hpp>
 #include <boost/shared_array.hpp>
 
-#include "Network/EKillDeath.h"
-#include "Core/World.h"
-#include "Core/EntityFile.h"
-#include "Core/EventBroker.h"
-#include "Core/ConfigFile.h"
-#include "Core/EPlayerDeath.h"
-#include "Core/EPlayerDamage.h"
-#include "Core/EPlayerSpawned.h"
-#include "Core/EAmmoPickup.h"
-#include "Game/Events/EDoubleJump.h"
-#include "Game/Events/EDashAbility.h"
-#include "Game/Events/EReset.h"
-#include "Input/EInputCommand.h"
-#include "imgui/imgui.h"
 #include "Network/Network.h"
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Network/UDPClient.h"
 #include "Network/TCPClient.h"
 #include "Network/SnapshotDefinitions.h"
-#include "Network/EDisplayServerlist.h"
+#include "Core/World.h"
-#include "Network/EConnectRequest.h"
+#include "Core/EventBroker.h"
-#include "Network/EPlayerDisconnected.h"
+#include "Core/ConfigFile.h"
-#include "Network/ESearchForServers.h"
+#include "Input/EInputCommand.h"
+#include "Core/EPlayerDamage.h"
 #include "Network/EInterpolate.h"
 #include "Network/SnapshotFilter.h"
-#include "Core/EWin.h"
+#include "Core/EPlayerSpawned.h"
 
 class Client : public Network
 {
@@ -46,10 +33,8 @@ public:
     ~Client();
 
     void Connect(std::string address, int port);
-    void Update(double dt) override;
+    void Update() override;
-private:
+
-    UDPClient m_Unreliable;
-    TCPClient m_Reliable;
     std::vector<Events::PlayerSpawned> m_PlayerSpawnEvents;
     void parseSpawnEvents();
     // Save for children
@@ -80,14 +65,14 @@ private:
     // Network logic
     PlayerDefinition m_PlayerDefinitions[8];
     SnapshotDefinitions m_NextSnapshot;
-    double m_DurationOfPingTime = 0;
+    double m_DurationOfPingTime;
-    double m_StartPingTime = 0;
+    std::clock_t m_StartPingTime;
-    double m_TimeSinceSentInputs = 0;
+    std::clock_t m_TimeSinceSentInputs;
-    double m_SendInputInterval = 0.033;
+    unsigned int m_SendInputIntervalMs;
     std::vector<Events::InputCommand> m_InputCommandBuffer;
 
     // Private member functions
-    size_t receive(char* data);
+    size_t  receive(char* data);
     void disconnect();
     void parseMessageType(Packet& packet);
     void updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID);
@@ -97,19 +82,11 @@ private:
     void parseTCPConnect(Packet& packet);
     void parsePlayerConnected(Packet& packet);
     void parsePing();
-    void parseServerlist(Packet& packet);
     void parseKick();
     void parsePlayersSpawned(Packet& packet);
     void parseEntityDeletion(Packet& packet);
-    void parsePlayerDamage(Packet& packet);
     void parseComponentDeletion(Packet& packet);
-    void parseDoubleJump(Packet& packet);
+    void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
-    void parseDashEffect(Packet& packet);
-    void parseAmmoPickup(Packet& packet);
-    void parseRemoveWorld(Packet& packet);
-    void parseKDEvent(Packet& packet);
-    void parseWin(Packet& packet);
-    void InterpolateFields(Packet& packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
     void identifyPacketLoss();
     void hasServerTimedOut();
@@ -117,8 +94,6 @@ private:
     void sendInputCommands();
     void sendLocalPlayerTransform();
     void becomePlayer();
-    void displayServerlist();
-    void createMainMenu();
     // Mapping Logic
     // Returns if local EntityID exist in map
     bool clientServerMapsHasEntity(EntityID clientEntityID);
@@ -134,20 +109,10 @@ private:
     bool OnPlayerDamage(const Events::PlayerDamage& e);
     EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(const Events::PlayerSpawned& e);
-    EventRelay< Client, Events::SearchForServers> m_ESearchForServers;
+    void parsePlayerDamage(Packet& packet);
-    EventRelay<Client, Events::DoubleJump> m_EDoubleJump;
+private:
-    bool OnDoubleJump(Events::DoubleJump & e);
+    UDPClient m_Unreliable;
-    EventRelay<Client, Events::DashAbility> m_EDashAbility;
+    TCPClient m_Reliable;
-    bool OnDashAbility(const Events::DashAbility& e);
-    EventRelay<Client, Events::ConnectRequest> m_EConnectRequest;
-    bool OnConnectRequest(const Events::ConnectRequest& e);
-
-    bool OnSearchForServers(const Events::SearchForServers& e);
-    UDPClient m_ServerlistRequest;
-    std::vector<ServerInfo> m_Serverlist;
-    bool m_SearchingForServers = false;
-    double m_TimeSearched = 0;
-    double m_SearchingTime = 0.2; // Config I guess
 };
 
 #endif

include/Engine/Network/EConnectRequest.h

@@ -1,17 +0,0 @@
-#ifndef Events_ConnectRequest_h__
-#define Events_ConnectRequest_h__
-
-#include "Core/EventBroker.h"
-
-namespace Events
-{
-
-struct ConnectRequest : public Event
-{
-    std::string IP = "";
-    int Port = 0;
-};
-
-}
-#endif
-

include/Engine/Network/EDisplayServerlist.h

@@ -1,29 +0,0 @@
-#ifndef Events_DisplayServerlist_h__
-#define Events_DisplayServerlist_h__
-
-#include <string>
-#include <vector>
-#include "Core/Event.h"
-
-struct ServerInfo
-{
-    ServerInfo(std::string address, int port, std::string name, int players)
-    {
-        Address = address; Port = port; Name = name; PlayersConnected = players;
-    }
-    std::string Address = "";
-    int Port = 0;
-    std::string Name = "";
-    int PlayersConnected = 0;
-};
-
-namespace Events
-{
-
-struct DisplayServerlist : public Event 
-{
-    std::vector<ServerInfo> Serverlist;
-};
-
-}
-#endif

include/Engine/Network/EKillDeath.h

@@ -1,30 +0,0 @@
-#ifndef Events_KillDeath_h__
-#define Events_KillDeath_h__
-
-#include "Core/EventBroker.h"
-
-typedef unsigned int PlayerID;
-
-namespace Events
-{
-
-struct KillDeath : public Event 
-{
-    int CasualtyTeam;
-    PlayerID Casualty = -1;
-    std::string CasualtyName;
-
-    //1 = assault, 2 = defender, 3 = sniper
-    int CasualtyClass;
-
-    int KillerTeam;
-    PlayerID Killer = -1;
-    std::string KillerName;
-
-    //1 = assault, 2 = defender, 3 = sniper
-    int KillerClass;
-};
-
-}
-
-#endif

include/Engine/Network/EPlayerConnected.h

@@ -1,17 +0,0 @@
-#ifndef Events_PlayerConnected
-#define Events_PlayerConnected
-
-#include "Core/EventBroker.h"
-
-namespace Events
-{
-
-struct PlayerConnected : public Event
-{
-    std::string PlayerName = "";
-    int PlayerID = -1;
-};
-
-}
-#endif // !Events_PlayerConnected
-

include/Engine/Network/ESearchForServers.h

@@ -1,12 +0,0 @@
-#ifndef Events_SearchForServers_h__
-#define Events_SearchForServers_h__
-
-#include "Core/Event.h"
-
-namespace Events
-{
-
-struct SearchForServers : public Event { };
-
-}
-#endif

include/Engine/Network/HybridClient.h

@@ -0,0 +1,13 @@
+#ifndef HybridClient_h__
+#define HybridClient_h__
+
+class HybridClient
+{
+public:
+    HybridClient();
+    ~HybridClient();
+private:
+
+};
+
+#endif

include/Engine/Network/HybridServer.h

@@ -0,0 +1,12 @@
+#ifndef HybridServer_h__
+#define HybridServer_h__
+
+class HybridServer
+{
+public:
+    HybridServer();
+    ~HybridServer();
+private:
+};
+
+#endif

include/Engine/Network/MessageType.h

@@ -19,13 +19,6 @@ enum class MessageType
     EntityDeleted,
     ComponentDeleted,
     PlayerTransform,
-    OnDoubleJump,
-    OnDashEffect,
-    ServerlistRequest,
-    AmmoPickup,
-    RemoveWorld,
-    KD,
-    Win,
     Invalid
 };
 

include/Engine/Network/Network.h

@@ -22,7 +22,7 @@ public:
     Network(World* world, EventBroker* eventBroker);
     virtual ~Network() { };
 
-    virtual void Update(double dt) = 0;
+    virtual void Update() = 0;
 
 protected:
     World* m_World;
@@ -39,8 +39,6 @@ protected:
     void logReceivedData(int bytesReceived);
     void saveToFile();
     void updateNetworkData();
-    void popNetworkSegmentOfHeader(Packet& packet);
-    void removeWorld();
 };
 
 #endif

include/Engine/Network/NetworkClient.h

@@ -9,16 +9,13 @@ typedef unsigned int PacketID;
 class NetworkClient
 {
 public:
-    NetworkClient();
+    virtual void Connect(std::string playerName, std::string address, int port) = 0;
-    virtual ~NetworkClient();
-    virtual bool Connect(std::string playerName, std::string address, int port) = 0;
     virtual void Disconnect() = 0;
     virtual void Receive(Packet& packet) = 0;
     virtual void Send(Packet & packet) = 0;
     virtual bool IsSocketAvailable() = 0;
 protected:
-    char* m_ReadBuffer;
+    char m_ReadBuffer[BUFFERSIZE] = { 0 };
-    unsigned int m_BufferSize = BUFFERSIZE;
 };
 
 #endif

include/Engine/Network/NetworkServer.h

@@ -10,15 +10,12 @@ typedef unsigned int PacketID;
 class NetworkServer
 {
 public:
-    NetworkServer();
-    virtual ~NetworkServer();
     virtual void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers) = 0;
     virtual void Receive(Packet & packet, PlayerDefinition & playerDefinition) = 0;
     virtual void Send(Packet & packet, PlayerDefinition & playerDefinition) = 0;
     virtual void Send(Packet & packet) = 0;
 protected:
-    char* m_ReadBuffer;
+    char m_ReadBuffer[BUFFERSIZE] = { 0 };
-    unsigned int m_BufferSize = BUFFERSIZE;
 };
 
 #endif

include/Engine/Network/Packet.h

@@ -16,9 +16,7 @@ public:
     Packet(char* data, const size_t sizeOfPacket);
     Packet(MessageType type);
     ~Packet();
-    void Init(MessageType type, unsigned int& packetID,
+    void Init(MessageType type, unsigned int& packetID);
-        int groupIndex, int groupSize,
-        int packetGroup);
 
     // Add primitive types like int, float, char...
     template<typename T>
@@ -26,10 +24,7 @@ public:
     {
         // Check if we are trying to add more than the package can fit.
         if (m_MaxPacketSize < m_Offset + sizeof(T)) {
-            if (m_MaxPacketSize >= 32000) {
+            LOG_WARNING("Packet AddPrimitive(): You are trying to add more than we have allocated for! New size is %i bytes\n", m_MaxPacketSize*2);
-                // This will spam couse 8 players are over 100 000 bytes
-                //LOG_WARNING("Package::WritePrimitive(): New size is huge %i bytes\n", m_MaxPacketSize*2);
-            }
             resizeData();
         }
         memcpy(m_Data + m_Offset, &val, sizeof(T));
@@ -60,19 +55,13 @@ public:
     void UpdateSize();
     char* ReadData(int SizeOfData);
     void ChangePacketID(unsigned int& packetID);
-    void ChangeGroupIndex(int groupIndex);
-    void ChangeGroupSize(int groupSize);
-    void ChangeGroup(int group);
     size_t Size() { return m_Offset; };
     char* Data() { return m_Data; };
     MessageType GetMessageType();
-    size_t Group();
     size_t DataReadSize() { return m_ReturnDataOffset; }
     size_t MaxSize() { return m_MaxPacketSize; }
     size_t HeaderSize() { return m_HeaderSize; }
-    size_t GroupIndex();
+
-    size_t GroupSize();
-    size_t PacketID();
 private:
     char* m_Data;
     size_t m_ReturnDataOffset = 0;
@@ -81,13 +70,6 @@ private:
     size_t m_HeaderSize = 0;
     void resizeData();
     void resizeData(int size);
-
-    size_t packetSizeOffset = 0;
-    size_t groupOffset = 0;
-    size_t groupIndexOffset = 0;
-    size_t groupSizeOffset = 0;
-    size_t messageTypeOffset = 0;
-    size_t packetIDOffset = 0;
 };
 
 #endif

include/Engine/Network/PlayerDefinition.h

@@ -14,7 +14,6 @@ struct PlayerDefinition {
     unsigned short TCPPort;
     // use for tcp connections
     boost::shared_ptr<boost::asio::ip::tcp::socket> TCPSocket;
-    int PacketGroup = 1;
 };
 
 #endif

include/Engine/Network/Server.h

@@ -11,22 +11,14 @@
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Core/World.h"
-#include "Core/EntityFile.h"
 #include "Core/EventBroker.h"
 #include "../Network/Network.h"
 #include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"
 #include "Network/EPlayerDisconnected.h"
 #include "Core/EPlayerSpawned.h"
-#include "../Game/Events/EDoubleJump.h"
 #include "Core/EEntityDeleted.h"
 #include "Core/EComponentDeleted.h"
-#include "Core/EAmmoPickup.h"
-#include "Core/EPlayerDeath.h"
-#include "Network/EPlayerConnected.h"
-#include "Network/EKillDeath.h"
-#include "Core/EWin.h"
-#include "Game/Events/EReset.h"
 
 class Server : public Network
 {
@@ -34,17 +26,15 @@ public:
     Server(World* world, EventBroker* eventBroker, int port);
     ~Server();
 
-    void Update(double dt) override;
+    void Update() override;
 
 private:
     // Network channels
     TCPServer m_Reliable;
     UDPServer m_Unreliable;
-    UDPServer m_ServerlistRequest;
     // dont forget to set these in the childrens receive logic
     boost::asio::ip::address m_Address;
     int m_Port = 27666;
-    bool m_GameIsOver = false;
     // Sending messages to client logic
     std::map<PlayerID, PlayerDefinition> m_ConnectedPlayers;
     std::vector<PlayerID> m_PlayersToDisconnect;
@@ -52,20 +42,19 @@ private:
     char readBuffer[BUFFERSIZE] = { 0 };
     size_t bytesRead = 0;
     // time for previouse message
-    double previousPingMessage = 0;
+    std::clock_t previousePingMessage = std::clock();
-    double previousSnapshotMessage = 0;
+    std::clock_t previousSnapshotMessage = std::clock();
-    double timeOutTimer = 0;
+    std::clock_t timOutTimer = std::clock();
 
-    // How often we send messages (seconds)
+    // How often we send messages (milliseconds)
-    double pingInterval = 1;
+    float pingIntervalMs;
-    double snapshotInterval = 0.05;
+    float snapshotInterval;
-    double checkTimeOutInterval = 0.1;
+    int checkTimeOutInterval = 100;
     int m_NextPlayerID = 0;
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
     std::clock_t m_StartPingTime;
-    std::string m_ServerName = "";
+    
-
     // Packet loss logic
     PacketID m_PacketID = 0;
     PacketID m_PreviousPacketID = 0;
@@ -75,8 +64,6 @@ private:
     void reliableBroadcast(Packet& packet);
     void unreliableBroadcast(Packet& packet);
     void sendSnapshot();
-    void createWorldSnapshot(Packet& packet);
-    void addPlayersToPacket(Packet& packet, EntityID entityID);
     void addChildrenToPacket(Packet& packet, EntityID entityID);
     void addInputCommandsToPacket(Packet& packet);
     void sendPing();
@@ -86,22 +73,17 @@ private:
     void parseOnPlayerDamage(Packet& packet);
     void identifyPacketLoss();
     void kick(PlayerID player);
-    PlayerID getPlayerIDFromEndpoint();
+    PlayerID GetPlayerIDFromEndpoint();
-    PlayerID getPlayerIDFromEntityID(EntityID entityID);
-    void resetMap();
     void parsePlayerTransform(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
-    void parsePing();
+    void parsePing();    
-    bool parseDoubleJump(Packet& packet);
+    void parseUDPConnect(Packet & packet);
-    void parseDashEffect(Packet& packet);
+    void parseTCPConnect(Packet & packet);
-    void parseUDPConnect(Packet& packet);
-    void parseTCPConnect(Packet& packet);
     void parseDisconnect();
-    void parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint);
     bool shouldSendToClient(EntityWrapper childEntity);
 
-    // Events
+    // Debug event
     EventRelay<Server, Events::InputCommand> m_EInputCommand;
     bool OnInputCommand(const Events::InputCommand& e);
     EventRelay<Server, Events::PlayerSpawned> m_EPlayerSpawned;
@@ -112,12 +94,6 @@ private:
     bool OnComponentDeleted(const Events::ComponentDeleted& e);
     EventRelay<Server, Events::PlayerDamage> m_EPlayerDamage;
     bool OnPlayerDamage(const Events::PlayerDamage& e);
-    EventRelay<Server, Events::AmmoPickup> m_EAmmoPickup;
-    bool OnAmmoPickup(const Events::AmmoPickup& e);
-    EventRelay<Server, Events::PlayerDeath> m_EPlayerDeath;
-    bool OnPlayerDeath(const Events::PlayerDeath& e);
-    EventRelay<Server, Events::Win> m_EWin;
-    bool OnWin(const Events::Win& e);
 };
 
 #endif

include/Engine/Network/TCPClient.h

@@ -10,7 +10,7 @@ public:
     TCPClient();
     ~TCPClient();
 
-    bool Connect(std::string playerName, std::string address, int port);
+    void Connect(std::string playerName, std::string address, int port);
     void Disconnect();
     void Receive(Packet& packet);
     void Send(Packet & packet);
@@ -20,7 +20,7 @@ private:
     boost::asio::ip::tcp::endpoint m_Endpoint;
     boost::asio::io_service m_IOService;
     std::unique_ptr<boost::asio::ip::tcp::socket> m_Socket;
-    size_t readBuffer();
+    size_t readBuffer(char* data);
     PacketID m_SendPacketID = 0;
     bool m_IsConnected = false;
 };

include/Engine/Network/TCPServer.h

@@ -16,22 +16,16 @@ public:
     void Send(Packet & packet, PlayerDefinition & playerDefinition);
     void Send(Packet & packet);
     void Disconnect();
-    int Port() { return m_Port; }
-    std::string Address() { return m_Address; }
-
 private:
     // TCP logic
     boost::asio::io_service m_IOService;
     std::unique_ptr<boost::asio::ip::tcp::acceptor> acceptor;
     boost::shared_ptr<boost::asio::ip::tcp::socket> lastReceivedSocket;
 
-    int readBuffer(PlayerDefinition& playerDefinition);
+    void handle_accept(boost::shared_ptr<boost::asio::ip::tcp::socket> socket,
-    PlayerID getPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
+        int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
-        boost::asio::ip::address address, unsigned short port);
+        const boost::system::error_code& error);
-    int GetPort();
+    int readBuffer(char* data, PlayerDefinition& playerDefinition);
-    std::string GetAddress();
-    int m_Port = 0;
-    std::string m_Address = "";
 };
 
 #endif

include/Engine/Network/UDPClient.h

@@ -1,7 +1,5 @@
 #ifndef UDPClient_h__
 #define UDPClient_h__
-#include <map>
-#include <algorithm>
 
 #include <boost/asio.hpp>
 #include "Network/NetworkClient.h"
@@ -12,30 +10,18 @@ public:
     UDPClient();
     ~UDPClient();
 
-    bool Connect(std::string playerName, std::string address, int port);
+    void Connect(std::string playerName, std::string address, int port);
     void Disconnect();
     void Receive(Packet& packet);
-    void ReceivePackets();
+    void Send(Packet & packet);
-    void Send(Packet& packet);
-    void Broadcast(Packet& packet, int port);
     bool IsSocketAvailable();
-    // Returns false if no packets are available
-    bool GetNextPacket(Packet& packet);
 private:
-    typedef std::map<unsigned int, std::vector<std::pair<int, boost::shared_ptr<char>>>> PacketMap;
     // Assio UDP logic
     boost::asio::io_service m_IOService;
     boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
     boost::shared_ptr<boost::asio::ip::udp::socket> m_Socket;
-    int m_LastReceivedSnapshotGroup = 0;
+    int readBuffer(char* data);
-    int readBuffer();
-    void readPartOfPacket();
     PacketID m_SendPacketID = 0;
-    //map:(packetGroup, vector:(pair:(groupIndex, packetData)))
-    PacketMap m_PacketSegmentMap;
-    bool hasReceivedPacket(int packetGroup, int groupIndex);
-    // 2^19
-    const int m_SizeOfSocketBuffer = 524288;
 };
 
 #endif

include/Engine/Network/UDPServer.h

@@ -3,28 +3,23 @@
 
 #include "NetworkServer.h"
 #include <boost/asio/ip/udp.hpp>
-#define MAXPACKETSIZE 64000
 
 class UDPServer : public NetworkServer
 {
 public:
     UDPServer();
-    UDPServer(int port);
     ~UDPServer();
     void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers);
     void Receive(Packet & packet, PlayerDefinition & playerDefinition);
     void Send(Packet & packet, PlayerDefinition & playerDefinition);
-    void SendToConnectedPlayers(Packet & packet, std::map<PlayerID, PlayerDefinition>& playersTosendTo);
+    void Send(Packet & packet);
-    void Send(Packet & packet); 
-    void Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint);
-    void Broadcast(Packet & packet, int port);
     bool IsSocketAvailable();
 private:
     // UDP logic
     boost::asio::io_service m_IOService;
     boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
     std::unique_ptr<boost::asio::ip::udp::socket> m_Socket;
-    int readBuffer();
+    int readBuffer(char* data);
 };
 
 #endif

include/Engine/Rendering/AnimationSystem.h

@@ -3,41 +3,27 @@
 
 #include "GLM.h"
 
-#include "../Common.h"
+#include "Common.h"
-#include "../Core/System.h"
+#include "Core/System.h"
-#include "../Core/ResourceManager.h"
+#include "Core/ResourceManager.h"
 #include "Rendering/Model.h"
+#include "Rendering/EAnimationComplete.h"
 #include "Rendering/Skeleton.h"
-#include "Rendering/BlendTree.h"
+#include <imgui/imgui.h>
-#include "Rendering/EAutoAnimationBlend.h"
-#include "../Core/EntityWrapper.h"
-#include "Rendering/AutoBlendQueue.h"
-#include "../Input/EInputCommand.h"
-#include "../Core/EEntityDeleted.h"
-#include "Rendering/ESetBlendWeight.h"
-#include "imgui/imgui.h"
 
-class AnimationSystem : public ImpureSystem
+class AnimationSystem : public PureSystem
 {
 public:
-    AnimationSystem(SystemParams params);
+    AnimationSystem(SystemParams params)
+        : System(params)
+        , PureSystem("Animation")
+    {
+
+    }
     ~AnimationSystem() { }
-    virtual void Update(double dt) override;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& animationComponent, double dt) override;
 private:
-    void CreateBlendTrees();
-    void UpdateAnimations(double dt);
-    void UpdateWeights(double dt);
 
-    EventRelay<AnimationSystem, Events::AutoAnimationBlend> m_EAutoAnimationBlend;
-    bool OnAutoAnimationBlend(Events::AutoAnimationBlend& e);
-
-    EventRelay<AnimationSystem, Events::EntityDeleted> m_EEntityDeleted;
-    bool OnEntityDeleted(Events::EntityDeleted& e);
-
-    EventRelay<AnimationSystem, Events::SetBlendWeight> m_ESetBlendWeight;
-    bool OnSetBlendWeight(Events::SetBlendWeight& e);
-
-    std::unordered_map<EntityWrapper, AutoBlendQueue> m_AutoBlendQueues;
 };
 
 #endif

include/Engine/Rendering/AutoBlendQueue.h

@@ -1,48 +0,0 @@
-#ifndef AutoBlendQueue_h__
-#define AutoBlendQueue_h__
-
-#include "../Core/ResourceManager.h"
-#include "Skeleton.h"
-#include "Model.h"
-#include "BlendTree.h"
-#include "../Core/EntityWrapper.h"
-
-class AutoBlendQueue
-{
-public:
-    struct AutoBlendJob
-    {
-        EntityWrapper RootNode = EntityWrapper::Invalid;
-        double Duration;
-        double CurrentTime = 0.0;
-        double Delay = 0.0;
-        EntityWrapper AnimationEntity = EntityWrapper::Invalid;
-        BlendTree::AutoBlendInfo BlendInfo;
-    };
-
-    struct AutoblendNode
-    {
-        AutoBlendJob BlendJob;
-        double StartTime;
-        double EndTime;
-    };
-
-    AutoBlendQueue() { };
-
-    void Insert(AutoBlendJob autoBlendJob);
-    void UpdateTime(double dt);
-
-    void PrintQueue();
-    bool HasActiveBlendJob();
-    std::shared_ptr<BlendTree> GetBlendTree();
-
-    AutoBlendQueue::AutoBlendJob& GetActiveBlendJob();
-
-    bool Empty() { return m_BlendQueue.empty(); }
-private:
-     std::list<AutoblendNode> m_BlendQueue;
-    
-
-};
-
-#endif

include/Engine/Rendering/BlendTree.h

@@ -1,103 +0,0 @@
-#ifndef BlendTree_h__
-#define BlendTree_h__
-
-#include "Common.h"
-#include "../GLM.h"
-#include "Skeleton.h"
-#include "../Core/EntityWrapper.h"
-#include "../Core/World.h"
-#include <stack>
-
-class BlendTree
-{
-public:
-    enum class NodeType
-    {
-        Additive,
-        Blend,
-        Override,
-        Animation,
-    };
-
-    
-
-    struct Node
-    {
-        std::string Name;
-        EntityWrapper Entity;
-        Node* Parent = nullptr;
-        Node* Child[2] = { nullptr, nullptr };
-        NodeType Type;
-        std::map<int, Skeleton::PoseData> Pose;
-        bool SubTreeRoot = false;
-        double Weight = 0.0;
-
-        Node* Next() {
-            Node* next = this;
-
-            if (next->Child[1] == nullptr) {
-                // Node has no right child
-                next = this;
-                while (next->Parent != nullptr && next == next->Parent->Child[1]) {
-                    next = next->Parent;
-                }
-                next = next->Parent;
-            } else {
-                // Find the leftmost node in the right subtree
-                next = next->Child[1];
-                while (next->Child[0] != nullptr) {
-                    next = next->Child[0];
-                }
-            }
-            return next;
-        }
-    };
-
-  
-    struct AutoBlendInfo
-    {
-        std::string NodeName;
-        double progress;
-        bool Start;
-        bool SingleBlend;
-        double Weight;
-        std::unordered_map<EntityWrapper, double> StartWeights;
-    };
-
-    
-
-    BlendTree(EntityWrapper ModelEntity, Skeleton* skeleton);
-    ~BlendTree();
-
-
-    std::vector<glm::mat4> GetFinalPose() { return m_FinalPose; }
-    glm::mat4 GetBoneTransform(int boneID);
-    bool IsValid() { return  (m_Root == nullptr ? false : true); }
-    void PrintTree();
-    BlendTree::AutoBlendInfo AutoBlendStep(AutoBlendInfo blendInfo);
-
-    BlendTree::Node* GetCommonParent(std::string NodeName1, std::string NodeName2);
-    BlendTree::Node* FirstCommonParent(Node* node1, Node* node2);
-
-    EntityWrapper GetSubTreeRoot(std::string nodeName);
-    std::vector<EntityWrapper> GetSubTreeRoots(std::string nodeName);
-
-    std::vector<EntityWrapper> GetSingleLevelRoots(std::string name);
-    std::vector<EntityWrapper> GetEntitesByName(std::string name);
-
-    void SetWeightByName(std::string name, double weight);
-
-private:
-    Skeleton* m_Skeleton = nullptr;
-    Node* m_Root = nullptr;
-
-    std::vector<glm::mat4> m_FinalPose;
-    std::map<int, glm::mat4> m_FinalBoneTransforms;
-    std::vector<BlendTree::Node*> FindNodesByName(std::string name);
-    std::vector<glm::mat4> AccumulateFinalPose();
-    BlendTree::Node* FillTreeByName(Node* parentNode, std::string name, EntityWrapper parentEntity);
-
-    void Blend(std::map<int, Skeleton::PoseData>& pose);
-};
-
-#endif

include/Engine/Rendering/BlurHUD.h

@@ -1,70 +0,0 @@
-#ifndef BlurHUD_h__
-#define BlurHUD_h__
-
-#include "IRenderer.h"
-#include "DrawBloomPassState.h"
-//#include "LightCullingPass.h" Finalpass om den skall skickas in
-#include "FrameBuffer.h"
-#include "ShaderProgram.h"
-//#include "Util/UnorderedMapVec2.h"
-#include "Texture.h"
-
-class BlurHUD
-{
-public:
-    BlurHUD(IRenderer* renderer);
-    ~BlurHUD() { }
-    void InitializeTextures();
-    void InitializeFrameBuffers();
-    void InitializeShaderPrograms();
-    void InitializeBuffers();
-    void ClearBuffer();
-
-    void FillGaussianBuffer(FrameBuffer* fb);
-
-    GLuint Draw(GLuint texture, RenderScene& scene);
-
-    void OnWindowResize();
-    void FillStencil(RenderScene& scene);
-    GLuint CombineTextures(GLuint texture1, GLuint texture2);
-
-    //Getters
-    //Return the blurred result of the texture that was sent into draw
-	GLuint GaussianTexture() const { 
-		if (m_Quality == 0) { 
-			return m_BlackTexture->m_Texture;
-		} else { 
-			return m_GaussianTexture_vert;
-		} 
-	}
-
-
-private:
-    Texture* m_BlackTexture;
-    Model* m_ScreenQuad;
-
-    const IRenderer* m_Renderer;
-	ConfigFile* m_Config;
-    //const LightCullingPass* m_LightCullingPass 
-    int m_Iterations = 3;
-	int m_Quality = 0;
-    float m_BlurQuality = 4.f;
-
-    GLuint m_GaussianTexture_horiz = 0;
-    GLuint m_GaussianTexture_vert = 0;
-    GLuint m_DepthStencil_horiz = 0;
-    GLuint m_DepthStencil_vert = 0;
-    GLuint m_CombinedTexture = 0;
-
-    FrameBuffer m_GaussianFrameBuffer_horiz;
-    FrameBuffer m_GaussianFrameBuffer_vert;
-    FrameBuffer m_CombinedTextureBuffer;
-
-    ShaderProgram* m_GaussianProgram_horiz;
-    ShaderProgram* m_GaussianProgram_vert;
-    ShaderProgram* m_FillDepthStencilProgram;
-    ShaderProgram* m_CombineTexturesProgram;
-
-};
-
-#endif 

include/Engine/Rendering/BoneAttachmentSystem.h

@@ -8,7 +8,6 @@
 #include "Core/ResourceManager.h"
 #include "Rendering/Model.h"
 #include "Rendering/Skeleton.h"
-#include "Rendering/BlendTree.h"
 
 //Needs to be a higher orderlevel than AnimationSystem
 class BoneAttachmentSystem : public PureSystem

include/Engine/Rendering/CubeMapPass.h

@@ -1,28 +0,0 @@
-#ifndef CubeMapPass_h__
-#define CubeMapPass_h__
-
-#include "IRenderer.h"
-#include "ShaderProgram.h"
-#include "PNG.h"
-
-class CubeMapPass
-{
-public:
-    CubeMapPass(IRenderer* renderer);
-    ~CubeMapPass() { }
-
-    void LoadTextures(std::string input);
-    void FillCubeMap(glm::vec3 originPosition);
-    void GenerateCubeMapTexture();
-
-    //GLuint CubeMapTexture() const { return m_CubeMapTexture; }
-    GLuint m_CubeMapTexture = 0;
-
-private:
-    IRenderer* m_Renderer;
-    std::string m_PreviusCubeMapTexture;
-
-    std::vector<std::string> m_CubeMapTextures;
-};
-
-#endif 

include/Engine/Rendering/DDS.h

@@ -1,71 +0,0 @@
-#ifndef DDS_h__
-#define DDS_h__
-
-#include <cstdint>
-
-#include "../Common.h"
-#include "../Core/ResourceManager.h"
-#include "Image.h"
-
-// DXT5
-class DDS : public Image, public Resource
-{
-public:
-    DDS(std::string path);
-    ~DDS();
-
-    void FlipY(unsigned char* data, std::size_t rowBytes, std::size_t totalSize, std::size_t numBlocksWide);
-
-private:
-    static const uint32_t MagicNumber = 0x20534444; // "DDS "
-
-    struct Header_t
-    {
-        uint32_t Size;
-        uint32_t Flags;
-        uint32_t Height;
-        uint32_t Width;
-        uint32_t PitchOrLinearSize;
-        uint32_t Depth;
-        uint32_t MipMapCount;
-        uint32_t RESERVED1[11];
-        struct PixelFormat_t
-        {
-            uint32_t Size;
-            uint32_t Flags;
-            uint32_t FourCC;
-            uint32_t RGBBitCount;
-            uint32_t RBitMask;
-            uint32_t GBitMask;
-            uint32_t BBitMask;
-            uint32_t ABitMask;
-        } PixelFormat;
-        uint32_t Caps;
-        uint32_t Caps2;
-        uint32_t Caps3;
-        uint32_t Caps4;
-        uint32_t RESERVED2;
-    } m_Header;
-
-    struct Block_t
-    {
-        struct Alpha_t
-        {
-            uint8_t Colors[2];
-            uint8_t Data[6];
-        } Alpha;
-        struct Data_t
-        {
-            uint16_t Colors[2];
-            uint8_t Data[4];
-        } Data;
-    };
-
-    std::size_t m_NumBlocksWide;
-    std::size_t m_NumBlocksHigh;
-    std::size_t m_RowBytes;
-
-    void flipBlock(Block_t* block);
-};
-
-#endif

include/Engine/Rendering/DirectionalLightJob.h

@@ -7,7 +7,7 @@
 #include "../GLM.h"
 #include "../Core/ComponentWrapper.h"
 #include "RenderJob.h"
-#include "../Core/TransformSystem.h"
+#include "../Core/Transform.h"
 #include "../Core/World.h"
 
 struct DirectionalLightJob : RenderJob
@@ -16,7 +16,7 @@ struct DirectionalLightJob : RenderJob
         : RenderJob()
     {
 
-        Direction = glm::vec4(0,0,-1,0) * glm::inverse(TransformSystem::AbsoluteOrientation(m_World, transformComponent.EntityID));
+        Direction = glm::vec4(0,0,-1,0) * glm::inverse(Transform::AbsoluteOrientation(m_World, transformComponent.EntityID));
         //Direction = glm::vec4((glm::vec3)directionalLightComponent["Direction"], 0.f);
         Color = (glm::vec4)directionalLightComponent["Color"];
         Intensity = (double)directionalLightComponent["Intensity"];

include/Engine/Rendering/DrawBloomPass.h

@@ -12,8 +12,8 @@
 class DrawBloomPass
 {
 public:
-    DrawBloomPass(IRenderer* renderer, ConfigFile* config);
+    DrawBloomPass(IRenderer* renderer /* ,Texture or finalpass*/ );
-	~DrawBloomPass();
+    ~DrawBloomPass() { }
     void InitializeTextures();
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
@@ -23,45 +23,32 @@ public:
     void FillGaussianBuffer(FrameBuffer* fb);
 
     void Draw(GLuint texture);
-	void ChangeQuality(int quality);
 
     void OnWindowResize();
 
     //Getters
     //Return the blurred result of the texture that was sent into draw
-	GLuint GaussianTexture() const { 
+    GLuint GaussianTexture() const { return m_GaussianTexture_vert; }
-		if (m_Quality == 0) { 
-			return m_BlackTexture->m_Texture;
-		} else { 
-			return m_FinalGaussianTexture;
-		} 
-	}
 
 
 private:
-    void GaussianLodPass(GLuint mipMap, GLuint texture);
+    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
-    void CombineGaussianBlur();
+
-    Texture* m_BlackTexture;
+    Texture* m_WhiteTexture;
     Model* m_ScreenQuad;
 
     const IRenderer* m_Renderer;
-	ConfigFile* m_Config;
     //const LightCullingPass* m_LightCullingPass 
-    int m_Iterations;
+    GLuint m_iterations = 9;
-	int m_Quality = 0;
-    int m_BloomLod = 5;
 
-    GLuint m_GaussianTexture_horiz = 0;
+    GLuint m_GaussianTexture_horiz;
-    GLuint m_GaussianTexture_vert = 0;
+    GLuint m_GaussianTexture_vert;
-    GLuint m_FinalGaussianTexture = 0;
 
-    FrameBuffer* m_GaussianFrameBuffer_horiz = nullptr;
+    FrameBuffer m_GaussianFrameBuffer_horiz;
-    FrameBuffer* m_GaussianFrameBuffer_vert = nullptr;
+    FrameBuffer m_GaussianFrameBuffer_vert;
-    FrameBuffer m_GaussianCombineBuffer;
 
     ShaderProgram* m_GaussianProgram_horiz;
     ShaderProgram* m_GaussianProgram_vert;
-    ShaderProgram* m_GaussianCombineProgram;
 
 };
 

include/Engine/Rendering/DrawColorCorrectionPass.h

@@ -17,7 +17,7 @@ public:
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
 
-    void Draw(GLuint sceneTexture, GLuint bloomTexture, GLfloat gamma, GLfloat exposure);
+    void Draw(GLuint sceneTexture, GLuint bloomTexture, GLuint sceneTextureLowRes, GLuint bloomTextureLowRes, GLfloat gamma, GLfloat exposure);
 private:
     const IRenderer* m_Renderer;
 

include/Engine/Rendering/DrawFinalPass.h

@@ -4,105 +4,43 @@
 #include "IRenderer.h"
 #include "DrawFinalPassState.h"
 #include "LightCullingPass.h"
-#include "CubeMapPass.h"
-#include "SSAOPass.h"
 #include "FrameBuffer.h"
 #include "ShaderProgram.h"
 #include "Util/UnorderedMapVec2.h"
 #include "Util/CommonFunctions.h"
 #include "Texture.h"
-#include "ShadowPass.h"
-#include "BlurHUD.h"
 
 class DrawFinalPass
 {
 public:
-    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass, ShadowPass* shadowPass, ConfigFile* config);
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass);
-	~DrawFinalPass();
+    ~DrawFinalPass() { }
     void InitializeTextures();
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
-    void Draw(RenderScene& scene, BlurHUD* blurHUDPass);
+    void Draw(RenderScene& scene, GLuint SSAOTexture);
     void ClearBuffer();
     void OnWindowResize();
-	void setMSAA(unsigned int numberOfSamples);
 
     //Return the texture that is used in later stages to apply the bloom effect
-	GLuint BloomTexture() {
+    GLuint BloomTexture() const { return m_BloomTexture; }
-		if (m_MSAA){
+    GLuint BloomTextureLowRes() const { return m_BloomTextureLowRes; }
-			m_AntiAliasedFrameBuffer->Bind();
-			glClearColor(0.f, 0.f, 0.f, 0.f);
-			glClear(GL_COLOR_BUFFER_BIT);
-			m_AntiAliasedFrameBuffer->Unbind();
-			m_FinalPassFrameBuffer->Read();
-			glReadBuffer(GL_COLOR_ATTACHMENT1);
-			m_AntiAliasedFrameBuffer->Draw();
-			glBlitFramebuffer(
-				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
-				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
-				GL_COLOR_BUFFER_BIT, GL_NEAREST);
-			return m_AntiAliasedTexture;
-		}
-		return m_BloomTexture; }
     //Return the texture with diffuse and lighting of the scene.
-	GLuint DrawFinalPass::SceneTexture() {
+    GLuint SceneTexture() const { return m_SceneTexture; }
-		if (m_MSAA) {
+    GLuint SceneTextureLowRes() const { return m_SceneTextureLowRes; }
-			m_AntiAliasedFrameBuffer->Bind();
-			glClearColor(0.f, 0.f, 0.f, 0.f);
-			glClear(GL_COLOR_BUFFER_BIT);
-			m_AntiAliasedFrameBuffer->Unbind();
-			m_FinalPassFrameBuffer->Read();
-			glReadBuffer(GL_COLOR_ATTACHMENT0);
-			m_AntiAliasedFrameBuffer->Draw();
-			glBlitFramebuffer(
-				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
-				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
-				GL_COLOR_BUFFER_BIT, GL_NEAREST);
-			return m_AntiAliasedTexture;
-		}
-		return m_SceneTexture;
-	}
-    //Return the SceneTexture with the blurred HUD bits.
-    GLuint CombinedSceneTexture() {
-		if (m_MSAA) {
-			m_AntiAliasedFrameBuffer->Bind();
-			glClearColor(0.f, 0.f, 0.f, 0.f);
-			glClear(GL_COLOR_BUFFER_BIT);
-			m_AntiAliasedFrameBuffer->Unbind();
-			m_FinalPassFrameBuffer->Read();
-			m_AntiAliasedFrameBuffer->Draw();
-			glBlitFramebuffer(
-				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
-				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
-				GL_COLOR_BUFFER_BIT, GL_NEAREST);
-			return m_AntiAliasedTexture;
-		}
-		return m_CombinedTexture; }
-    //Return the blurred scene texture.
-    GLuint FullBlurredTexture() { 
-		if (m_MSAA) {
-			m_AntiAliasedFrameBuffer->Bind();
-			glClearColor(0.f, 0.f, 0.f, 0.f);
-			glClear(GL_COLOR_BUFFER_BIT);
-			m_AntiAliasedFrameBuffer->Unbind();
-			m_FinalPassFrameBuffer->Read();
-			m_AntiAliasedFrameBuffer->Draw();
-			glBlitFramebuffer(
-				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
-				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
-				GL_COLOR_BUFFER_BIT, GL_NEAREST);
-			return m_AntiAliasedTexture;
-		}
-		return m_FullBlurredTexture; }
     //Return the framebuffer used in the scene rendering stage.
-    FrameBuffer* FinalPassFrameBuffer() { return m_FinalPassFrameBuffer; }
+    FrameBuffer* FinalPassFrameBuffer() { return &m_FinalPassFrameBuffer; }
+    FrameBuffer* FinalPassFrameBufferLowRes() { return &m_FinalPassFrameBufferLowRes; }
 
 private:
+    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
+    void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps) const;
+
     void DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, RenderScene& scene);
-    void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
+    void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene, GLuint SSAOTexture);
-	void DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
+    void DrawShieldToStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
     void DrawShieldedModelRenderQueue(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
-    void DrawToDepthStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
+    void DrawToDepthBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
 
     void BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job, RenderScene& scene);
     void BindModelUniforms(GLuint shaderHandle, std::shared_ptr<ModelJob>& job, RenderScene& scene);
@@ -116,54 +54,36 @@ private:
     Texture* m_GreyTexture;
     Texture* m_ErrorTexture;
 
-    FrameBuffer* m_FinalPassFrameBuffer = nullptr;
+    FrameBuffer m_FinalPassFrameBuffer;
-	FrameBuffer* m_ShieldDepthFrameBuffer = nullptr;
+    FrameBuffer m_FinalPassFrameBufferLowRes;
-	FrameBuffer* m_AntiAliasedFrameBuffer = nullptr;
+    GLuint m_BloomTexture;
-    GLuint m_BloomTexture = 0;
+    GLuint m_SceneTexture;
-    GLuint m_SceneTexture = 0;
+    GLuint m_BloomTextureLowRes;
-    GLuint m_DepthBuffer = 0;
+    GLuint m_SceneTextureLowRes;
-	GLuint m_ShieldBuffer = 0;
+    GLuint m_DepthBuffer;
-    GLuint m_CubeMapTexture = 0;
+    GLuint m_DepthBufferLowRes;
-    GLuint m_FullBlurredTexture = 0;
-    GLuint m_CombinedTexture = 0; //This can be removed for less memory usage, just set m_sceneTexture to the return from m_BlurHUDPass.CombineTextures
-	GLuint m_AntiAliasedTexture = 0; //Is only used when MSAA is active;
 
     //maqke this component based i guess?
     GLuint m_ShieldPixelRate = 16;
-	unsigned int m_MSAA = 0;
 
     const IRenderer* m_Renderer;
     const LightCullingPass* m_LightCullingPass;
-    const CubeMapPass* m_CubeMapPass;
-	const SSAOPass* m_SSAOPass;
-	const ShadowPass* m_ShadowPass;
 
     ShaderProgram* m_ForwardPlusProgram;
     ShaderProgram* m_ExplosionEffectProgram;
 	ShaderProgram* m_ExplosionEffectSplatMapProgram;
     ShaderProgram* m_SpriteProgram;
 	ShaderProgram* m_ForwardPlusSplatMapProgram;
-    ShaderProgram* m_FillDepthStencilBufferProgram;
+    ShaderProgram* m_ShieldToStencilProgram;
-
+    ShaderProgram* m_FillDepthBufferProgram;
-	ShaderProgram* m_ForwardPlusShieldCheckProgram;
-	ShaderProgram* m_ExplosionEffectShieldCheckProgram;
-	ShaderProgram* m_ExplosionEffectSplatMapShieldCheckProgram;
-	ShaderProgram* m_SpriteShieldCheckProgram;
-	ShaderProgram* m_ForwardPlusSplatMapShieldCheckProgram;
-
 
 
 	ShaderProgram* m_ForwardPlusSkinnedProgram;
 	ShaderProgram* m_ExplosionEffectSkinnedProgram;
 	ShaderProgram* m_ExplosionEffectSplatMapSkinnedProgram;
 	ShaderProgram* m_ForwardPlusSplatMapSkinnedProgram;
-    ShaderProgram* m_FillDepthStencilBufferSkinnedProgram;
+    ShaderProgram* m_ShieldToStencilSkinnedProgram;
-
+    ShaderProgram* m_FillDepthBufferSkinnedProgram;
-	ShaderProgram* m_ForwardPlusSkinnedShieldCheckProgram;
-	ShaderProgram* m_ExplosionEffectSkinnedShieldCheckProgram;
-	ShaderProgram* m_ExplosionEffectSplatMapSkinnedShieldCheckProgram;
-	ShaderProgram* m_ForwardPlusSplatMapSkinnedShieldCheckProgram;
-	ShaderProgram* m_FillDepthBufferSkinnedShieldCheckProgram;
 };
 
 #endif 

include/Engine/Rendering/EAutoAnimationBlend.h

@@ -1,28 +0,0 @@
-#ifndef Events_AutoAnimationBlend_h__
-#define Events_AutoAnimationBlend_h__
-
-#include "../Core/EventBroker.h"
-#include "../Core/EntityWrapper.h"
-
-namespace Events
-{
-
-struct AutoAnimationBlend : Event
-{
-    EntityWrapper RootNode = EntityWrapper::Invalid;
-    std::string NodeName;
-    double Duration = 0.0;
-    double Delay = 0.0;
-    
-    bool Start = false;
-    bool Reverse = false;
-    bool Restart = false;
-    bool SingleLevelBlend = false;
-    double Weight = -1.0;
-
-    EntityWrapper AnimationEntity = EntityWrapper::Invalid;
-};
-
-}
-
-#endif

include/Engine/Rendering/EResolutionChanged.h

@@ -1,19 +0,0 @@
-#ifndef EResolutionChanged_h__
-#define EResolutionChanged_h__
-
-#include "../Core/Event.h"
-#include "../Core/Util/Rectangle.h"
-
-namespace Events
-{
-
-// Fired when the framebuffer size changes
-struct ResolutionChanged : Event
-{
-    Rectangle OldResolution;
-    Rectangle NewResolution;
-};
-
-}
-
-#endif

include/Engine/Rendering/ESetBlendWeight.h

@@ -1,20 +0,0 @@
-#ifndef Events_SetBlendWeight_h__
-#define Events_SetBlendWeight_h__
-
-#include "../Core/EventBroker.h"
-#include "../Core/EntityWrapper.h"
-
-namespace Events
-{
-
-//Sets the blend weight for all nodes with "NodeName"
-struct SetBlendWeight : Event
-{
-    EntityWrapper RootNode = EntityWrapper::Invalid;
-    std::string NodeName;
-    double Weight;
-};
-
-}
-
-#endif

include/Engine/Rendering/ExplosionEffectJob.h

@@ -15,20 +15,18 @@
 
 struct ExplosionEffectJob : ModelJob
 {
-    ExplosionEffectJob(ComponentWrapper explosionEffectComponent, ::Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matGroup, ComponentWrapper modelComponent, ::World* world, glm::vec4 fillColor, float fillPercentage, bool isShielded, bool shadow)
+    ExplosionEffectJob(ComponentWrapper explosionEffectComponent, ::Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matGroup, ComponentWrapper modelComponent, ::World* world, glm::vec4 fillColor, float fillPercentage)
-        : ModelJob(model, camera, matrix, matGroup, modelComponent, world, fillColor, fillPercentage, isShielded, shadow)
+        : ModelJob(model, camera, matrix, matGroup, modelComponent, world, fillColor, fillPercentage)
     {
-        ExplosionOrigin = (Field<glm::vec3>)explosionEffectComponent["ExplosionOrigin"];
+        ExplosionOrigin = (glm::vec3)explosionEffectComponent["ExplosionOrigin"];
-        TimeSinceDeath = (Field<double>)explosionEffectComponent["TimeSinceDeath"];
+        TimeSinceDeath = (double)explosionEffectComponent["TimeSinceDeath"];
-        ExplosionDuration = (Field<double>)explosionEffectComponent["ExplosionDuration"];
+        ExplosionDuration = (double)explosionEffectComponent["ExplosionDuration"];
-        EndColor = (Field<glm::vec4>)explosionEffectComponent["EndColor"];
+        EndColor = (glm::vec4)explosionEffectComponent["EndColor"];
-        Randomness = (Field<bool>)explosionEffectComponent["Randomness"];
+        Randomness = (bool)explosionEffectComponent["Randomness"];
-        RandomnessScalar = (Field<double>)explosionEffectComponent["RandomnessScalar"];
+        RandomnessScalar = (double)explosionEffectComponent["RandomnessScalar"];
-        Velocity = (Field<glm::vec2>)explosionEffectComponent["Velocity"];
+        Velocity = (glm::vec2)explosionEffectComponent["Velocity"];
-        ColorByDistance = (Field<bool>)explosionEffectComponent["ColorByDistance"];
+        ColorByDistance = (bool)explosionEffectComponent["ColorByDistance"];
-        ExponentialAccelaration = (Field<bool>)explosionEffectComponent["ExponentialAccelaration"];
+        ExponentialAccelaration = (bool)explosionEffectComponent["ExponentialAccelaration"];
-        Reverse = (Field<bool>)explosionEffectComponent["Reverse"];Reverse = (bool)explosionEffectComponent["Reverse"];
-        ColorDistanceScalar = (Field<double>)explosionEffectComponent["ColorDistanceScalar"];ColorDistanceScalar = (double)explosionEffectComponent["ColorDistanceScalar"];
     };
 
     glm::vec3 ExplosionOrigin;
@@ -40,14 +38,12 @@ struct ExplosionEffectJob : ModelJob
     glm::vec4 EndColor;
     bool Randomness = false;
     
-    double RandomnessScalar = 1.f;
+    float RandomnessScalar = 1.f;
     glm::vec2 Velocity;
     bool ColorByDistance = false;
     //bool ReverseAnimation = false;
     //bool Wireframe = false;
     bool ExponentialAccelaration = false;
-	bool Reverse = false;
-	double ColorDistanceScalar = 1.f;
 
     std::array<float, 50> RandomNumbers = {
         0.3257552917701f,

include/Engine/Rendering/FrameBuffer.h

@@ -7,13 +7,11 @@
 class BufferResource
 {
 public:
-    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment, GLuint mipMapLod, bool multiSampling);
+    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment);
     
     GLuint* m_ResourceHandle;
     GLenum m_ResourceType;
     GLenum m_Attachment;
-    GLuint m_MipMapLod = 0;
-	bool m_MultiSampling = false;
 private:
     
 };
@@ -22,49 +20,29 @@ template <GLenum RESOURCETYPE>
 class ResourceType : public BufferResource
 {
 public:
-    ResourceType(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod, bool multiSampling)
+    ResourceType(GLuint* resourceHandle, GLenum attachment)
-        : BufferResource(resourceHandle, RESOURCETYPE, attachment, mipMapLod, multiSampling) { }
+        : BufferResource(resourceHandle, RESOURCETYPE, attachment) { }
 };
 
 class Texture2D : public ResourceType<GL_TEXTURE_2D>
 {
 public:
-    Texture2D(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod = 0)
+    Texture2D(GLuint* resourceHandle, GLenum attachment)
-        : ResourceType(resourceHandle, attachment, mipMapLod, false) { };
+        : ResourceType(resourceHandle, attachment) { };
 
     ~Texture2D();
 };
 
-class Texture2DMultiSample : public ResourceType<GL_TEXTURE_2D_MULTISAMPLE>
-{
-public:
-	Texture2DMultiSample(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod = 0)
-		: ResourceType(resourceHandle, attachment, mipMapLod, true) { };
-
-	~Texture2DMultiSample();
-};
-
 class RenderBuffer : public ResourceType<GL_RENDERBUFFER>
 {
 public:
-    RenderBuffer(GLuint* resourceHandle, GLenum attachment, bool multiSampling = false)
+    RenderBuffer(GLuint* resourceHandle, GLenum attachment)
-        : ResourceType(resourceHandle, attachment, 0, multiSampling)
+        : ResourceType(resourceHandle, attachment)
     { };
 
     ~RenderBuffer();
 };
 
-class Texture2DArray : public ResourceType<GL_TEXTURE_2D_ARRAY>
-{
-public:
-	Texture2DArray(GLuint* resourceHandle, GLenum attachment)
-		: ResourceType(resourceHandle, attachment, 0, false)
-	{ };
-
-	~Texture2DArray();
-};
-
-
 class FrameBuffer
 {
 public:
@@ -76,13 +54,9 @@ public:
     void Generate();
     void Bind();
     void Unbind();
-	void Read();
-	void Draw();
     GLuint GetHandle();
-	bool MultiSampling() { return m_MultiSampling; };
 
 private:
-	bool m_MultiSampling = true;
     GLuint m_BufferHandle;
     std::vector<std::shared_ptr<BufferResource>> m_Resources;
 };

include/Engine/Rendering/IRenderer.h

@@ -5,13 +5,11 @@
 #include "../OpenGL.h"
 #include "../GLM.h"
 #include "../Core/Util/Rectangle.h"
-#include "../Core/ConfigFile.h"
 #include "Util/ScreenCoords.h"
 #include "Camera.h"
 #include "RenderQueue.h"
 #include "Model.h"
 #include "../Core/World.h" //So temp
-#include "Util/CommonFunctions.h"
 
 
 struct PickData

include/Engine/Rendering/Image.h

@@ -3,8 +3,6 @@
 
 struct Image
 {
-    virtual ~Image() = default;
-
 	enum class ImageFormat
 	{
 		Unknown,
@@ -15,10 +13,7 @@ struct Image
 	unsigned int Width = 0;
 	unsigned int Height = 0;
 	ImageFormat Format = ImageFormat::Unknown;
-    unsigned int MipMapLevels = 0;
-    bool Compressed = false;
 	unsigned char* Data = nullptr;
-    std::size_t ByteSize = 0;
 };
 
 #endif

include/Engine/Rendering/LightCullingPass.h

@@ -54,7 +54,7 @@ private:
     struct Frustum {
         Plane Planes[4];
     };
-    Frustum* m_Frustums = nullptr;
+    Frustum* m_Frustums;
 
     //This should be a component
     struct LightSource {
@@ -74,11 +74,11 @@ private:
         glm::vec2 Padding = glm::vec2(1.f, 2.f);
     };
 
-    LightGrid* m_LightGrid = nullptr;
+    LightGrid* m_LightGrid;
 
     int m_LightOffset = 0;
 
-    float* m_LightIndex = nullptr;
+    float* m_LightIndex;
 };
 
 

include/Engine/Rendering/Model.h

@@ -16,18 +16,15 @@ private:
 
 public:
 	~Model();
-    const std::vector<RawModel::MaterialProperties>& MaterialGroups() const { return m_Materials; }
+    const std::vector<RawModel::MaterialProperties>& MaterialGroups() const { return m_RawModel->m_Materials; }
-	unsigned int NumberOfVertices() const { return m_Vertices.size(); }
+    const glm::mat4& Matrix() const { return m_RawModel->m_Matrix; }
-
+    const RawModel::Vertex* Vertices() const { return m_RawModel->Vertices(); }
+	unsigned int NumberOfVertices() const { return m_RawModel->NumVertices(); }
     const AABB& Box() const { return m_Box; }
-	bool IsSkinned() const { return m_IsSkinned; }
+	bool IsSkinned() const { return m_RawModel->IsSkinned(); }
 	GLuint VAO;
 	GLuint ElementBuffer;
-    //RawModel* m_RawModel;
+    RawModel* m_RawModel;
-
-    Skeleton* m_Skeleton = nullptr;
-    std::vector<glm::vec3> m_Vertices;
-    std::vector<unsigned int> m_Indices;
 
 private:
     AABB m_Box;
@@ -37,9 +34,6 @@ private:
 	GLuint TangentNormalsBuffer;
 	GLuint BiTangentNormalsBuffer;
 	GLuint TextureCoordBuffer;
-
-	std::vector<RawModel::MaterialProperties> m_Materials;
-    bool m_IsSkinned;
 };
 
 #endif

include/Engine/Rendering/ModelJob.h

@@ -12,27 +12,37 @@
 #include "../Core/ResourceManager.h"
 #include "Camera.h"
 #include "../Core/World.h"
-#include "../Core/TransformSystem.h"
+#include "../Core/Transform.h"
 #include "Skeleton.h"
 #include "ShaderProgram.h"
-#include "BlendTree.h"
 
 struct ModelJob : RenderJob
 {
-    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matProp, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage, bool isShielded, bool shadow)
+    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matProp, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage)
         : RenderJob()
     {
         Model = model;
 		ModelID = model->ResourceID;
 		Type = matProp.type;
 		::RawModel::MaterialBasic* matGroup = matProp.material;
-		ShaderID = matProp.ShaderID;
 		switch(matProp.type){
 		case ::RawModel::MaterialType::Basic:
+			if (Model->IsSkinned()) {
+				ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSkinnedProgram")->ResourceID;
+			}
+			else {
+				ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusProgram")->ResourceID;
+			}
 			TextureID = 0;
 			break;
 		case ::RawModel::MaterialType::SingleTextures:
 			{
+				if (Model->IsSkinned()) {
+					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSkinnedProgram")->ResourceID;
+				}
+				else {
+					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusProgram")->ResourceID;
+				}
 				::RawModel::MaterialSingleTextures* singleTextures = static_cast<::RawModel::MaterialSingleTextures*>(matProp.material);
 				TextureID = (singleTextures->ColorMap.Texture) ? singleTextures->ColorMap.Texture->ResourceID : 0;
 				if (modelComponent["DiffuseTexture"]) {
@@ -54,6 +64,12 @@ struct ModelJob : RenderJob
 			break;
 		case ::RawModel::MaterialType::SplatMapping:
 			{
+				if (Model->IsSkinned()) {
+					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSplatMapSkinnedProgram")->ResourceID;
+				}
+				else {
+					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSplatMapProgram")->ResourceID;
+				}
 				::RawModel::MaterialSplatMapping* SplatTextures = static_cast<::RawModel::MaterialSplatMapping*>(matProp.material);
 
 				SplatMap = &SplatTextures->SplatMap;
@@ -94,33 +110,45 @@ struct ModelJob : RenderJob
         Color = modelComponent["Color"];
         GlowIntensity = ((double)modelComponent["GlowIntensity"]);
         Entity = modelComponent.EntityID;
-        glm::vec3 abspos = glm::vec3(matrix[3][0], matrix[3][1], matrix[3][2]);
+        glm::vec3 abspos = Transform::AbsolutePosition(world, modelComponent.EntityID);
         glm::vec3 worldpos = glm::vec3(camera->ViewMatrix() * glm::vec4(abspos, 1));
         Depth = worldpos.z;
         World = world;
-		Shadow = shadow;
 
         FillColor = fillColor;
         FillPercentage = fillPercentage;
-		IsShielded = isShielded;
 
-        
-        if (world->HasComponent(Entity, "Unpickable")) {
-            NotPickable = true;
-        }
 
         if (model->IsSkinned()) {
-            Skeleton = Model->m_Skeleton;
+            Skeleton = Model->m_RawModel->m_Skeleton;
 
             if (Skeleton != nullptr) {
-                EntityWrapper entityWrapper = EntityWrapper(world, modelComponent.EntityID);
+                if (world->HasComponent(Entity, "Animation")) {
-                
+                    auto animationComponent = world->GetComponent(Entity, "Animation");
 
-                if(Skeleton->BlendTrees.find(entityWrapper) != Skeleton->BlendTrees.end()) {
+                    for (int i = 1; i <= 3; i++) {
-                    BlendTree = Skeleton->BlendTrees.at(entityWrapper);
+                        ::Skeleton::AnimationData animationData;
+                        animationData.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationComponent["AnimationName" + std::to_string(i)]);
+                        if (animationData.animation == nullptr) {
+                            continue;
+                        }
+                        animationData.time = (double)animationComponent["Time" + std::to_string(i)];
+                        animationData.weight = (double)animationComponent["Weight" + std::to_string(i)];
+
+                        Animations.push_back(animationData);
+                    }
+                }
+
+                if (world->HasComponent(Entity, "AnimationOffset")) {
+                    auto animationOffsetComponent = world->GetComponent(Entity, "AnimationOffset");
+                    AnimationOffset.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationOffsetComponent["AnimationName"]);
+                    AnimationOffset.time = (double)animationOffsetComponent["Time"];
+                } else {
+                    AnimationOffset.animation = nullptr;
                 }
             }
         }
+            
     };
 
     unsigned int TextureID;
@@ -139,7 +167,10 @@ struct ModelJob : RenderJob
     glm::vec4 Color;
     const ::Model* Model = nullptr;
     ::Skeleton* Skeleton = nullptr;
-    std::shared_ptr<::BlendTree> BlendTree = nullptr;
+    std::vector<::Skeleton::AnimationData> Animations;
+    ::Skeleton::AnimationOffset AnimationOffset;
+    
+
     float GlowIntensity = 8.0;
     glm::vec4 DiffuseColor;
     glm::vec4 SpecularColor;
@@ -150,15 +181,10 @@ struct ModelJob : RenderJob
 
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;
-	bool IsShielded;
-	bool Shadow;
-    bool NotPickable = false;
 
     void CalculateHash() override
     {
-		Hash = TextureID;
+        Hash = ShaderID << 20 + ModelID << 10 + TextureID;
-		Hash += ModelID << 10;
-		Hash += ShaderID << 20;
     }
 };
 

include/Engine/Rendering/PickingPass.h

@@ -28,13 +28,15 @@ public:
     const ShaderProgram& PickingProgram() const { return *m_PickingProgram; }
     //const std::unordered_map<glm::ivec2, EntityID>& PickingColorsToEntity() const { return m_PickingColorsToEntity; }
     GLuint PickingTexture() const { return m_PickingTexture; }
-    GLuint* DepthBuffer() { return &m_DepthBuffer; }
+    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;
+
     EventBroker* m_EventBroker;
 
     const IRenderer* m_Renderer;
@@ -52,8 +54,8 @@ private:
 
     std::unordered_map<glm::ivec2, PickingInfo> m_PickingColorsToEntity;
 
-    GLuint m_PickingTexture = 0;
+    GLuint m_PickingTexture;
-    GLuint m_DepthBuffer = 0;
+    GLuint m_DepthBuffer;
 
     FrameBuffer m_PickingBuffer;
 

include/Engine/Rendering/PointLightJob.h

@@ -7,7 +7,7 @@
 #include "../GLM.h"
 #include "../Core/ComponentWrapper.h"
 #include "RenderJob.h"
-#include "../Core/TransformSystem.h"
+#include "../Core/Transform.h"
 #include "../Core/World.h"
 
 struct PointLightJob : RenderJob
@@ -16,7 +16,7 @@ struct PointLightJob : RenderJob
         : RenderJob()
     {
         Position = glm::vec4((glm::vec3)transformComponent["Position"], 1.0f);
-        Position = glm::vec4(TransformSystem::AbsolutePosition(m_World, transformComponent.EntityID), 1.f);
+        Position = glm::vec4(Transform::AbsolutePosition(m_World, transformComponent.EntityID), 1.f);
         Color = (glm::vec4)pointLightComponent["Color"];
         Radius = (double)pointLightComponent["Radius"];
         Intensity = (double)pointLightComponent["Intensity"];

include/Engine/Rendering/RawModelCustom.h

@@ -13,25 +13,28 @@
 
 #include <boost/filesystem/path.hpp>
 
-#include <boost/endian/buffers.hpp>
 #include "../Common.h"
 #include "../GLM.h"
 #include "../Core/ResourceManager.h"
 #include "Texture.h"
 #include "Skeleton.h"
-#include "ShaderProgram.h"
+
+#include "boost\endian\buffers.hpp"
+
+
 
 class RawModelCustom : public Resource
 {
     friend class ResourceManager;
-    friend class Model;
+
 protected:
     RawModelCustom(std::string fileName);
 
 public:
     ~RawModelCustom();
-
+    
-	struct RenderVertex {
+	struct Vertex
+	{
 		glm::vec3 Position;
 		glm::vec3 Normal;
 		glm::vec3 Tangent;
@@ -39,7 +42,7 @@ public:
 		glm::vec2 TextureCoords;
 	};
 
-    struct SkinedVertex : public RenderVertex {
+    struct SkinedVertex : public Vertex {
         glm::vec4 BoneIndices;
         glm::vec4 BoneWeights;
     };
@@ -84,10 +87,9 @@ public:
 	struct MaterialProperties {
 		MaterialType type;
 		MaterialBasic* material;
-		unsigned int ShaderID = 0;
 	};
 
-	const RenderVertex* Vertices() const {
+	const Vertex*	Vertices() const {
 		if (hasSkin) { 
 			return m_SkinedVertices.data(); 
 		} else {
@@ -95,16 +97,16 @@ public:
 		}
 	};
 
-	unsigned int VertexSize() const {
+	unsigned int	VertexSize() const {
 		if (hasSkin) {
 			return sizeof(SkinedVertex);
 		}
 		else {
-			return sizeof(RenderVertex);
+			return sizeof(Vertex);
 		}
 	};
 
-	size_t NumVertices() const {
+	unsigned int	NumVertices() const {
 		if (hasSkin) {
 			return m_SkinedVertices.size();
 		} else {
@@ -112,39 +114,17 @@ public:
 		}
 	};
 
-	const std::vector<unsigned int>& Indices() const {
-		return m_Indices;
-	}
-
 	bool IsSkinned() const { return hasSkin; };
 
-	const std::vector<glm::vec3>& CollisionVertices();
-
-	size_t NumCollisionVertices() const {
-		return m_CollisionVertices.size();
-	};
-
-	const std::vector<unsigned int>& CollisionIndices() const {
-		if (hasCollisionMesh) {
-			return m_CollisionIndices;
-		} else {
-			return m_Indices;
-		}
-	};
-
 	std::vector<MaterialProperties> m_Materials;
 
-    
+    std::vector<unsigned int> m_Indices;
     Skeleton* m_Skeleton = nullptr;
     glm::mat4 m_Matrix;
 
 private:
    	bool hasSkin;
-	bool hasCollisionMesh = false;
+	std::vector<Vertex> m_Vertices;
-	std::vector<unsigned int> m_Indices;
-	std::vector<unsigned int> m_CollisionIndices;
-	std::vector<glm::vec3> m_CollisionVertices;
-	std::vector<RenderVertex> m_Vertices;
 	std::vector<SkinedVertex> m_SkinedVertices;
 
     void ReadMeshFile(std::string filePath);
@@ -167,12 +147,7 @@ private:
     void ReadAnimationClips(std::size_t& offset, char* fileData, const unsigned int& fileByteSize, unsigned int numberOfClips);
     void ReadAnimationClipSingle(std::size_t& offset, char* fileData, const unsigned int& fileByteSize, unsigned int clipIndex);
     void ReadAnimationKeyFrame(std::size_t& offset, char* fileData, const unsigned int& fileByteSize, std::vector<Skeleton::Animation::Keyframe>& animation);
-
+    
-
-	void ReadCollisionFile(std::string filePath);
-	void ReadCollisionFileData(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
-
-	const std::vector<glm::vec3>& ConstructCollisionList();
     //void CreateSkeleton(std::vector<std::tuple<std::string, glm::mat4>> &boneInfo, std::map<std::string, int> &boneNameMapping, aiNode* node, int parentID);
 };
 

include/Engine/Rendering/RenderJob.h

@@ -16,15 +16,16 @@ struct RenderJob
 public:
     float Depth;
 
-	bool operator<(const RenderJob& rhs)
-	{
-		return this->Hash < rhs.Hash;
-	}
-
 protected:
     uint64_t Hash;
 
     virtual void CalculateHash() = 0;
+
+    bool operator<(const RenderJob& rhs)
+    {
+        return this->Hash < rhs.Hash;
+    }
+
 };
 
 #endif

include/Engine/Rendering/RenderQueue.h

@@ -24,6 +24,7 @@ struct RenderScene
         std::list<std::shared_ptr<RenderJob>> OpaqueObjects;
         std::list<std::shared_ptr<RenderJob>> TransparentObjects;
         std::list<std::shared_ptr<RenderJob>> OpaqueShieldedObjects;
+        std::list<std::shared_ptr<RenderJob>> TransparentShieldedObjects;
         std::list<std::shared_ptr<RenderJob>> ShieldObjects;
         std::list<std::shared_ptr<RenderJob>> SpriteJob;
         std::list<std::shared_ptr<RenderJob>> PointLight;
@@ -33,7 +34,6 @@ struct RenderScene
 
     Rectangle Viewport;
     bool ClearDepth = false;
-    bool ShouldBlur = false;
     glm::vec4 AmbientColor;
 
 	void Clear()
@@ -41,6 +41,7 @@ struct RenderScene
         Jobs.OpaqueObjects.clear();
         Jobs.TransparentObjects.clear();
         Jobs.OpaqueShieldedObjects.clear();
+        Jobs.TransparentShieldedObjects.clear();
         Jobs.ShieldObjects.clear();
         Jobs.SpriteJob.clear();
         Jobs.DirectionalLight.clear();

include/Engine/Rendering/RenderState.h

@@ -24,8 +24,6 @@ public:
     bool StencilFunc(GLenum func, GLint ref, GLuint mask);
     bool StencilMask(GLuint mask);
     bool DepthMask(GLboolean flag);
-	bool DepthFunc(GLenum func);
-	bool AlphaFunc(GLenum func, GLclampf thresholder);
 
 private:
     std::vector<std::function<void(void)>> m_ResetFunctions;

include/Engine/Rendering/RenderSystem.h

@@ -14,12 +14,11 @@
 #include "ModelJob.h"
 #include "Renderer.h"
 #include "PointLightJob.h"
-#include "../Core/TransformSystem.h"
+#include "../Core/Transform.h"
 #include "../Core/EPlayerSpawned.h"
 #include "../Core/Octree.h"
 #include "../Collision/EntityAABB.h"
 #include "../Core/ConfigFile.h"
-#include "EResolutionChanged.h"
 
 class RenderSystem : public ImpureSystem
 {
@@ -37,8 +36,6 @@ private:
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
     Octree<EntityAABB>* m_Octree;
 
-    EventRelay<RenderSystem, Events::ResolutionChanged> m_EResolutionChanged;
-    bool OnResolutionChanged(Events::ResolutionChanged &event);
     EventRelay<RenderSystem, Events::SetCamera> m_ESetCamera;
     bool OnSetCamera(Events::SetCamera &event);
     EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;

include/Engine/Rendering/Renderer.h

@@ -17,32 +17,23 @@
 #include "DrawBloomPass.h"
 #include "DrawColorCorrectionPass.h"
 #include "SSAOPass.h"
-#include "CubeMapPass.h"
-#include "BlurHUD.h"
 #include "../Core/EventBroker.h"
 #include "ImGuiRenderPass.h"
 #include "Camera.h"
-#include "../Core/TransformSystem.h"
+#include "../Core/Transform.h"
 #include "imgui/imgui.h"
 #include "TextPass.h"
 #include "Util/CommonFunctions.h"
 #include "Core/PerformanceTimer.h"
-#include "ShadowPass.h"
-#include "EResolutionChanged.h"
 
 class Renderer : public IRenderer
 {
     static void glfwFrameBufferCallback(GLFWwindow* window, int width, int height);
-    static void glfwWindowSizeCallback(GLFWwindow* window, int width, int height);
 
 public:
-	Renderer(EventBroker* eventBroker, ConfigFile* config)
+    Renderer(EventBroker* eventBroker) 
-		: m_EventBroker(eventBroker)
+        : m_EventBroker(eventBroker)
-		, m_Config(config)
     { }
-	~Renderer();
-
-    virtual void SetResolution(const Rectangle& resolution) override;
 
     virtual void Initialize() override;
     virtual void Update(double dt) override;
@@ -50,11 +41,11 @@ public:
 
     virtual PickData Pick(glm::vec2 screenCoord) override;
 
+
 private:
     //----------------------Variables----------------------//
 
     static std::unordered_map <GLFWwindow*, Renderer*> m_WindowToRenderer;
-	ConfigFile* m_Config;
 
     EventBroker* m_EventBroker;
     TextPass* m_TextPass;
@@ -67,11 +58,13 @@ private:
     Model* m_UnitSphere;
 
     int m_DebugTextureToDraw = 0;
-    int m_CubeMapTexture = 0;
     bool m_ResizeWindow = false;
-	int m_SSAO_Quality = 0;
+	float m_SSAO_Radius = 1.0f;
-	int m_GLOW_Quality = 2;
+	float m_SSAO_Bias = 0.05f;
-	unsigned int m_MSAA_Level = 0;
+	float m_SSAO_Contrast = 1.5f;
+	float m_SSAO_IntensityScale = 1.0f;
+	int m_SSAO_NumOfSamples = 24;
+	int m_SSAO_NumOfTurns = 7;
 
     PickingPass* m_PickingPass;
     LightCullingPass* m_LightCullingPass;
@@ -81,9 +74,6 @@ private:
     DrawBloomPass* m_DrawBloomPass;
     DrawColorCorrectionPass* m_DrawColorCorrectionPass;
 	SSAOPass* m_SSAOPass;
-    CubeMapPass* m_CubeMapPass;
-	ShadowPass* m_ShadowPass;
-    BlurHUD* m_BlurHUDPass;
 
     //----------------------Functions----------------------//
     void InitializeWindow();
@@ -94,14 +84,11 @@ private:
     void InputUpdate(double dt);
     //void PickingPass(RenderQueueCollection& rq);
     //void DrawScreenQuad(GLuint textureToDraw);
-    void setWindowSize(Rectangle size);
-    void updateFramebufferSize();
 
     static bool DepthSort(const std::shared_ptr<RenderJob> &i, const std::shared_ptr<RenderJob> &j) { return (i->Depth < j->Depth); }
     void SortRenderJobsByDepth(RenderScene &scene);
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
-
+	//--------------------ShaderPrograms-------------------//
-    //--------------------ShaderPrograms-------------------//
     ShaderProgram* m_BasicForwardProgram;
     ShaderProgram* m_ExplosionEffectProgram;
 

include/Engine/Rendering/SSAOPass.h

@@ -13,32 +13,15 @@
 class SSAOPass
 {
 public:
-	SSAOPass(IRenderer* renderer, ConfigFile* config);
+	SSAOPass(IRenderer* rendere);
-	~SSAOPass();
+	~SSAOPass() { };
-
-	void ChangeQuality(int quality);
 
 	void Draw(GLuint depthBuffer, Camera* camera);
-	void Setting(float radius, float bias, float contrast, float intensityScale, int numOfSamples, int numOfTurns, int iterations, int quality);
+	void Setting(float radius, float bias, float contrast, float intensityScale, int numOfSamples, int NumOfTurns);
 	void ClearBuffer();
-	void OnWindowResize();
 
 	//Return the SSAO of the texture sent to Draw
-	GLuint SSAOTexture() const { 
+	GLuint SSAOTexture() const { return m_DrawBloomPass->GaussianTexture(); }
-		if (m_Quality == 0) {
-			return m_WhiteTexture->m_Texture;
-		} else {
-			return m_Gaussian_vert;
-		}
-	}
-
-	int TextureQuality() const {
-		if (m_Quality == 0) {
-			return 13;
-		} else {
-			return m_TextureQuality;
-		}
-	}
 
 private:
 	void InitializeTexture();
@@ -46,13 +29,15 @@ private:
 	void InitializeShaderProgram();
 	void InitializeBuffer();
 
+	void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
+
+	void ComputeAO(GLuint depthBuffer, Camera* camera);
 	//void blurHorizontal(GLuint depthBuffer);
 	//void blurVertical(GLuint depthBuffer);
 
 	Model* m_ScreenQuad;
 
 	const IRenderer* m_Renderer;
-	ConfigFile* m_Config;
 
 	float m_Radius;
 	float m_Bias;
@@ -60,28 +45,17 @@ private:
 	float m_IntensityScale;
 	int m_NumOfSamples;
 	int m_NumOfTurns;
-	int m_Iterations;
-	int m_TextureQuality;
-	int m_Quality = 0;
 
-	Texture* m_WhiteTexture;
+	GLuint m_SSAOTexture;
-
-	GLuint m_SSAOTexture = 0;
 	FrameBuffer m_SSAOFramBuffer;
 
-	GLuint m_SSAOViewSpaceZTexture = 0;
+	GLuint m_SSAOViewSpaceZTexture;
 	FrameBuffer m_SSAOViewSpaceZFramBuffer;
 
-	GLuint m_Gaussian_horiz = 0;
-	GLuint m_Gaussian_vert = 0;
-
-	FrameBuffer m_GaussianFrameBuffer_horiz;
-	FrameBuffer m_GaussianFrameBuffer_vert;
-
 	ShaderProgram* m_SSAOProgram;
 	ShaderProgram* m_SSAOViewSpaceZProgram;
-	ShaderProgram* m_GaussianProgram_horiz;
+
-	ShaderProgram* m_GaussianProgram_vert;
+	DrawBloomPass* m_DrawBloomPass;
 };
 
 #endif

include/Engine/Rendering/ShaderProgram.h

@@ -21,8 +21,6 @@ public:
 	std::string GetFileName() const;
 	GLuint GetHandle() const;
 	bool IsCompiled() const;
-    static std::string ReadFile(std::string fileName);
-private:
 protected:
 	GLenum m_ShaderType;
 	std::string m_FileName;

include/Engine/Rendering/ShadowPass.h

@@ -1,88 +0,0 @@
-#ifndef ShadowPass_h__
-#define ShadowPass_h__
-
-#include "IRenderer.h"
-#include "FrameBuffer.h"
-#include "ShaderProgram.h"
-#include "../Core/EventBroker.h"
-#include "../Core/World.h"
-#include "ShadowPassState.h"
-#include "imgui/imgui.h"
-
-#define MAX_SPLITS 4
-
-enum NearFar { NEAR = 0, FAR = 1 };
-enum LRBT { LEFT = 0, RIGHT = 1, BOTTOM = 2, TOP = 3 };
-
-struct ShadowFrustum
-{
-	float NearClip;
-	float FarClip;
-	float FOV;
-	float AspectRatio;
-	glm::vec3 MiddlePoint;
-	float Radius;
-	std::array<float, 4> LRBT;
-	std::array<glm::vec3, 8> CornerPoint;
-};
-
-class ShadowPass
-{
-public:
-	ShadowPass(IRenderer* renderer);
-	ShadowPass(IRenderer * renderer, int ShadowResX, int ShadowResY);
-	~ShadowPass();
-
-	void InitializeFrameBuffers();
-	void InitializeShaderPrograms();
-	void ClearBuffer();
-	void Draw(RenderScene& scene);
-
-	void DebugGUI();
-
-	GLuint DepthMap() const { return m_DepthMap; }
-	std::array<glm::mat4, MAX_SPLITS> LightP() const { return m_LightProjection; }
-	std::array<glm::mat4, MAX_SPLITS> LightV() const { return m_LightView; }
-	std::array<float, MAX_SPLITS> FarDistance() const { std::array<float, MAX_SPLITS> f; for (int i = 0; i < MAX_SPLITS; i++) f[i] = m_shadowFrusta[i].FarClip; return f; }
-	int CurrentNrOfSplits() const { return m_CurrentNrOfSplits; }
-
-	void SetSplitWeight(float split_weight) { m_SplitWeight = split_weight; };
-private:
-	void InitializeCameras(RenderScene & scene);
-	void UpdateSplitDist(std::array<ShadowFrustum, MAX_SPLITS>& frusta, float near_distance, float far_distance);
-	void UpdateFrustumPoints(ShadowFrustum& frustum, glm::vec3 camera_position, glm::vec3 view_dir);
-	void UpdateFrustumPoints(ShadowFrustum& frustum, glm::mat4 p, glm::mat4 v);
-
-	void PointsToLightspace(ShadowFrustum& frustum, glm::mat4 v);
-
-	float FindRadius(ShadowFrustum& frustum);
-	void RadiusToLightspace(ShadowFrustum& frustum);
-
-	EventBroker* m_EventBroker;
-	const IRenderer* m_Renderer;
-
-	GLuint m_DepthMap;
-	FrameBuffer m_DepthBuffer;
-    ShaderProgram* m_ShadowProgram;
-    ShaderProgram* m_ShadowProgramSkinned;
-
-	std::array<glm::mat4, MAX_SPLITS> m_LightProjection;
-	std::array<glm::mat4, MAX_SPLITS> m_LightView;
-
-	GLfloat m_NearFarPlane[2] = { -34.f, 27.f };
-	GLuint m_ResolutionSizeWidth = 1024 * 2;
-	GLuint m_ResolutionSizeHeight = 1024 * 2;
-
-	bool m_TransparentObjects = false;
-	bool m_TexturedShadows = false;
-	bool m_EnableShadows = true;
-
-	int m_CurrentNrOfSplits = 4;
-	float m_SplitWeight = 0.962f;
-
-	std::array<ShadowFrustum, MAX_SPLITS> m_shadowFrusta;
-
-	Texture* m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/White.png");
-};
-
-#endif

include/Engine/Rendering/ShadowPassState.h

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

include/Engine/Rendering/Skeleton.h

@@ -6,9 +6,27 @@
 #include "../GLM.h"
 #include <glm/gtx/matrix_decompose.hpp>
 #include <imgui/imgui.h>
-#include "../Core/EntityWrapper.h"
 
-class BlendTree;
+//struct Bone
+//{
+//	Bone(std::string name, glm::mat4 offsetMatrix)
+//		: Name(name)
+//		, OffsetMatrix(offsetMatrix)
+//	{ }
+//
+//	~Bone()
+//	{
+//		for (auto kv : Children) {
+//			delete kv.second;
+//		}
+//	}
+//
+//	std::string Name;
+//	glm::mat4 OffsetMatrix;
+//	glm::mat4 LocalMatrix;
+//
+//	std::map<std::string, Bone*> Children;
+//};
 
 class Skeleton
 {
@@ -20,14 +38,11 @@ public:
 			, Parent(parent)
 			, Name(name)
 			, OffsetMatrix(offsetMatrix)
-		{
+		{ }
-			BindTransformMatrix = glm::inverse(offsetMatrix);
-		}
 
 		std::string Name;
 		glm::mat4 OffsetMatrix;
         int ID;
-		glm::mat4 BindTransformMatrix;
 
 		Bone* Parent;
 		std::vector<Bone*> Children;
@@ -53,43 +68,58 @@ public:
         std::map<int, std::vector<Keyframe>> JointAnimations;
 	};
 
-    struct PoseData {
+    struct AnimationData
-        glm::vec3 Translation;
+    {
-        glm::quat Orientation;
+        const Animation* animation;
-        glm::vec3 Scale;
+        float time;
+        float weight;
+    };
+
+    struct JointFrameTransform {
+        glm::vec3 PositionInterp = glm::vec3(0);
+        glm::quat RotationInterp = glm::quat();
+        glm::vec3 ScaleInterp = glm::vec3(0);
+        float Weight;
+    };
+
+    struct AnimationOffset {
+        const Animation* animation;
+        float time;
     };
 
 	Skeleton() { }
 	~Skeleton();
 
 	Bone* RootBone;
-	std::map<int, Bone*> Bones;
 
-    std::unordered_map<EntityWrapper, std::shared_ptr<BlendTree>> BlendTrees;
+	std::map<int, Bone*> Bones;
 
 	// Attach a new bone to the skeleton
 	// Returns: New bone index
 	int CreateBone(int ID, int parentID, std::string name, glm::mat4 offsetMatrix);
+
 	int GetBoneID(std::string name);
+
+    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, AnimationOffset animationOffset, bool noRootMotion = false);
+    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, bool noRootMotion = false);
+
     const Animation* GetAnimation(std::string name);
 
-    std::map<int, Skeleton::PoseData> GetFrameBones(const Animation* animation, double time, bool additive, bool noRootMotion = false);
+    void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
-    
+    void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, AnimationOffset animationOffset, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
-    std::map<int, Skeleton::PoseData> BlendPoses(const std::map<int, PoseData>& pose1, const std::map<int, PoseData>& pose2, double weight);
-    std::map<int, Skeleton::PoseData> OverridePose(const std::map<int, PoseData>& overridePose, const std::map<int, PoseData>& targetPose);
-    std::map<int, Skeleton::PoseData> BlendPoseAdditive(const std::map<int, PoseData>& additivePose, const std::map<int, PoseData>& targetPose);
-    void GetFinalPose(std::map<int, Skeleton::PoseData>& boneMatrices, std::vector<glm::mat4>& finalPose, std::map<int, glm::mat4>& boneTransforms);
-    
-    std::vector<glm::mat4> GetTPose();
 
+    void PrintSkeleton();
+	void PrintSkeleton(const Bone* parent, int depthCount);
+	std::map<std::string, Animation> Animations;
+
+    glm::mat4 GetBoneTransform(const Bone* bone, const Animation* animation, float time, glm::mat4 childMatrix);
+    glm::mat4 GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, AnimationOffset animationOffset, glm::mat4 childMatrix);
+    glm::mat4 GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, glm::mat4 childMatrix);
+    int GetKeyframe(const Animation& animation, double time);
 
-    std::map<std::string, Animation> Animations;
 private:
-    Skeleton::PoseData GetAdditiveBonePose(const Bone* bone, const Animation* animation, double time);
+
-    
+    glm::mat4 GetOffsetTransform(const Bone* bone, AnimationOffset animationOffset);
-    void AccumulateFinalPose(std::map<int, glm::mat4>& boneMatrices, std::map<int, Skeleton::PoseData>& poseDatas, std::map<int, glm::mat4>& boneTransforms, const Bone* bone, glm::mat4 parentMatrix);
-    void AdditiveBoneTransforms(const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone);
-    void AccumulateBoneTransforms(bool noRootMotion, const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone);
 
 	std::map<std::string, Bone*> m_BonesByName;
     

include/Engine/Rendering/SpriteJob.h

@@ -7,13 +7,12 @@
 #include "../GLM.h"
 #include "../Core/ComponentWrapper.h"
 #include "Texture.h"
-#include "TextureSprite.h"
 #include "Model.h"
 #include "RenderJob.h"
 #include "../Core/ResourceManager.h"
 #include "Camera.h"
 #include "../Core/World.h"
-#include "../Core/TransformSystem.h"
+#include "../Core/Transform.h"
 #include "Skeleton.h"
 
 struct SpriteJob : RenderJob
@@ -21,24 +20,20 @@ struct SpriteJob : RenderJob
     SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted, bool isIndicator)
         : RenderJob()
     {
-        Model = ResourceManager::Load<::Model>(cSprite["Model"]);
+        Model = ResourceManager::Load<::Model>("Models/Core/UnitQuad.mesh");
         ::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
         TextureID = 0;
 
-        DiffuseTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["DiffuseTexture"]);
+        DiffuseTexture = CommonFunctions::LoadTexture(cSprite["DiffuseTexture"], true);
-        IncandescenceTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["GlowMap"]);
 
-        Linear = (bool)cSprite["Linear"];
+        IncandescenceTexture = CommonFunctions::LoadTexture(cSprite["GlowMap"], true);
-		ClampToBorder = (bool)cSprite["ClampToBorder"];
 
         StartIndex = matProp.material->StartIndex;
         EndIndex = matProp.material->EndIndex;
 		Matrix = matrix;
         Color = cSprite["Color"];
-        BlurBackground = (bool)cSprite["BlurBackground"];
-
         Entity = cSprite.EntityID;
-        Position = TransformSystem::AbsolutePosition(world, cSprite.EntityID);
+        Position = Transform::AbsolutePosition(world, cSprite.EntityID);
         Depth = 0;
         if (depthSorted) {
             glm::vec3 viewpos = glm::vec3(camera->ViewMatrix() * glm::vec4(Position, 1));
@@ -50,26 +45,6 @@ struct SpriteJob : RenderJob
 
         FillColor = fillColor;
         FillPercentage = fillPercentage;
-
-        glm::vec3 scale = TransformSystem::AbsoluteScale(world, cSprite.EntityID);
-
-        if((bool)cSprite["KeepRatio"] == true) {
-            if(scale.y >= scale.x) {
-                ScaleY = (scale.y)/(scale.x);
-                ScaleX = 1.f;
-            } else {
-                ScaleY = 1.f;
-                ScaleX = (scale.x)/(scale.y);
-            }
-        } else {
-            if ((bool)cSprite["KeepRatioX"] == true) {
-                ScaleX = scale.x;
-            }
-            if ((bool)cSprite["KeepRatioY"] == true) {
-                ScaleY = scale.y;
-            }
-        }
-
     };
 
     unsigned int TextureID;
@@ -90,11 +65,6 @@ struct SpriteJob : RenderJob
 
     bool Pickable;
 	bool IsIndicator = false;
-    bool BlurBackground = false;
-    float ScaleX = 1.f;
-    float ScaleY = 1.f;
-    bool Linear = false;
-	bool ClampToBorder = false;
 
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;

include/Engine/Rendering/TextJob.h

@@ -17,8 +17,8 @@ struct TextJob : RenderJob
         : RenderJob()
     {
         Matrix = matrix;
-        Color = (const glm::vec4&)textComponent["Color"];
+        Color = (glm::vec4)textComponent["Color"];
-        Content = (const std::string&)textComponent["Content"];
+        Content = (std::string)textComponent["Content"];
         Resource = font;
 
         if ((int)textComponent["Alignment"] == textComponent["Alignment"].Enum("Left")) {

include/Engine/Rendering/TextPass.h

@@ -23,7 +23,6 @@ public:
 
 private:
     void renderText(std::string text, Font* font, TextJob::AlignmentEnum alignment, glm::vec4 color, glm::mat4 modelMatrix, glm::mat4 projectionMatrix, glm::mat4 viewMatrix);
-	std::string parseColors(std::string text, std::map<int, glm::vec4>& colorChanges, glm::vec4 originalColor);
 
     Font* font;
     GLuint VAO, VBO;

include/Engine/Rendering/Texture.h

@@ -1,17 +1,15 @@
 #ifndef Texture_h__
 #define Texture_h__
 
-#include <boost/filesystem.hpp>
 #include "../OpenGL.h"
 #include "BaseTexture.h"
 #include "PNG.h"
-#include "DDS.h"
 
 class Texture : public BaseTexture
 {
 	friend class ResourceManager;
 
-protected:
+private:
 	Texture(std::string path);
 
 public:
@@ -20,9 +18,7 @@ public:
 	void Bind(GLenum textureUnit = GL_TEXTURE0);
 
 	GLuint m_Texture = 0;
-
+    
-	enum TextureType : GLint { cInvalid = 0, cDDS = 1, cPNG = 2};
-	TextureType m_Type;
 };
 
 #endif

include/Engine/Rendering/TextureSprite.h

@@ -1,19 +0,0 @@
-#ifndef TextureSprite_h__
-#define TextureSprite_h__
-
-#include "../OpenGL.h"
-#include "BaseTexture.h"
-#include "Texture.h"
-#include "PNG.h"
-
-class TextureSprite : public Texture
-{
-	friend class ResourceManager;
-
-protected:
-	TextureSprite(std::string path);
-
-public:
-};
-
-#endif

include/Engine/Rendering/Util/CommonFunctions.h

@@ -8,27 +8,7 @@
 
 namespace CommonFunctions
 { 
-
+Texture* LoadTexture(std::string path, bool threaded);
-//Loads Texture/SpriteTexture and return null if it fails
-template <typename T, bool threaded>
-Texture* TryLoadResource(std::string path)
-{
-    Texture* img;
-    try {
-        img = ResourceManager::Load<T, threaded>(path);
-    } catch (const Resource::StillLoadingException&) {
-        img = ResourceManager::Load<T>("Textures/Core/ErrorTexture.png");
-    } catch (const std::exception&) {
-        img = nullptr;
-    }
-
-    return img;
-}
-
-void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
-void GenerateMultiSampleTexture(GLuint* texture, int numSamples, glm::vec2 dimensions, GLint internalFormat);
-void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type, GLint numMipMaps, GLint MAGFilter, GLint MINFilter);
-void DeleteTexture(GLuint* texture);
 };
 
 #endif

include/Engine/Rendering/Util/GLError.h

@@ -16,11 +16,7 @@ inline bool _GLERROR(const char* info, const char* file, const char* func, unsig
 	return false;
 }
 
-#ifdef DEBUG
 #define GLERROR(function) \
 	_GLERROR(function, __BASE_FILE__, __func__, __LINE__)
-#else
-#define GLERROR(function) false
-#endif
 
 #endif

include/Engine/Sound/EChangeBGM.h

@@ -1,16 +0,0 @@
-#ifndef Events_ChangeBGM_h__
-#define Events_ChangeBGM_h__
-
-#include <string>
-#include "../Engine/Core/EventBroker.h"
-
-namespace Events
-{
-
-struct ChangeBGM : Event
-{
-    std::string FilePath = "";
-};
-
-}
-#endif // Events_ChangeBGM_h__

include/Engine/Sound/EPlayAnnouncerVoice.h

@@ -1,17 +0,0 @@
-#ifndef Events_PlayAnnouncerVoice_h__
-#define Events_PlayAnnouncerVoice_h__
-
-#include <string>
-#include "../Engine/Core/EventBroker.h"
-
-namespace Events
-{
-
-struct PlayAnonuncerVoice : public Event
-{
-    std::string FilePath = "";
-};
-
-}
-
-#endif

include/Engine/Sound/EPlaySoundOnEntity.h

@@ -12,8 +12,7 @@ namespace Events
 // Sound behavior is thereby specified in the SoundEmitter component.
 struct PlaySoundOnEntity : public Event
 {
-    EntityWrapper Emitter = EntityWrapper::Invalid;
+    EntityID EmitterID = 0;
-    float Gain = 1.f;
     std::string FilePath = "";
 };
 

include/Engine/Sound/ESetAnnouncerGain.h

@@ -1,16 +0,0 @@
-#ifndef Events_SetAnnouncerGain_h__
-#define Events_SetAnnouncerGain_h__
-
-#include "../Engine/Core/EventBroker.h"
-
-namespace Events
-{
-
-struct  SetAnnouncerGain : public Event
-{
-    float Gain = 1;
-};
-
-}
-
-#endif // 

include/Engine/Sound/SoundManager.h

@@ -9,36 +9,32 @@
 #include "OpenAL/al.h"
 #include "OpenAL/alc.h"
 
-#include "../Engine/Core/World.h"
+#include "imgui/imgui.h"
-#include "../Engine/Core/EventBroker.h"
+
+#include "Core/World.h"
+#include "Core/EventBroker.h"
 #include "../Engine/Core/ResourceManager.h"
 #include "../Engine/Core/ConfigFile.h"
-#include "../Engine/Core/TransformSystem.h"
+#include "Core/Transform.h" // Absolute transform
-#include "../Engine/Sound/Sound.h"
+#include "Sound/Sound.h"
 #include "../Engine/Sound/EPlayQueueOnEntity.h"
-#include "../Engine/Sound/EPlaySoundOnEntity.h"
+#include "Sound/EPlaySoundOnEntity.h"
-#include "../Engine/Sound/EPlaySoundOnPosition.h"
+#include "Sound/EPlaySoundOnPosition.h"
-#include "../Engine/Sound/EPlayBackgroundMusic.h"
+#include "Sound/EPlayBackgroundMusic.h"
-#include "../Engine/Sound/EPlayAnnouncerVoice.h"
+#include "Sound/EPauseSound.h"
-#include "../Engine/Sound/EPauseSound.h"
+#include "Sound/EContinueSound.h"
-#include "../Engine/Sound/EContinueSound.h"
+#include "Sound/EStopSound.h"
-#include "../Engine/Sound/EStopSound.h"
+#include "Sound/ESetBGMGain.h"
-#include "../Engine/Sound/ESetBGMGain.h"
+#include "Sound/ESetSFXGain.h"
-#include "../Engine/Sound/ESetSFXGain.h"
+#include "Core/EPause.h"
-#include "../Engine/Sound/ESetAnnouncerGain.h"
+#include "Core/EComponentAttached.h"
-#include "../Engine/Sound/EChangeBGM.h"
-#include "../Engine/Core/EPause.h"
-#include "../Engine/Core/EComponentAttached.h"
 #include "../Core/EPlayerSpawned.h"
-#include "../Rendering/ESetCamera.h"
-
 
 typedef std::pair<ALuint, std::vector<ALuint>> QueuedBuffers;
 
 enum class SoundType {
     SFX,
-    BGM,
+    BGM
-    Announcer
 };
 
 struct Source
@@ -47,7 +43,6 @@ struct Source
     Sound* SoundResource = nullptr;
     ALuint ALsource;
     SoundType Type;
-    float Duration;
 };
 
 class SoundManager
@@ -79,20 +74,14 @@ private:
     ALenum getSourceState(ALuint source);
     void setGain(Source* source, float gain);
     void setSoundProperties(Source* source, ComponentWrapper* soundComponent);
-    float getDurationSeconds(Source* source);
-    float getTimeOffsetSeconds(Source* source);
-    void setTimeOffsetSeconds(Source* source, float timeOffset);
 
     // Specific logic
     void playSound(Source* source);
-    // Needs to be the same format (sample rate etc)
+    // Need to be the same format (sample rate etc)
     void playQueue(QueuedBuffers qb);
     void stopSound(Source* source);
     Source* createSource(std::string filePath);
     std::unordered_map<EntityID, Source*> m_Sources;
-    void matchBGMLoop();
-    Source* m_CurrentBGM = nullptr;
-    Source* m_CurrentBGMCombo = nullptr;
 
     // Logic
     World* m_World = nullptr;
@@ -104,7 +93,6 @@ private:
 
     float m_BGMVolumeChannel = 1.0f;
     float m_SFXVolumeChannel = 1.0f;
-    float m_AnnouncerVolumeChannel = 1.0f;
     EntityWrapper m_LocalPlayer = EntityWrapper();
     
     // Events
@@ -114,8 +102,6 @@ private:
     bool OnPlaySoundOnPosition(const Events::PlaySoundOnPosition &e);
     EventRelay<SoundManager, Events::PlayBackgroundMusic> m_EPlayBackgroundMusic;
     bool OnPlayBackgroundMusic(const Events::PlayBackgroundMusic &e);
-    EventRelay<SoundManager, Events::PlayAnonuncerVoice> m_EPlayAnnouncerVoice;
-    bool OnPlayAnnouncerVoice(const Events::PlayAnonuncerVoice& e);
     EventRelay<SoundManager, Events::PauseSound> m_EPauseSound;
     bool OnPauseSound(const Events::PauseSound &e);
     EventRelay<SoundManager, Events::StopSound> m_EStopSound;
@@ -126,8 +112,6 @@ private:
     bool OnSetBGMGain(const Events::SetBGMGain &e);
     EventRelay<SoundManager, Events::SetSFXGain> m_ESetSFXGain; 
     bool OnSetSFXGain(const Events::SetSFXGain &e);
-    EventRelay<SoundManager, Events::SetAnnouncerGain> m_ESetAnnouncerGain;
-    bool OnSetAnnouncerGain(const Events::SetAnnouncerGain& e);
     EventRelay<SoundManager, Events::ComponentAttached> m_EComponentAttached;
     bool OnComponentAttached(const Events::ComponentAttached &e);
     EventRelay<SoundManager, Events::Pause> m_EPause;
@@ -138,10 +122,6 @@ private:
     bool OnPlayerSpawned(const Events::PlayerSpawned &e);
     EventRelay<SoundManager, Events::PlayQueueOnEntity> m_EPlayQueueOnEntity;
     bool OnPlayQueueOnEntity(const Events::PlayQueueOnEntity &e);
-    EventRelay<SoundManager, Events::ChangeBGM> m_EChangeBGM;
-    bool OnChangeBGM(const Events::ChangeBGM &e);
-    EventRelay<SoundManager, Events::SetCamera> m_ESetCamera;
-    bool OnSetCamera(const Events::SetCamera& e);
 
 
 };

include/Game/Events/EDashAbility.h

@@ -2,15 +2,11 @@
 #define Events_DashAbility_h__
 
 #include "Core/Event.h"
-#include "Core/EntityWrapper.h"
 
 namespace Events
 {
 
-struct DashAbility : public Event 
+struct DashAbility : public Event { };
-{
-    EntityID Player;
-};
 
 }
 

include/Game/Events/EDoubleJump.h

@@ -8,7 +8,7 @@ namespace Events
 
 struct DoubleJump : public Event
 {
-    EntityID entityID;
+
 };
 
 }

include/Game/Events/EReset.h

@@ -1,16 +0,0 @@
-#ifndef Events_Reset_h__
-#define Events_Reset_h__
-
-#include "Core/EventBroker.h"
-#include "Core/EntityWrapper.h"
-
-namespace Events
-{
-
-struct Reset : Event
-{
-};
-
-}
-
-#endif