Merge branch 'master' into DDS

Conflicts:
	assets
	src/Engine/Rendering/Texture.cpp
	src/Engine/Rendering/Util/CommonFunctions.cpp
	src/Game/Game.cpp

src/Engine/Collision/CollisionSystem.cpp

@@ -17,105 +17,107 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
     EntityAABB& boxA = *boundingBox;
     bool everHitTheGround = false;
 
-    auto prevPosIt = m_PrevPositions.find(entity);
-    if (prevPosIt != m_PrevPositions.end()) {
-        glm::vec3 size = boxA.Size();
-        float diameter = std::min(size.x, size.z);
-        glm::vec3 prevOrigin = prevPosIt->second;
-        glm::vec3 toCurrentPos = boxA.Origin() - prevOrigin;
-        float rayLength = glm::length(toCurrentPos) + 0.5f*diameter;
-        //If the entity has moved farther than the size of its box, we need to handle it specially.
-        if (rayLength > diameter) {
-            Ray ray(prevOrigin, toCurrentPos);
-            m_OctreeResult.clear();
-            m_Octree->ObjectsPossiblyHitByRay(ray, m_OctreeResult);
-            for (auto& boxB : m_OctreeResult) {
-                if (boxA.Entity == boxB.Entity) {
-                    continue;
-                }
-                bool hit;
-                float dist;
-                if (boxB.Entity.HasComponent("Model")) {
-                    RawModel* model;
-                    std::string res = (std::string)boxB.Entity["Model"]["Resource"];
-                    try {
-                        model = ResourceManager::Load<RawModel, true>(res);
-                    } catch (const std::exception&) {
+    if (entity == LocalPlayer) {
+        auto prevPosIt = m_PrevPositions.find(entity);
+        if (prevPosIt != m_PrevPositions.end()) {
+            glm::vec3 size = boxA.Size();
+            float diameter = std::min(size.x, size.z);
+            glm::vec3 prevOrigin = prevPosIt->second;
+            glm::vec3 toCurrentPos = boxA.Origin() - prevOrigin;
+            float rayLength = glm::length(toCurrentPos) + 0.5f*diameter;
+            //If the entity has moved farther than the size of its box, we need to handle it specially.
+            if (rayLength > diameter) {
+                Ray ray(prevOrigin, toCurrentPos);
+                m_OctreeResult.clear();
+                m_Octree->ObjectsPossiblyHitByRay(ray, m_OctreeResult);
+                for (auto& boxB : m_OctreeResult) {
+                    if (boxA.Entity == boxB.Entity) {
                         continue;
                     }
-                    float u, v;
-                    hit = Collision::RayVsModel(ray, model->Vertices(), model->m_Indices, Transform::ModelMatrix(boxB.Entity), dist, u, v);
-                } else {
-                    hit = Collision::RayVsAABB(ray, boxB, dist);
-                }
-                if (hit && dist < rayLength) {
-                    //Set the entity to where it was colliding, minus the maximum box size. 
-                    //TODO: Perhaps this should be done slightly more properly.
-                    glm::vec3 newOriginPos = ray.Origin() + (dist - 0.707107f*diameter) * ray.Direction();
-                    glm::vec3 resolve = newOriginPos - boxA.Origin();
-                    (glm::vec3&)cTransform["Position"] += resolve;
-                    boxA = *Collision::EntityAbsoluteAABB(entity);
-                    if (resolve.y > 0) {
-                        everHitTheGround = true;
-                        (bool)cPhysics["IsOnGround"] = true;
-                        ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
+                    bool hit;
+                    float dist;
+                    if (boxB.Entity.HasComponent("Model")) {
+                        RawModel* model;
+                        std::string res = (std::string)boxB.Entity["Model"]["Resource"];
+                        try {
+                            model = ResourceManager::Load<RawModel, true>(res);
+                        } catch (const std::exception&) {
+                            continue;
+                        }
+                        float u, v;
+                        hit = Collision::RayVsModel(ray, model->Vertices(), model->m_Indices, Transform::ModelMatrix(boxB.Entity), dist, u, v);
+                    } else {
+                        hit = Collision::RayVsAABB(ray, boxB, dist);
+                    }
+                    if (hit && dist < rayLength) {
+                        //Set the entity to where it was colliding, minus the maximum box size. 
+                        //TODO: Perhaps this should be done slightly more properly.
+                        glm::vec3 newOriginPos = ray.Origin() + (dist - 0.707107f*diameter) * ray.Direction();
+                        glm::vec3 resolve = newOriginPos - boxA.Origin();
+                        (glm::vec3&)cTransform["Position"] += resolve;
+                        boxA = *Collision::EntityAbsoluteAABB(entity);
+                        if (resolve.y > 0) {
+                            everHitTheGround = true;
+                            (bool)cPhysics["IsOnGround"] = true;
+                            ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
+                        }
+                        break;
                     }
-                    break;
                 }
             }
         }
-    }
 
-    // Collide against octree items
-    m_OctreeResult.clear();
-    m_Octree->ObjectsInSameRegion(*boundingBox, m_OctreeResult);
-    for (auto& boxB : m_OctreeResult) {
-        glm::vec3 resolutionVector;
-        if (boxA.Entity == boxB.Entity) {
-            continue;
-        }
-
-        if (boxB.Entity.HasComponent("Model") && Collision::AABBVsAABB(boxA, boxB)) {
-            //Here we know boxB is a entity with Collideable, AABB, and Model.
-            RawModel* model;
-            try {
-                model = ResourceManager::Load<RawModel, true>(boxB.Entity["Model"]["Resource"]);
-            } catch (const std::exception&) {
+        // Collide against octree items
+        m_OctreeResult.clear();
+        m_Octree->ObjectsInSameRegion(*boundingBox, m_OctreeResult);
+        for (auto& boxB : m_OctreeResult) {
+            glm::vec3 resolutionVector;
+            if (boxA.Entity == boxB.Entity) {
                 continue;
             }
 
-            glm::mat4 modelMatrix = Transform::ModelMatrix(boxB.Entity);
+            if (boxB.Entity.HasComponent("Model") && Collision::AABBVsAABB(boxA, boxB)) {
+                //Here we know boxB is a entity with Collideable, AABB, and Model.
+                RawModel* model;
+                try {
+                    model = ResourceManager::Load<RawModel, true>(boxB.Entity["Model"]["Resource"]);
+                } catch (const std::exception&) {
+                    continue;
+                }
 
-            glm::vec3 inOutVelocity = (glm::vec3)cPhysics["Velocity"];
-            bool notMovingxz = glm::all(glm::lessThan(glm::abs(glm::vec2(inOutVelocity.x, inOutVelocity.z)), glm::vec2(0.01f))) && prevPosIt != m_PrevPositions.end();
-            bool isOnGround = (bool)cPhysics["IsOnGround"];
-            float verticalStepHeight = (float)(double)cPhysics["VerticalStepHeight"];
-            if (Collision::AABBvsTriangles(boxA, model->Vertices(), model->m_Indices, modelMatrix, inOutVelocity, verticalStepHeight, isOnGround, resolutionVector)) {
-                //Move the position to previous position if it is not moving in the xz-plane, else resolve with the resolution vector.
-                (glm::vec3&)cTransform["Position"] += notMovingxz ? prevPosIt->second - boxA.Origin() : resolutionVector;
+                glm::mat4 modelMatrix = Transform::ModelMatrix(boxB.Entity);
+
+                glm::vec3 inOutVelocity = (glm::vec3)cPhysics["Velocity"];
+                bool notMovingxz = glm::all(glm::lessThan(glm::abs(glm::vec2(inOutVelocity.x, inOutVelocity.z)), glm::vec2(0.01f))) && prevPosIt != m_PrevPositions.end();
+                bool isOnGround = (bool)cPhysics["IsOnGround"];
+                float verticalStepHeight = (float)(double)cPhysics["VerticalStepHeight"];
+                if (Collision::AABBvsTriangles(boxA, model->Vertices(), model->m_Indices, modelMatrix, inOutVelocity, verticalStepHeight, isOnGround, resolutionVector)) {
+                    //Move the position to previous position if it is not moving in the xz-plane, else resolve with the resolution vector.
+                    (glm::vec3&)cTransform["Position"] += notMovingxz ? prevPosIt->second - boxA.Origin() : resolutionVector;
+                    boxA = *Collision::EntityAbsoluteAABB(entity);
+                    cPhysics["Velocity"] = inOutVelocity;
+                    if (isOnGround) {
+                        everHitTheGround = true;
+                        (bool)cPhysics["IsOnGround"] = true;
+                    }
+                }
+            } else if (Collision::AABBVsAABB(boxA, boxB, resolutionVector)) {
+                //Enter here if boxB has no Model.
+                (glm::vec3&)cTransform["Position"] += resolutionVector;
                 boxA = *Collision::EntityAbsoluteAABB(entity);
-                cPhysics["Velocity"] = inOutVelocity;
-                if (isOnGround) {
+                if (resolutionVector.y > 0) {
                     everHitTheGround = true;
                     (bool)cPhysics["IsOnGround"] = true;
+                    ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
                 }
             }
-        } else if (Collision::AABBVsAABB(boxA, boxB, resolutionVector)) {
-            //Enter here if boxB has no Model.
-            (glm::vec3&)cTransform["Position"] += resolutionVector;
-            boxA = *Collision::EntityAbsoluteAABB(entity);
-            if (resolutionVector.y > 0) {
-                everHitTheGround = true;
-                (bool)cPhysics["IsOnGround"] = true;
-                ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
-            }
         }
-    }
 
-    //This should apply air friction and such, iff zero models were hit.
-    if (!everHitTheGround) {
-        (bool)cPhysics["IsOnGround"] = false;
-    }
+        //This should apply air friction and such, iff zero models were hit.
+        if (!everHitTheGround) {
+            (bool)cPhysics["IsOnGround"] = false;
+        }
 
-    m_PrevPositions[entity] = boxA.Origin();
+        m_PrevPositions[entity] = boxA.Origin();
+    }
 }

src/Engine/Core/EntityFile.cpp

@@ -1,291 +1,25 @@
 #include "Core/EntityFile.h"
 
-EntityFile::EntityFile(boost::filesystem::path path)
-    : m_FilePath(path)
+EntityFile::EntityFile(std::string path)
 {
-    using namespace xercesc;
-    XMLPlatformUtils::Initialize();
-    m_GrammarPool = new XMLGrammarPoolImpl();
-    m_SAX2XMLReader = XMLReaderFactory::createXMLReader(XMLPlatformUtils::fgMemoryManager, m_GrammarPool);
-}
+    EntityXMLFile* xml = ResourceManager::Load<EntityXMLFile>(path);
 
-EntityFile::~EntityFile()
-{
-    delete m_SAX2XMLReader;
-    delete m_GrammarPool;
-    xercesc::XMLPlatformUtils::Terminate();
-}
+    EntityXMLFilePreprocessor preprocessor(xml);
+    preprocessor.RegisterComponents(this);
 
-void EntityFile::Parse(const EntityFileHandler* handler) const
-{
-    using namespace xercesc;
+    EntityXMLFileParser parser(xml);
+    m_RootEntity = parser.MergeEntities(this);
 
-    EntityFileSAXHandler saxHandler(handler, m_SAX2XMLReader);
-    setReaderFeatures(m_SAX2XMLReader);
-    m_SAX2XMLReader->setContentHandler(&saxHandler);
-    m_SAX2XMLReader->setErrorHandler(&saxHandler);
-    m_SAX2XMLReader->setDeclarationHandler(&saxHandler);
-    m_SAX2XMLReader->parse(m_FilePath.string().c_str());
-}
-
-void EntityFile::setReaderFeatures(xercesc::SAX2XMLReader* reader)
-{
-    using namespace xercesc;
-    reader->setFeature(XMLUni::fgXercesCacheGrammarFromParse, true);
-    reader->setFeature(XMLUni::fgXercesUseCachedGrammarInParse, true);
-    reader->setFeature(XMLUni::fgSAX2CoreValidation, true);
-    reader->setFeature(XMLUni::fgSAX2CoreNameSpaces, true);
-    reader->setFeature(XMLUni::fgXercesSchema, true);
-    reader->setFeature(XMLUni::fgXercesSchemaFullChecking, true);
-    reader->setFeature(XMLUni::fgXercesCalculateSrcOfs, true);
-    reader->setFeature(XMLUni::fgXercesIdentityConstraintChecking, true);
-}
-
-unsigned int EntityFile::GetTypeStride(std::string typeName)
-{
-    std::map<std::string, unsigned int> typeStrides{
-        { "bool", sizeof(bool) },
-        { "int", sizeof(int) },
-        { "float", sizeof(float) },
-        { "double", sizeof(double) },
-        { "string", sizeof(std::string) },
-        { "enum", sizeof(ComponentInfo::EnumType) },
-        { "Vector", sizeof(glm::vec3) },
-        { "Quaternion", sizeof(glm::quat) },
-        { "Color", sizeof(glm::vec4) }
-    };
-
-    auto it = typeStrides.find(typeName);
-    return (it != typeStrides.end()) ? it->second : 0;
-}
-
-void EntityFile::WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map<std::string, std::string>& attributes)
-{
-    if (field.Type == "Vector") {
-        glm::vec3 vec;
-        vec.x = boost::lexical_cast<float>(attributes.at("X"));
-        vec.y = boost::lexical_cast<float>(attributes.at("Y"));
-        vec.z = boost::lexical_cast<float>(attributes.at("Z"));
-        memcpy(outData, reinterpret_cast<char*>(&vec), field.Stride);
-    } else if (field.Type == "Color") {
-        glm::vec4 vec;
-        vec.r = boost::lexical_cast<float>(attributes.at("R"));
-        vec.g = boost::lexical_cast<float>(attributes.at("G"));
-        vec.b = boost::lexical_cast<float>(attributes.at("B"));
-        vec.a = boost::lexical_cast<float>(attributes.at("A"));
-        memcpy(outData, reinterpret_cast<char*>(&vec), field.Stride);
-    } else if (field.Type == "Quaternion") {
-        glm::quat q;
-        q.x = boost::lexical_cast<float>(attributes.at("X"));
-        q.y = boost::lexical_cast<float>(attributes.at("Y"));
-        q.z = boost::lexical_cast<float>(attributes.at("Z"));
-        q.w = boost::lexical_cast<float>(attributes.at("W"));
-        memcpy(outData, reinterpret_cast<char*>(&q), field.Stride);
-    } else if (!attributes.empty()) {
-        LOG_WARNING("%i attributes not handled by any type conversion!", attributes.size());
-    }
-}
-
-void EntityFile::WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData)
-{
-    // Catch and ignore casting errors so whitespace around string enums won't mess anything up
-    try {
-        if (field.Type == "int") {
-            int value = boost::lexical_cast<int>(valueData);
-            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
-        } else if (field.Type == "enum") {
-            ComponentInfo::EnumType value = boost::lexical_cast<ComponentInfo::EnumType>(valueData);
-            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
-        } else if (field.Type == "float") {
-            float value = boost::lexical_cast<float>(valueData);
-            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
-        } else if (field.Type == "double") {
-            double value = boost::lexical_cast<double>(valueData);
-            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
-        } else if (field.Type == "bool") {
-            bool value = (valueData[0] == 't'); // Lazy bool evaluation
-            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
-        } else if (field.Type == "string") {
-            new (outData) std::string(valueData);
-        } else {
-            LOG_WARNING("Unknown value data type: %s", field.Type.c_str());
-        }
-    } catch (const boost::bad_lexical_cast&) { }
-}
-
-EntityFileSAXHandler::EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader) 
-    : m_Handler(handler)
-    , m_Reader(reader)
-{
-    // 0 is imaginary base parent
-    m_EntityStack.push(0);
-    m_StateStack.push(State::Unknown);
-}
-
-void EntityFileSAXHandler::startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs)
-{
-    std::string name = XS::ToString(_localName);
-
-    if (m_StateStack.top() == State::Unknown || m_StateStack.top() == State::Entity) {
-        if (name == "Entity") {
-            m_StateStack.push(State::Entity);
-            onStartEntity(attrs);
-            return;
-        }
-        if (name == "EntityRef") {
-            onStartEntityRef(attrs);
-            return;
-        }
+    if (m_RootEntity == EntityID_Invalid) {
+        ResourceManager::Release("EntityXMLFile", path);
+        throw Resource::FailedLoadingException("Failed to merge entities; root entity is invalid");
     }
 
-    std::string uri = XS::ToString(_uri);
-    if (m_StateStack.top() == State::Entity) {
-        if (uri == "components") {
-            m_StateStack.push(State::Component);
-            onStartComponent(name);
-            return;
-        }
-    }
-
-    if (m_StateStack.top() == State::Component) {
-        m_StateStack.push(State::ComponentField);
-        onStartComponentField(name, attrs);
-        return;
-    }
+    ResourceManager::Release("EntityXMLFile", path);
 }
 
-void EntityFileSAXHandler::endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname)
+EntityWrapper EntityFile::MergeInto(World* other)
 {
-    std::string name = XS::ToString(_localName);
-    if (m_StateStack.top() == State::Entity) {
-        if (name == "Entity") {
-            m_StateStack.pop();
-            onEndEntity();
-            return;
-        }
-    }
-
-    std::string uri = XS::ToString(_uri);
-    if (m_StateStack.top() == State::Component) {
-        //if (uri == "components") {
-        m_StateStack.pop();
-        onEndComponent(name);
-        return;
-        //}
-    }
-
-    if (m_StateStack.top() == State::ComponentField && name == m_CurrentField) {
-        m_StateStack.pop();
-        onEndComponentField(name);
-        return;
-    }
-}
-
-void EntityFileSAXHandler::characters(const XMLCh* const chars, const XMLSize_t length)
-{
-    if (m_StateStack.top() == State::ComponentField) {
-        char* transcoded = xercesc::XMLString::transcode(chars);
-        onFieldData(transcoded);
-    }
-}
-
-void EntityFileSAXHandler::fatalError(const xercesc::SAXParseException& e)
-{
-    std::string message = XS::ToString(e.getMessage());
-    std::string systemId = XS::ToString(e.getSystemId());
-    XMLFileLoc line = e.getLineNumber();
-    XMLFileLoc column = e.getColumnNumber();
-    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tFatal Error: %s", systemId.c_str(), line, column, message.c_str());
-}
-
-void EntityFileSAXHandler::error(const xercesc::SAXParseException& e)
-{
-    std::string message = XS::ToString(e.getMessage());
-    std::string systemId = XS::ToString(e.getSystemId());
-    XMLFileLoc line = e.getLineNumber();
-    XMLFileLoc column = e.getColumnNumber();
-    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tError: %s", systemId.c_str(), line, column, message.c_str());
-}
-
-void EntityFileSAXHandler::warning(const xercesc::SAXParseException& e)
-{
-    std::string message = XS::ToString(e.getMessage());
-    std::string systemId = XS::ToString(e.getSystemId());
-    XMLFileLoc line = e.getLineNumber();
-    XMLFileLoc column = e.getColumnNumber();
-    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tWarning: %s", systemId.c_str(), line, column, message.c_str());
-}
-
-void EntityFileSAXHandler::onStartEntity(const xercesc::Attributes& attrs)
-{
-    EntityID parent = m_EntityStack.top();
-
-    if (m_Handler->m_OnStartEntityCallback) {
-        std::string name;
-        auto xName = attrs.getValue(XS::ToXMLCh("name"));
-        if (xName != nullptr) {
-            name = XS::ToString(xName);
-        }
-        m_Handler->m_OnStartEntityCallback(m_NextEntityID, parent, name);
-    }
-
-    m_EntityStack.push(m_NextEntityID);
-    m_NextEntityID++;
-}
-
-void EntityFileSAXHandler::onEndEntity()
-{
-    m_EntityStack.pop();
-}
-
-void EntityFileSAXHandler::onStartEntityRef(const xercesc::Attributes& attrs)
-{
-    std::string path = XS::ToString(attrs.getValue(XS::ToXMLCh("file")));
-
-    xercesc::SAX2XMLReader* reader = xercesc::XMLReaderFactory::createXMLReader();
-    EntityFile::setReaderFeatures(reader);
-    reader->setContentHandler(this);
-    reader->setErrorHandler(this);
-    reader->parse(path.c_str());
-    delete reader;
-}
-
-void EntityFileSAXHandler::onStartComponentField(const std::string& field, const xercesc::Attributes& attrs)
-{
-    //LOG_DEBUG("        Field: %s", field.c_str());
-    m_CurrentField = field;
-    m_CurrentAttributes.clear();
-    for (int i = 0; i < attrs.getLength(); i++) {
-        auto name = attrs.getQName(i);
-        auto value = attrs.getValue(name);
-        //LOG_DEBUG("            %s = %s", (char*)XS::ToString(name), (char*)XS::ToString(value));
-        m_CurrentAttributes[XS::ToString(name).operator std::string()] = XS::ToString(value).operator std::string();
-    }
-
-    if (m_Handler->m_OnStartFieldCallback) {
-        m_Handler->m_OnStartFieldCallback(m_EntityStack.top(), m_CurrentComponent, field, m_CurrentAttributes);
-    }
-}
-
-void EntityFileSAXHandler::onEndComponent(const std::string& name) { }
-
-void EntityFileSAXHandler::onStartComponent(const std::string& name)
-{
-    //LOG_DEBUG("    Component: %s", name.c_str());
-    m_CurrentComponent = name;
-    if (m_Handler->m_OnStartComponentCallback) {
-        m_Handler->m_OnStartComponentCallback(m_EntityStack.top(), name);
-    }
-}
-
-void EntityFileSAXHandler::onEndComponentField(const std::string& field) { }
-
-void EntityFileSAXHandler::onFieldData(char* data)
-{
-    //LOG_DEBUG("            Data: %s", data);
-    if (m_Handler->m_OnStartFieldDataCallback) {
-        m_Handler->m_OnStartFieldDataCallback(m_EntityStack.top(), m_CurrentComponent, m_CurrentField, data);
-    }
-
-    xercesc::XMLString::release(&data);
-}
+    auto mapping = other->Merge(this);
+    return EntityWrapper(other, mapping.at(m_RootEntity));
+}

src/Engine/Core/EntityFileParser.cpp

@@ -1,74 +0,0 @@
-#include "Core/EntityFileParser.h"
-
-EntityFileParser::EntityFileParser(const EntityFile* entityFile) 
-    : m_EntityFile(entityFile)
-{
-    m_Handler.SetStartEntityCallback(std::bind(&EntityFileParser::onStartEntity, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
-    m_Handler.SetStartComponentCallback(std::bind(&EntityFileParser::onStartComponent, this, std::placeholders::_1, std::placeholders::_2));
-    m_Handler.SetStartFieldCallback(std::bind(&EntityFileParser::onStartComponentField, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
-    m_Handler.SetStartFieldDataCallback(std::bind(&EntityFileParser::onFieldData, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
-}
-
-EntityID EntityFileParser::MergeEntities(World* world, EntityID baseParent /*= EntityID_Invalid */)
-{
-    m_World = world;
-    m_EntityIDMapper[0] = baseParent;
-    m_EntityFile->Parse(&m_Handler);
-    return m_FirstEntity;
-}
-
-void EntityFileParser::onStartEntity(EntityID entity, EntityID parent, const std::string& name)
-{
-    EntityID realParent = m_EntityIDMapper.at(parent);
-    EntityID realEntity = m_World->CreateEntity(realParent);
-    if (m_FirstEntity == EntityID_Invalid) {
-        m_FirstEntity = realEntity;
-    }
-    if (!name.empty()) {
-        m_World->SetName(realEntity, name);
-    }
-    m_EntityIDMapper[entity] = realEntity;
-    //LOG_DEBUG("Created entity #%i (%i) with parent %i (%i)", entity, realEntity, parent, realParent);
-}
-
-void EntityFileParser::onStartComponent(EntityID entity, const std::string& component)
-{
-    EntityID realEntity = m_EntityIDMapper.at(entity);
-    m_World->AttachComponent(realEntity, component);
-    //LOG_DEBUG("Attached component of type \"%s\" to entity #%i (%i)", component.c_str(), entity, realEntity);
-}
-
-void EntityFileParser::onStartComponentField(EntityID entity, const std::string& componentType, const std::string& fieldName, const std::map<std::string, std::string>& attributes)
-{
-    EntityID realEntity = m_EntityIDMapper.at(entity);
-    ComponentWrapper component = m_World->GetComponent(realEntity, componentType);
-    auto fieldIt = component.Info.Fields.find(fieldName);
-    if (fieldIt == component.Info.Fields.end()) {
-        LOG_ERROR("Tried to set unknown field \"%s\" of component type \"%s\"! Ignoring.", fieldName.c_str(), componentType.c_str());
-        return;
-    }
-    auto& field = fieldIt->second;
-
-    //LOG_DEBUG("Field \"%s\" type \"%s\"", fieldName.c_str(), field.Type.c_str());
-    //LOG_DEBUG("Attributes:");
-    //for (auto& kv : attributes) {
-    //    LOG_DEBUG("\t%s = %s", kv.first.c_str(), kv.second.c_str());
-    //}
-
-    char* data = component.Data + field.Offset;
-    EntityFile::WriteAttributeData(data, field, attributes);
-}
-
-void EntityFileParser::onFieldData(EntityID entity, const std::string& componentType, const std::string& fieldName, const char* fieldData)
-{
-    EntityID realEntity = m_EntityIDMapper.at(entity);
-    ComponentWrapper component = m_World->GetComponent(realEntity, componentType);
-    auto fieldIt = component.Info.Fields.find(fieldName);
-    if (fieldIt == component.Info.Fields.end()) {
-        return;
-    }
-    auto& field = fieldIt->second;
-
-    char* data = component.Data + field.Offset;
-    EntityFile::WriteValueData(data, field, fieldData);
-}

src/Engine/Core/EntityWrapper.cpp

@@ -3,7 +3,7 @@
 
 const EntityWrapper EntityWrapper::Invalid = EntityWrapper(nullptr, EntityID_Invalid);
 
-const std::string EntityWrapper::Name()
+const std::string EntityWrapper::Name() const
 {
     return World->GetName(ID);
 }
@@ -34,11 +34,48 @@ EntityWrapper EntityWrapper::Parent()
     }
 }
 
+EntityWrapper EntityWrapper::FirstParentByName(const std::string& parentEntityName)
+{
+    EntityWrapper entity = *this;
+    while (entity.Parent().Valid()) {
+        entity = entity.Parent();
+        if (entity.Name() == parentEntityName) {
+            return entity;
+        }
+    }
+    return EntityWrapper::Invalid;
+}
+
 EntityWrapper EntityWrapper::FirstChildByName(const std::string& name)
 {
     return firstChildByNameRecursive(name, this->ID);
 }
 
+
+EntityWrapper EntityWrapper::FirstLevelChildByName(const std::string& name)
+{
+    EntityID parent = this->ID;
+    if (!this->World->ValidEntity(parent)) {
+        return EntityWrapper::Invalid;
+    }
+
+    auto itPair = this->World->GetDirectChildren(parent);
+    if (itPair.first == itPair.second) {
+        return EntityWrapper::Invalid;
+    }
+
+    for (auto it = itPair.first; it != itPair.second; ++it) {
+        std::string itName = this->World->GetName(it->second);
+        if (itName == name) {
+            return EntityWrapper(this->World, it->second);
+        } else if (it->second != EntityID_Invalid) {
+            continue;
+        }
+    }
+
+    return EntityWrapper::Invalid;
+}
+
 EntityWrapper EntityWrapper::FirstParentWithComponent(const std::string& componentType)
 {
     EntityWrapper entity = *this;

src/Engine/Core/EntityXMLFile.cpp

@@ -0,0 +1,291 @@
+#include "Core/EntityXMLFile.h"
+
+EntityXMLFile::EntityXMLFile(boost::filesystem::path path)
+    : m_FilePath(path)
+{
+    using namespace xercesc;
+    XMLPlatformUtils::Initialize();
+    m_GrammarPool = new XMLGrammarPoolImpl();
+    m_SAX2XMLReader = XMLReaderFactory::createXMLReader(XMLPlatformUtils::fgMemoryManager, m_GrammarPool);
+}
+
+EntityXMLFile::~EntityXMLFile()
+{
+    delete m_SAX2XMLReader;
+    delete m_GrammarPool;
+    xercesc::XMLPlatformUtils::Terminate();
+}
+
+void EntityXMLFile::Parse(const EntityFileHandler* handler) const
+{
+    using namespace xercesc;
+
+    EntityFileSAXHandler saxHandler(handler, m_SAX2XMLReader);
+    setReaderFeatures(m_SAX2XMLReader);
+    m_SAX2XMLReader->setContentHandler(&saxHandler);
+    m_SAX2XMLReader->setErrorHandler(&saxHandler);
+    m_SAX2XMLReader->setDeclarationHandler(&saxHandler);
+    m_SAX2XMLReader->parse(m_FilePath.string().c_str());
+}
+
+void EntityXMLFile::setReaderFeatures(xercesc::SAX2XMLReader* reader)
+{
+    using namespace xercesc;
+    reader->setFeature(XMLUni::fgXercesCacheGrammarFromParse, true);
+    reader->setFeature(XMLUni::fgXercesUseCachedGrammarInParse, true);
+    reader->setFeature(XMLUni::fgSAX2CoreValidation, true);
+    reader->setFeature(XMLUni::fgSAX2CoreNameSpaces, true);
+    reader->setFeature(XMLUni::fgXercesSchema, true);
+    reader->setFeature(XMLUni::fgXercesSchemaFullChecking, true);
+    reader->setFeature(XMLUni::fgXercesCalculateSrcOfs, true);
+    reader->setFeature(XMLUni::fgXercesIdentityConstraintChecking, true);
+}
+
+unsigned int EntityXMLFile::GetTypeStride(std::string typeName)
+{
+    std::map<std::string, unsigned int> typeStrides{
+        { "bool", sizeof(bool) },
+        { "int", sizeof(int) },
+        { "float", sizeof(float) },
+        { "double", sizeof(double) },
+        { "string", sizeof(std::string) },
+        { "enum", sizeof(ComponentInfo::EnumType) },
+        { "Vector", sizeof(glm::vec3) },
+        { "Quaternion", sizeof(glm::quat) },
+        { "Color", sizeof(glm::vec4) }
+    };
+
+    auto it = typeStrides.find(typeName);
+    return (it != typeStrides.end()) ? it->second : 0;
+}
+
+void EntityXMLFile::WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map<std::string, std::string>& attributes)
+{
+    if (field.Type == "Vector") {
+        glm::vec3 vec;
+        vec.x = boost::lexical_cast<float>(attributes.at("X"));
+        vec.y = boost::lexical_cast<float>(attributes.at("Y"));
+        vec.z = boost::lexical_cast<float>(attributes.at("Z"));
+        memcpy(outData, reinterpret_cast<char*>(&vec), field.Stride);
+    } else if (field.Type == "Color") {
+        glm::vec4 vec;
+        vec.r = boost::lexical_cast<float>(attributes.at("R"));
+        vec.g = boost::lexical_cast<float>(attributes.at("G"));
+        vec.b = boost::lexical_cast<float>(attributes.at("B"));
+        vec.a = boost::lexical_cast<float>(attributes.at("A"));
+        memcpy(outData, reinterpret_cast<char*>(&vec), field.Stride);
+    } else if (field.Type == "Quaternion") {
+        glm::quat q;
+        q.x = boost::lexical_cast<float>(attributes.at("X"));
+        q.y = boost::lexical_cast<float>(attributes.at("Y"));
+        q.z = boost::lexical_cast<float>(attributes.at("Z"));
+        q.w = boost::lexical_cast<float>(attributes.at("W"));
+        memcpy(outData, reinterpret_cast<char*>(&q), field.Stride);
+    } else if (!attributes.empty()) {
+        LOG_WARNING("%i attributes not handled by any type conversion!", attributes.size());
+    }
+}
+
+void EntityXMLFile::WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData)
+{
+    // Catch and ignore casting errors so whitespace around string enums won't mess anything up
+    try {
+        if (field.Type == "int") {
+            int value = boost::lexical_cast<int>(valueData);
+            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
+        } else if (field.Type == "enum") {
+            ComponentInfo::EnumType value = boost::lexical_cast<ComponentInfo::EnumType>(valueData);
+            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
+        } else if (field.Type == "float") {
+            float value = boost::lexical_cast<float>(valueData);
+            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
+        } else if (field.Type == "double") {
+            double value = boost::lexical_cast<double>(valueData);
+            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
+        } else if (field.Type == "bool") {
+            bool value = (valueData[0] == 't'); // Lazy bool evaluation
+            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
+        } else if (field.Type == "string") {
+            new (outData) std::string(valueData);
+        } else {
+            LOG_WARNING("Unknown value data type: %s", field.Type.c_str());
+        }
+    } catch (const boost::bad_lexical_cast&) { }
+}
+
+EntityFileSAXHandler::EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader) 
+    : m_Handler(handler)
+    , m_Reader(reader)
+{
+    // 0 is imaginary base parent
+    m_EntityStack.push(0);
+    m_StateStack.push(State::Unknown);
+}
+
+void EntityFileSAXHandler::startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs)
+{
+    std::string name = XS::ToString(_localName);
+
+    if (m_StateStack.top() == State::Unknown || m_StateStack.top() == State::Entity) {
+        if (name == "Entity") {
+            m_StateStack.push(State::Entity);
+            onStartEntity(attrs);
+            return;
+        }
+        if (name == "EntityRef") {
+            onStartEntityRef(attrs);
+            return;
+        }
+    }
+
+    std::string uri = XS::ToString(_uri);
+    if (m_StateStack.top() == State::Entity) {
+        if (uri == "components") {
+            m_StateStack.push(State::Component);
+            onStartComponent(name);
+            return;
+        }
+    }
+
+    if (m_StateStack.top() == State::Component) {
+        m_StateStack.push(State::ComponentField);
+        onStartComponentField(name, attrs);
+        return;
+    }
+}
+
+void EntityFileSAXHandler::endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname)
+{
+    std::string name = XS::ToString(_localName);
+    if (m_StateStack.top() == State::Entity) {
+        if (name == "Entity") {
+            m_StateStack.pop();
+            onEndEntity();
+            return;
+        }
+    }
+
+    std::string uri = XS::ToString(_uri);
+    if (m_StateStack.top() == State::Component) {
+        //if (uri == "components") {
+        m_StateStack.pop();
+        onEndComponent(name);
+        return;
+        //}
+    }
+
+    if (m_StateStack.top() == State::ComponentField && name == m_CurrentField) {
+        m_StateStack.pop();
+        onEndComponentField(name);
+        return;
+    }
+}
+
+void EntityFileSAXHandler::characters(const XMLCh* const chars, const XMLSize_t length)
+{
+    if (m_StateStack.top() == State::ComponentField) {
+        char* transcoded = xercesc::XMLString::transcode(chars);
+        onFieldData(transcoded);
+    }
+}
+
+void EntityFileSAXHandler::fatalError(const xercesc::SAXParseException& e)
+{
+    std::string message = XS::ToString(e.getMessage());
+    std::string systemId = XS::ToString(e.getSystemId());
+    XMLFileLoc line = e.getLineNumber();
+    XMLFileLoc column = e.getColumnNumber();
+    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tFatal Error: %s", systemId.c_str(), line, column, message.c_str());
+}
+
+void EntityFileSAXHandler::error(const xercesc::SAXParseException& e)
+{
+    std::string message = XS::ToString(e.getMessage());
+    std::string systemId = XS::ToString(e.getSystemId());
+    XMLFileLoc line = e.getLineNumber();
+    XMLFileLoc column = e.getColumnNumber();
+    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tError: %s", systemId.c_str(), line, column, message.c_str());
+}
+
+void EntityFileSAXHandler::warning(const xercesc::SAXParseException& e)
+{
+    std::string message = XS::ToString(e.getMessage());
+    std::string systemId = XS::ToString(e.getSystemId());
+    XMLFileLoc line = e.getLineNumber();
+    XMLFileLoc column = e.getColumnNumber();
+    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tWarning: %s", systemId.c_str(), line, column, message.c_str());
+}
+
+void EntityFileSAXHandler::onStartEntity(const xercesc::Attributes& attrs)
+{
+    EntityID parent = m_EntityStack.top();
+
+    if (m_Handler->m_OnStartEntityCallback) {
+        std::string name;
+        auto xName = attrs.getValue(XS::ToXMLCh("name"));
+        if (xName != nullptr) {
+            name = XS::ToString(xName);
+        }
+        m_Handler->m_OnStartEntityCallback(m_NextEntityID, parent, name);
+    }
+
+    m_EntityStack.push(m_NextEntityID);
+    m_NextEntityID++;
+}
+
+void EntityFileSAXHandler::onEndEntity()
+{
+    m_EntityStack.pop();
+}
+
+void EntityFileSAXHandler::onStartEntityRef(const xercesc::Attributes& attrs)
+{
+    std::string path = XS::ToString(attrs.getValue(XS::ToXMLCh("file")));
+
+    xercesc::SAX2XMLReader* reader = xercesc::XMLReaderFactory::createXMLReader();
+    EntityXMLFile::setReaderFeatures(reader);
+    reader->setContentHandler(this);
+    reader->setErrorHandler(this);
+    reader->parse(path.c_str());
+    delete reader;
+}
+
+void EntityFileSAXHandler::onStartComponentField(const std::string& field, const xercesc::Attributes& attrs)
+{
+    //LOG_DEBUG("        Field: %s", field.c_str());
+    m_CurrentField = field;
+    m_CurrentAttributes.clear();
+    for (int i = 0; i < attrs.getLength(); i++) {
+        auto name = attrs.getQName(i);
+        auto value = attrs.getValue(name);
+        //LOG_DEBUG("            %s = %s", (char*)XS::ToString(name), (char*)XS::ToString(value));
+        m_CurrentAttributes[XS::ToString(name).operator std::string()] = XS::ToString(value).operator std::string();
+    }
+
+    if (m_Handler->m_OnStartFieldCallback) {
+        m_Handler->m_OnStartFieldCallback(m_EntityStack.top(), m_CurrentComponent, field, m_CurrentAttributes);
+    }
+}
+
+void EntityFileSAXHandler::onEndComponent(const std::string& name) { }
+
+void EntityFileSAXHandler::onStartComponent(const std::string& name)
+{
+    //LOG_DEBUG("    Component: %s", name.c_str());
+    m_CurrentComponent = name;
+    if (m_Handler->m_OnStartComponentCallback) {
+        m_Handler->m_OnStartComponentCallback(m_EntityStack.top(), name);
+    }
+}
+
+void EntityFileSAXHandler::onEndComponentField(const std::string& field) { }
+
+void EntityFileSAXHandler::onFieldData(char* data)
+{
+    //LOG_DEBUG("            Data: %s", data);
+    if (m_Handler->m_OnStartFieldDataCallback) {
+        m_Handler->m_OnStartFieldDataCallback(m_EntityStack.top(), m_CurrentComponent, m_CurrentField, data);
+    }
+
+    xercesc::XMLString::release(&data);
+}

src/Engine/Core/EntityXMLFileParser.cpp

@@ -0,0 +1,84 @@
+#include "Core/EntityXMLFileParser.h"
+
+EntityXMLFileParser::EntityXMLFileParser(const EntityXMLFile* entityFile)
+    : m_EntityFile(entityFile)
+{
+    m_Handler.SetStartEntityCallback(std::bind(&EntityXMLFileParser::onStartEntity, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
+    m_Handler.SetStartComponentCallback(std::bind(&EntityXMLFileParser::onStartComponent, this, std::placeholders::_1, std::placeholders::_2));
+    m_Handler.SetStartFieldCallback(std::bind(&EntityXMLFileParser::onStartComponentField, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
+    m_Handler.SetStartFieldDataCallback(std::bind(&EntityXMLFileParser::onFieldData, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
+}
+
+EntityID EntityXMLFileParser::MergeEntities(World* world, EntityID baseParent /*= EntityID_Invalid */)
+{
+    m_World = world;
+    m_EntityIDMapper[0] = baseParent;
+    m_EntityFile->Parse(&m_Handler);
+    return m_FirstEntity;
+}
+
+void EntityXMLFileParser::onStartEntity(EntityID entity, EntityID parent, const std::string& name)
+{
+    EntityID realParent = m_EntityIDMapper.at(parent);
+    EntityID realEntity = m_World->CreateEntity(realParent);
+    if (m_FirstEntity == EntityID_Invalid) {
+        m_FirstEntity = realEntity;
+    }
+    if (!name.empty()) {
+        m_World->SetName(realEntity, name);
+    }
+    m_EntityIDMapper[entity] = realEntity;
+    //LOG_DEBUG("Created entity #%i (%i) with parent %i (%i)", entity, realEntity, parent, realParent);
+}
+
+void EntityXMLFileParser::onStartComponent(EntityID entity, const std::string& component)
+{
+    if (m_World->GetComponentPools().count(component) != 0) {
+        EntityID realEntity = m_EntityIDMapper.at(entity);
+        m_World->AttachComponent(realEntity, component);
+    } else {
+        LOG_ERROR("Tried to attach unregistered component \"%s\"! to entity #%i. Ignoring.", component.c_str(), entity);
+    }
+    //LOG_DEBUG("Attached component of type \"%s\" to entity #%i (%i)", component.c_str(), entity, realEntity);
+}
+
+void EntityXMLFileParser::onStartComponentField(EntityID entity, const std::string& componentType, const std::string& fieldName, const std::map<std::string, std::string>& attributes)
+{
+    if (m_World->GetComponentPools().count(componentType) == 0) {
+        return;
+    }
+    EntityID realEntity = m_EntityIDMapper.at(entity);
+    ComponentWrapper component = m_World->GetComponent(realEntity, componentType);
+    auto fieldIt = component.Info.Fields.find(fieldName);
+    if (fieldIt == component.Info.Fields.end()) {
+        LOG_ERROR("Tried to set unknown field \"%s\" of component type \"%s\"! Ignoring.", fieldName.c_str(), componentType.c_str());
+        return;
+    }
+    auto& field = fieldIt->second;
+
+    //LOG_DEBUG("Field \"%s\" type \"%s\"", fieldName.c_str(), field.Type.c_str());
+    //LOG_DEBUG("Attributes:");
+    //for (auto& kv : attributes) {
+    //    LOG_DEBUG("\t%s = %s", kv.first.c_str(), kv.second.c_str());
+    //}
+
+    char* data = component.Data + field.Offset;
+    EntityXMLFile::WriteAttributeData(data, field, attributes);
+}
+
+void EntityXMLFileParser::onFieldData(EntityID entity, const std::string& componentType, const std::string& fieldName, const char* fieldData)
+{
+    if (m_World->GetComponentPools().count(componentType) == 0) {
+        return;
+    }
+    EntityID realEntity = m_EntityIDMapper.at(entity);
+    ComponentWrapper component = m_World->GetComponent(realEntity, componentType);
+    auto fieldIt = component.Info.Fields.find(fieldName);
+    if (fieldIt == component.Info.Fields.end()) {
+        return;
+    }
+    auto& field = fieldIt->second;
+
+    char* data = component.Data + field.Offset;
+    EntityXMLFile::WriteValueData(data, field, fieldData);
+}

src/Engine/Core/EntityXMLFilePreprocessor.cpp

@@ -1,10 +1,10 @@
-#include "Core/EntityFilePreprocessor.h"
+#include "Core/EntityXMLFilePreprocessor.h"
 
-EntityFilePreprocessor::EntityFilePreprocessor(const EntityFile* entityFile) 
+EntityXMLFilePreprocessor::EntityXMLFilePreprocessor(const EntityXMLFile* entityFile) 
     : m_EntityFile(entityFile)
 {
     EntityFileHandler handler;
-    handler.SetStartComponentCallback(std::bind(&EntityFilePreprocessor::onStartComponent, this, std::placeholders::_1, std::placeholders::_2));
+    handler.SetStartComponentCallback(std::bind(&EntityXMLFilePreprocessor::onStartComponent, this, std::placeholders::_1, std::placeholders::_2));
     m_EntityFile->Parse(&handler);
 
     //LOG_DEBUG("___ COMPONENT DEFINITIONS ___");
@@ -28,20 +28,20 @@ EntityFilePreprocessor::EntityFilePreprocessor(const EntityFile* entityFile)
     parseDefaults();
 }
 
-void EntityFilePreprocessor::RegisterComponents(World* world)
+void EntityXMLFilePreprocessor::RegisterComponents(World* world)
 {
     for (auto& kv : m_ComponentInfo) {
         world->RegisterComponent(kv.second);
     }
 }
 
-void EntityFilePreprocessor::onStartComponent(EntityID entity, std::string type)
+void EntityXMLFilePreprocessor::onStartComponent(EntityID entity, std::string type)
 {
     //LOG_DEBUG("Component: %s", type.c_str());
     m_ComponentCounts[type]++;
 }
 
-void EntityFilePreprocessor::parseComponentInfo()
+void EntityXMLFilePreprocessor::parseComponentInfo()
 {
     using namespace xercesc;
     EntityFileXMLErrorHandler errorHandler;
@@ -141,9 +141,9 @@ void EntityFilePreprocessor::parseComponentInfo()
             std::string baseType = XS::ToString(elementDeclaration->getTypeDefinition()->getBaseType()->getName());
 
             std::string effectiveType = type;
-            unsigned int stride = EntityFile::GetTypeStride(type);
+            unsigned int stride = EntityXMLFile::GetTypeStride(type);
             if (stride == 0) {
-                stride = EntityFile::GetTypeStride(baseType);
+                stride = EntityXMLFile::GetTypeStride(baseType);
                 if (stride == 0) {
                     LOG_WARNING("Field \"%s\" in component \"%s\" uses unexpected field type \"%s\" with base type \"%s\". Skipping.", name.c_str(), compInfo.Name.c_str(), type.c_str(), baseType.c_str());
                     continue;
@@ -196,7 +196,7 @@ void EntityFilePreprocessor::parseComponentInfo()
     }
 }
 
-void EntityFilePreprocessor::parseDefaults()
+void EntityXMLFilePreprocessor::parseDefaults()
 {
     using namespace xercesc;
 
@@ -261,7 +261,7 @@ void EntityFilePreprocessor::parseDefaults()
                     auto attribItem = attributeMap->item(i);
                     attributes[XS::ToString(attribItem->getNodeName())] = XS::ToString(attribItem->getNodeValue());
                 }
-                EntityFile::WriteAttributeData(data, field, attributes);
+                EntityXMLFile::WriteAttributeData(data, field, attributes);
             }
 
             auto childNode = fieldElement->getFirstChild();
@@ -278,14 +278,14 @@ void EntityFilePreprocessor::parseDefaults()
             // Handle potential field values
             if (childNode->getNodeType() == DOMNode::TEXT_NODE) {
                 char* cstrValue = XMLString::transcode(childNode->getNodeValue());
-                EntityFile::WriteValueData(data, field, cstrValue);
+                EntityXMLFile::WriteValueData(data, field, cstrValue);
                 XMLString::release(&cstrValue);
             }
         }
     }
 }
 
-std::string EntityFilePreprocessor::parseAnnotationXML(const XMLCh* xml)
+std::string EntityXMLFilePreprocessor::parseAnnotationXML(const XMLCh* xml)
 {
     using namespace xercesc;
 

src/Engine/Core/EntityXMLFileWriter.cpp

@@ -1,13 +1,13 @@
-#include "Core/EntityFileWriter.h"
+#include "Core/EntityXMLFileWriter.h"
 
 #define X(str) XS::ToXMLCh(str)
 
-void EntityFileWriter::WriteWorld(World* world)
+void EntityXMLFileWriter::WriteWorld(World* world)
 {
     WriteEntity(world, 0);
 }
 
-void EntityFileWriter::WriteEntity(World* world, EntityID entity)
+void EntityXMLFileWriter::WriteEntity(World* world, EntityID entity)
 {
     using namespace xercesc;
     DOMDocument* doc = m_DOMImplementation->createDocument(nullptr, X("Entity"), nullptr);
@@ -41,7 +41,7 @@ void EntityFileWriter::WriteEntity(World* world, EntityID entity)
     doc->release();
 }
 
-void EntityFileWriter::appendEntityChildren(xercesc::DOMElement* parentElement, const World* world, EntityID entity)
+void EntityXMLFileWriter::appendEntityChildren(xercesc::DOMElement* parentElement, const World* world, EntityID entity)
 {
     using namespace xercesc;
     DOMDocument* doc = parentElement->getOwnerDocument();
@@ -67,7 +67,7 @@ void EntityFileWriter::appendEntityChildren(xercesc::DOMElement* parentElement,
     }
 }
 
-void EntityFileWriter::appentEntityComponents(xercesc::DOMElement* parentElement, const World* world, EntityID entity)
+void EntityXMLFileWriter::appentEntityComponents(xercesc::DOMElement* parentElement, const World* world, EntityID entity)
 {
     using namespace xercesc;
     DOMDocument* doc = parentElement->getOwnerDocument();

src/Engine/Core/Transform.cpp

@@ -24,7 +24,7 @@ glm::vec3 Transform::AbsolutePosition(World* world, EntityID entity)
     while (entity != EntityID_Invalid) {
         ComponentWrapper transform = world->GetComponent(entity, "Transform");
         EntityID parent = world->GetParent(entity);
-        position += Transform::AbsoluteOrientation(world, parent) * (glm::vec3)transform["Position"];
+        position += Transform::AbsoluteScale(world, parent) * (Transform::AbsoluteOrientation(world, parent) * (glm::vec3)transform["Position"]);
         entity = parent;
     }
 
@@ -89,12 +89,12 @@ glm::mat4 Transform::ModelMatrix(EntityID entity, World* world)
 {
     return AbsoluteTransformation(EntityWrapper(world, entity));
 
-    glm::vec3 position = Transform::AbsolutePosition(world, entity);
-    glm::quat orientation = Transform::AbsoluteOrientation(world, entity);
-    glm::vec3 scale = Transform::AbsoluteScale(world, entity);
+    //glm::vec3 position = Transform::AbsolutePosition(world, entity);
+    //glm::quat orientation = Transform::AbsoluteOrientation(world, entity);
+    //glm::vec3 scale = Transform::AbsoluteScale(world, entity);
 
-    glm::mat4 modelMatrix = glm::translate(glm::mat4(), position) * glm::toMat4(orientation) * glm::scale(scale);
-    return modelMatrix;
+    //glm::mat4 modelMatrix = glm::translate(glm::mat4(), position) * glm::toMat4(orientation) * glm::scale(scale);
+    //return modelMatrix;
 }
 
 glm::vec3 Transform::TransformPoint(const glm::vec3& point, const glm::mat4& matrix)

src/Engine/Core/World.cpp

@@ -1,6 +1,7 @@
 #include "Core/World.h"
 #include "Core/EEntityDeleted.h"
 #include "Core/EComponentDeleted.h"
+#include "Core/EntityWrapper.h"
 
 World::~World()
 {
@@ -44,7 +45,7 @@ bool World::ValidEntity(EntityID entity) const
     return m_EntityParents.find(entity) != m_EntityParents.end();
 }
 
-void World::RegisterComponent(ComponentInfo& ci)
+void World::RegisterComponent(const ComponentInfo& ci)
 {
     if (m_ComponentPools.find(ci.Name) == m_ComponentPools.end()) {
         m_ComponentPools[ci.Name] = new ComponentPool(ci);
@@ -151,6 +152,62 @@ std::string World::GetName(EntityID entity) const
     }
 }
 
+EntityWrapper World::GetFirstEntityByName(const std::string& name)
+{
+    auto itPair = GetDirectChildren(EntityID_Invalid);
+    for (auto it = itPair.first; it != itPair.second; it++) {
+        EntityID childEntityID = it->second;
+        EntityWrapper childEntity(this, childEntityID);
+        if (!childEntity.Valid()) {
+            continue;
+        }
+        EntityWrapper entityWithName = childEntity.Name() == name ? childEntity : childEntity.FirstChildByName(name);
+        if (entityWithName.Valid()) {
+            return entityWithName;
+        }
+    }
+    return EntityWrapper::Invalid;
+}
+
+std::unordered_map<EntityID, EntityID> World::Merge(const World* other)
+{
+    std::unordered_map<EntityID, EntityID> oldToNew;
+
+    // Create new entities
+    for (auto& kv : other->m_EntityParents) {
+        EntityID entity = kv.first;
+
+        EntityID newEntity = CreateEntity();
+        SetName(newEntity, other->GetName(entity));
+        oldToNew[entity] = newEntity;
+    }
+    // Fix relationships
+    for (auto& kv : other->m_EntityParents) {
+        EntityID entity = kv.first;
+        EntityID parent = kv.second;
+        if (parent != EntityID_Invalid) {
+            SetParent(oldToNew.at(entity), oldToNew.at(parent));
+        }
+    }
+
+    // Transfer components
+    for (auto& kv : other->m_ComponentPools) {
+        auto& componentType = kv.first;
+        ComponentPool* pool = kv.second;
+        // Register pool if it's not present in world
+        if (m_ComponentPools.count(componentType) == 0) {
+            RegisterComponent(pool->ComponentInfo());
+        }
+        // Copy components
+        for (auto component : *pool) {
+            ComponentWrapper newComponent = AttachComponent(oldToNew.at(component.EntityID), componentType);
+            component.Copy(newComponent);
+        }
+    }
+
+    return oldToNew;
+}
+
 EntityID World::generateEntityID()
 {
     // TODO: Make EntityID generation smarter

src/Engine/Editor/EditorGUI.cpp

@@ -157,7 +157,7 @@ void EditorGUI::drawEntitiesRecursive(World* world, EntityID parent)
     auto entityChildren = world->GetEntityChildren();
     auto range = entityChildren.equal_range(parent);
     for (auto it = range.first; it != range.second; it++) {
-        if (EditorGUI::drawEntityNode(EntityWrapper(world, it->second))) {
+        if (drawEntityNode(EntityWrapper(world, it->second))) {
             drawEntitiesRecursive(world, it->second);
             ImGui::TreePop();
         }
@@ -217,6 +217,7 @@ bool EditorGUI::drawEntityNode(EntityWrapper entity)
         ImGui::EndPopup();
     }
 
+    ImGui::PushID(("EntityNode" + std::to_string(entity.ID)).c_str());
     ImGui::SetNextTreeNodeOpened(true, ImGuiSetCond_Once);
     if (ImGui::TreeNode(formatEntityName(entity).c_str())) {
         // Handle drop events for reparenting
@@ -224,8 +225,10 @@ bool EditorGUI::drawEntityNode(EntityWrapper entity)
             entityChangeParent(m_CurrentlyDragging, entity);
             m_CurrentlyDragging = EntityWrapper::Invalid;
         }
+        ImGui::PopID();
         return true;
     } else {
+        ImGui::PopID();
         return false;
     }
 }
@@ -338,6 +341,15 @@ bool EditorGUI::drawComponentNode(EntityWrapper entity, const ComponentInfo& ci)
         }
     }
 
+    if (ci.Name == "Spawner") {
+        if (ImGui::Button("Activate")) {
+            Events::SpawnerSpawn e;
+            e.Spawner = entity;
+            e.Parent = entity;
+            m_EventBroker->Publish(e);
+        }
+    }
+
     return true;
 }
 
@@ -381,14 +393,52 @@ bool EditorGUI::drawComponentField_Vector(ComponentWrapper &c, const ComponentIn
         // Limit scale values to a minimum of 0
         return ImGui::DragFloat3("", glm::value_ptr(val), 0.1f, 0.f, std::numeric_limits<float>::max());
     } else if (field.Name == "Orientation") {
-        // Make orentations have a period of 2*Pi
-        glm::vec3 tempVal = glm::fmod(val, glm::vec3(glm::two_pi<float>()));
-        if (ImGui::SliderFloat3("", glm::value_ptr(tempVal), 0.f, glm::two_pi<float>())) {
-            val = tempVal;
-            return true;
-        } else {
-            return false;
+        //glm::vec3 tempVal = val;
+        glm::vec3 originalVal = val;
+
+        ImVec2 cursorPos = ImGui::GetCursorScreenPos();
+        glm::tvec3<bool> isSnapping(false, false, false);
+        bool changed = ImGui::DragFloat3("", glm::value_ptr(val), 0.066666f);
+        if (changed) {
+            // Make orentations have a period of 2*Pi
+            val = glm::fmod(val, glm::vec3(glm::two_pi<float>()));
+            for (int i = 0; i < 3; i++) {
+                if (val[i] < 0) {
+                    val[i] += glm::two_pi<float>();
+                }
+            }
         }
+
+        // Snap to angle
+        //float snapRange = glm::pi<float>() / 15.f;
+        //float snapAngle = glm::quarter_pi<float>();
+        //glm::vec3 snap = glm::fmod(val, glm::vec3(snapAngle));
+        //for (int i = 0; i < 3; i++) {
+        //    isSnapping[i] = glm::abs(snap[i] - (snapRange / 2.f)) < snapRange;
+        //}
+        //if (changed && ImGui::IsMouseDown(0)) {
+        //    glm::vec3 change = val - originalVal;
+        //    for (int i = 0; i < 3; i++) {
+        //        if (isSnapping[i] && glm::abs(change[i]) < snapRange) {
+        //            val[i] -= snap[i] - snapRange;
+        //        }
+        //    }
+        //}
+
+        // Draw snapping outline
+        float width = ImGui::CalcItemWidth() / 3.f;;
+        float spacing = GImGui->Style.ItemInnerSpacing.x;
+        for (int i = 0; i < 3; i++) {
+            if (isSnapping[i]) {
+                ImVec2 pos = cursorPos + ImVec2(i * (width + spacing), 0.f);
+                ImRect bb(pos - ImVec2(1, 1), pos + ImVec2(width, 17));
+                auto window = ImGui::GetCurrentWindow();
+                const ImU32 col = window->Color(ImGuiCol_HeaderActive);
+                window->DrawList->AddRect(bb.Min, bb.Max, col, 3.f);
+            }
+        }
+
+        return changed;
     } else {
         return ImGui::DragFloat3("", glm::value_ptr(val), 0.1f, std::numeric_limits<float>::lowest(), std::numeric_limits<float>::max());
     }

src/Engine/Editor/EditorRenderSystem.cpp

@@ -7,7 +7,7 @@ EditorRenderSystem::EditorRenderSystem(SystemParams params, IRenderer* renderer,
 {
     EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &EditorRenderSystem::OnSetCamera);
     auto resolution = Rectangle::Rectangle(1280, 720);
-    m_EditorCamera = new Camera((float)resolution.Width / resolution.Height, glm::radians(45.f), 0.01f, 5000.f);
+    m_EditorCamera = new Camera((float)resolution.Width / resolution.Height, glm::radians(45.f), 0.001f, 500.f);
 }
 
 void EditorRenderSystem::Update(double dt)
@@ -54,7 +54,7 @@ void EditorRenderSystem::Update(double dt)
             EntityWrapper entity(m_World, cModel.EntityID);
             glm::mat4 modelMatrix = Transform::ModelMatrix(entity.ID, entity.World);
             for (auto matGroup : model->MaterialGroups()) {
-                std::shared_ptr<ModelJob> modelJob = std::make_shared<ModelJob>(model, scene.Camera, modelMatrix, matGroup, cModel, entity.World, glm::vec4(0), 0.f);
+                std::shared_ptr<ModelJob> modelJob = std::make_shared<ModelJob>(model, scene.Camera, modelMatrix, matGroup, cModel, entity.World, glm::vec4(0), 0.f, false, false);
                 if (cModel["Transparent"]) {
                     scene.Jobs.TransparentObjects.push_back(modelJob);
                 } else {

src/Engine/Editor/EditorSystem.cpp

@@ -2,6 +2,7 @@
 #include "Core/UniformScaleSystem.h"
 #include "Editor/EditorRenderSystem.h"
 #include "Editor/EditorWidgetSystem.h"
+#include "Core/EntityFile.h"
 
 EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame) 
     : System(params)
@@ -18,7 +19,7 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
     m_ActualCamera = m_EditorCamera;
     m_EditorWorld->AttachComponent(m_EditorCamera.ID, "Transform");
     m_EditorWorld->AttachComponent(m_EditorCamera.ID, "Camera");
-    m_EditorCameraInputController = new EditorCameraInputController<EditorSystem>(m_EventBroker, -1);
+    m_EditorCameraInputController = new EditorCameraInputController<EditorSystem>(m_EventBroker, -1, EntityWrapper::Invalid);
 
     m_EditorGUI = new EditorGUI(m_World, m_EventBroker);
     m_EditorGUI->SetEntitySelectedCallback(std::bind(&EditorSystem::OnEntitySelected, this, std::placeholders::_1));
@@ -129,7 +130,7 @@ void EditorSystem::OnEntitySelected(EntityWrapper entity)
 
 void EditorSystem::OnEntitySave(EntityWrapper entity, boost::filesystem::path filePath)
 {
-    EntityFileWriter writer(filePath);
+    EntityXMLFileWriter writer(filePath);
     writer.WriteEntity(entity.World, entity.ID);
 }
 
@@ -203,14 +204,21 @@ bool EditorSystem::OnWidgetDelta(const Events::WidgetDelta& e)
     if (m_CurrentSelection.Valid()) {
         if (m_WidgetSpace == EditorGUI::WidgetSpace::Global) {
             glm::quat parentOrientation;
+            glm::vec3 parentScale(1.f);
             EntityWrapper parent = m_CurrentSelection.Parent();
             if (parent.Valid()) {
                 parentOrientation = glm::inverse(Transform::AbsoluteOrientation(parent));
+                parentScale = Transform::AbsoluteScale(parent);
             }
-            (glm::vec3&)m_CurrentSelection["Transform"]["Position"] += parentOrientation * e.Translation;
+            (glm::vec3&)m_CurrentSelection["Transform"]["Position"] += parentOrientation * e.Translation / parentScale;
         } else if (m_WidgetSpace == EditorGUI::WidgetSpace::Local) {
+            glm::vec3 parentScale(1.f);
+            EntityWrapper parent = m_CurrentSelection.Parent();
+            if (parent.Valid()) {
+                parentScale = Transform::AbsoluteScale(parent);
+            }
             glm::quat selectionOri = glm::quat((glm::vec3)m_CurrentSelection["Transform"]["Orientation"]);
-            glm::vec3 localTranslation = selectionOri * e.Translation;
+            glm::vec3 localTranslation = selectionOri * e.Translation / parentScale;
             (glm::vec3&)m_CurrentSelection["Transform"]["Position"] += localTranslation;
         }
         m_EditorGUI->SetDirty(m_CurrentSelection);
@@ -260,12 +268,11 @@ EntityWrapper EditorSystem::importEntity(EntityWrapper parent, boost::filesystem
 
     try {
         auto entityFile = ResourceManager::Load<EntityFile>(filePath.string());
-        EntityFilePreprocessor fpp(entityFile);
-        fpp.RegisterComponents(parent.World);
-        EntityFileParser fp(entityFile);
-        EntityID newEntity = fp.MergeEntities(parent.World, parent.ID);
-        return EntityWrapper(parent.World, newEntity);
-    } catch (const std::exception&) {
+        EntityWrapper newEntity = entityFile->MergeInto(parent.World);
+        parent.World->SetParent(newEntity.ID, parent.ID);
+        return newEntity;
+    } catch (const std::exception& e) {
+        LOG_ERROR("Failed to import entity \"%s\": \"%s\"", filePath.string().c_str(), e.what());
         return EntityWrapper::Invalid;
     }
 }

src/Engine/GUI/ButtonSystem.cpp

@@ -1,4 +1,5 @@
 #include "GUI/ButtonSystem.h"
+#include "Input/EInputCommand.h"
 
 ButtonSystem::ButtonSystem(SystemParams params, IRenderer* renderer)
     : System(params)
@@ -37,10 +38,20 @@ bool ButtonSystem::OnMousePress(const Events::MousePress& e)
                 m_PickEntity = EntityWrapper(m_World, m_PickData.Entity);
 
                 //You have clicked on a button entity, send pressed event.
-                Events::ButtonPressed ePressed;
-                ePressed.Entity = m_PickEntity;
-                ePressed.EntityName = m_PickEntity.Name();
-                m_EventBroker->Publish(ePressed);
+                if (m_World->HasComponent(m_PickData.Entity, "InputCmdButton")) {
+                    Events::InputCommand eInputCmd;
+                    eInputCmd.PlayerID = -1;
+                    eInputCmd.Player = LocalPlayer;
+                    EntityWrapper button = EntityWrapper(m_World, m_PickData.Entity);
+                    eInputCmd.Command = (std::string)button["InputCmdButton"]["Command"];
+                    eInputCmd.Value = (float)button["InputCmdButton"]["PressValue"];
+                    m_EventBroker->Publish(eInputCmd);
+                } else {
+                    Events::ButtonPressed ePressed;
+                    ePressed.Entity = m_PickEntity;
+                    ePressed.EntityName = m_PickEntity.Name();
+                    m_EventBroker->Publish(ePressed);
+                }
             }
         }
     }
@@ -55,10 +66,20 @@ bool ButtonSystem::OnMouseRelease(const Events::MouseRelease& e)
         if(m_PickData.Entity != EntityID_Invalid && m_PickData.World == m_World) {
             EntityWrapper ent = EntityWrapper(m_World, m_PickData.Entity);
 
-            Events::ButtonReleased eReleased;
-            eReleased.EntityName = m_PickEntity.Name();
-            eReleased.Entity = m_PickEntity;
-            m_EventBroker->Publish(eReleased);
+            if (m_World->HasComponent(m_PickData.Entity, "InputCmdButton")) {
+                Events::InputCommand eInputCmd;
+                eInputCmd.PlayerID = -1;
+                eInputCmd.Player = LocalPlayer;
+                EntityWrapper button = EntityWrapper(m_World, m_PickData.Entity);
+                eInputCmd.Command = (std::string)button["InputCmdButton"]["Command"];
+                eInputCmd.Value = 0;
+                m_EventBroker->Publish(eInputCmd);
+            } else {
+                Events::ButtonReleased eReleased;
+                eReleased.EntityName = m_PickEntity.Name();
+                eReleased.Entity = m_PickEntity;
+                m_EventBroker->Publish(eReleased);
+            }
 
             if(m_World->HasComponent(m_PickData.Entity, "Button")) {
                 if (ent == m_PickEntity) {

src/Engine/GUI/MainMenuSystem.cpp

@@ -1,57 +0,0 @@
-#include "GUI/MainMenuSystem.h"
-
-MainMenuSystem::MainMenuSystem(SystemParams params, IRenderer* renderer)
-    : System(params)
-    , ImpureSystem()
-    , m_Renderer(renderer)
-{
-    EVENT_SUBSCRIBE_MEMBER(m_EPressed, &MainMenuSystem::OnButtonPress);
-    EVENT_SUBSCRIBE_MEMBER(m_EReleased, &MainMenuSystem::OnButtonRelease);
-    EVENT_SUBSCRIBE_MEMBER(m_EClicked, &MainMenuSystem::OnButtonClick);
-}
-
-void MainMenuSystem::Update(double dt)
-{
-
-}
-
-bool MainMenuSystem::OnButtonClick(const Events::ButtonClicked& e)
-{
-    if(e.EntityName == "Play") {
-        //Run play code
-    } else if(e.EntityName == "Connect") {
-        //Run connect code
-    } else if(e.EntityName == "Host") {
-        //Run host code
-    } else if(e.EntityName == "Quit") {
-        printf("No, you stay");
-    } else if (e.EntityName == "Res1080") {
-        glfwSetWindowSize(m_Renderer->Window(), 1920, 1080);
-        printf("\n1080");
-    } else if (e.EntityName == "Res720") {
-        glfwSetWindowSize(m_Renderer->Window(), 1280, 720);
-        glViewport(0, 0, 1280, 720);
-        printf("\n720");
-    } else if (e.EntityName == "Res480") {
-        glfwSetWindowSize(m_Renderer->Window(), 854, 480);
-        glViewport(0, 0, 854, 480);
-        printf("\n480");
-    } else if (e.EntityName == "FullScreen") {
-        printf("No fullscreen for now");
-    }
-
-    return true;
-}
-
-bool MainMenuSystem::OnButtonRelease(const Events::ButtonReleased& e)
-{
-
-    return true;
-}
-
-bool MainMenuSystem::OnButtonPress(const Events::ButtonPressed& e)
-{
-
-    return true;
-}
-

src/Engine/Input/InputProxy.cpp

@@ -45,7 +45,7 @@ void InputProxy::Update(double dt)
     }
 }
 
-void InputProxy::Process()
+void InputProxy::Process(bool suppressNewEvents /*= false*/)
 {
     for (auto& pair : m_CommandHandlers) {
         const std::string& command = pair.first;
@@ -62,8 +62,10 @@ void InputProxy::Process()
             e.PlayerID = -1;
             e.Command = command;
             e.Value = currentValue;
-            m_EventBroker->Publish(e);
-            //LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+            if (!suppressNewEvents || e.Value == 0) {
+                m_EventBroker->Publish(e);
+                //LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+            }
             m_LastCommandValues[command] = currentValue;
         }
     }
@@ -78,8 +80,10 @@ void InputProxy::Process()
             e.Value += value;
         }
         //e.Value = std::max(-1.f, std::min(e.Value, 1.f));
-        m_EventBroker->Publish(e);
-        //LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+        if (!suppressNewEvents || e.Value == 0) {
+            m_EventBroker->Publish(e);
+            //LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+        }
     }
     m_CommandQueue.clear();
 }

src/Engine/Network/Client.cpp

@@ -33,7 +33,9 @@ void Client::Connect(std::string address, int port)
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Client::OnPlayerDamage);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &Client::OnPlayerSpawned);
     EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &Client::OnDoubleJump);
+    EVENT_SUBSCRIBE_MEMBER(m_EDashAbility, &Client::OnDashAbility);
     EVENT_SUBSCRIBE_MEMBER(m_ESearchForServers, &Client::OnSearchForServers);
+    EVENT_SUBSCRIBE_MEMBER(m_EConnectRequest, &Client::OnConnectRequest);
     auto config = ResourceManager::Load<ConfigFile>("Config.ini");
     m_Address = address;
     if (address.empty()) {
@@ -48,16 +50,16 @@ void Client::Connect(std::string address, int port)
 void Client::Update()
 {
     m_EventBroker->Process<Client>();
-    while (m_Unreliable.IsSocketAvailable()) {
-        // Packet will get real data in receive
-        Packet packet(MessageType::Invalid);
-        m_Unreliable.Receive(packet);
-        if (packet.GetMessageType() == MessageType::Connect) {
-            parseUDPConnect(packet);
-        } else {
-            parseMessageType(packet);
-        }
-    }
+    //while (m_Unreliable.IsSocketAvailable()) {
+    //    // Packet will get real data in receive
+    //    Packet packet(MessageType::Invalid);
+    //    m_Unreliable.Receive(packet);
+    //    if (packet.GetMessageType() == MessageType::Connect) {
+    //        parseUDPConnect(packet);
+    //    } else {
+    //        parseMessageType(packet);
+    //    }
+    //}
     while (m_Reliable.IsSocketAvailable()) {
         // Packet will get real data in receive
         Packet packet(MessageType::Invalid);
@@ -81,7 +83,10 @@ void Client::Update()
     if (m_SearchingForServers) {
         if (m_SearchingTime < (1000* (std::clock() - m_StartSearchTime) / (double)CLOCKS_PER_SEC)) {
             m_SearchingForServers = false;
-            displayServerlist();
+            //displayServerlist();
+            Events::DisplayServerlist e;
+            e.Serverlist = m_Serverlist;
+            m_EventBroker->Publish(e);
         }
     }
 
@@ -143,6 +148,9 @@ void Client::parseMessageType(Packet& packet)
     case MessageType::OnDoubleJump:
         parseDoubleJump(packet);
         break;
+    case MessageType::OnDashEffect:
+        parseDashEffect(packet);
+        break;
     case MessageType::AmmoPickup:
         parseAmmoPickup(packet);
         break;
@@ -173,8 +181,8 @@ void Client::parseTCPConnect(Packet& packet)
     Packet UnreliablePacket(MessageType::Connect, m_SendPacketID);
     // Add player id and other stuff
     packet.WritePrimitive(m_PlayerID);
-    m_Unreliable.Send(packet);
-    LOG_INFO("Sent UDP Connect Server");
+    //   m_Unreliable.Send(packet);
+     //  LOG_INFO("Sent UDP Connect Server");
 }
 
 void Client::parsePlayerConnected(Packet & packet)
@@ -262,7 +270,7 @@ void Client::parseEntityDeletion(Packet & packet)
     if (m_ServerIDToClientID.find(entityToDelete) != m_ServerIDToClientID.end()) {
         EntityID localEntity = m_ServerIDToClientID.at(entityToDelete);
         if (m_World->ValidEntity(localEntity)) {
-            if (m_World->HasComponent(localEntity,"Player")) {
+            if (m_World->HasComponent(localEntity, "Player")) {
                 Events::PlayerDeath e;
                 e.Player = EntityWrapper(m_World, localEntity);
                 m_EventBroker->Publish(e);
@@ -297,8 +305,22 @@ void Client::parseDoubleJump(Packet & packet)
     }
 }
 
+
+void Client::parseDashEffect(Packet& packet)
+{
+    EntityID serverID = packet.ReadPrimitive<EntityID>();
+    if (!serverClientMapsHasEntity(serverID)) {
+        return;
+    }
+    Events::DashAbility e;
+    e.Player = m_ServerIDToClientID.at(serverID);
+    if (e.Player != m_LocalPlayer.ID) {
+        m_EventBroker->Publish(e);
+    }
+}
+
 void Client::parseAmmoPickup(Packet & packet)
-{ 
+{
     Events::AmmoPickup e;
     e.AmmoGain = packet.ReadPrimitive<int>();
     e.Player = m_LocalPlayer;
@@ -388,7 +410,7 @@ void Client::parseSnapshot(Packet& packet)
                     if (m_SnapshotFilter != nullptr) {
                         shouldApply = m_SnapshotFilter->FilterComponent(localEntity, newComponent);
                     }
-                    if (shouldApply) {                        
+                    if (shouldApply) {
                         ComponentWrapper currentComponent = m_World->GetComponent(localEntityID, componentType);
                         memcpy(currentComponent.Data, newComponent.Data, componentInfo.Stride);
                     }
@@ -435,30 +457,26 @@ void Client::parseSnapshot(Packet& packet)
 
 void Client::disconnect()
 {
+    removeWorld();
     m_IsConnected = false;
     m_PreviousPacketID = 0;
     m_PacketID = 0;
     Packet packet(MessageType::Disconnect, m_SendPacketID);
     m_Reliable.Send(packet);
     m_Reliable.Disconnect();
+    createMainMenu();
 }
 
 bool Client::OnInputCommand(const Events::InputCommand & e)
 {
-    // TEMP
-    if (e.Command == "SearchForServers" && e.Value > 0) {
-        Events::SearchForServers e;
-        m_EventBroker->Publish(e);
-    }
-
     if (e.PlayerID != -1) {
         return false;
     }
 
     if (e.Command == "ConnectToServer") { // Connect for now
         if (e.Value > 0) {
-            m_Reliable.Connect(m_PlayerName, m_Address, m_Port);
-            m_Unreliable.Connect(m_PlayerName, m_Address, m_Port);
+            //m_Reliable.Connect(m_PlayerName, m_Address, m_Port);
+        //    m_Unreliable.Connect(m_PlayerName, m_Address, m_Port);
         }
         //LOG_DEBUG("Client::OnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
         return true;
@@ -518,12 +536,40 @@ bool Client::OnPlayerSpawned(const Events::PlayerSpawned& e)
     return true;
 }
 
+
+bool Client::OnDashAbility(const Events::DashAbility& e)
+{
+    if (!clientServerMapsHasEntity(e.Player) || e.Player != m_LocalPlayer.ID) {
+        return false;
+    }
+    Packet packet(MessageType::OnDashEffect);
+    packet.WritePrimitive(m_ClientIDToServerID.at(e.Player));
+    m_Reliable.Send(packet);
+    return true;
+}
+
+
+bool Client::OnConnectRequest(const Events::ConnectRequest& e)
+{
+    removeWorld();
+    if (m_Reliable.Connect(m_PlayerName, e.IP, e.Port)) {
+        // The client sent a successful connect message
+        return true;
+
+    } else {
+        // The client could not send a successful connect message
+        createMainMenu();
+        // Load the main menu again ?
+        return false;
+    }
+    return false;
+}
+
 bool Client::OnSearchForServers(const Events::SearchForServers& e)
 {
     m_SearchingForServers = true;
     m_StartSearchTime = std::clock();
     m_Serverlist.clear();
-    LOG_INFO("Searching for LAN servers...\n");
     Packet packet(MessageType::ServerlistRequest);
     m_ServerlistRequest.Broadcast(packet, 13); // TODO: Config
     return true;
@@ -583,7 +629,7 @@ void Client::sendLocalPlayerTransform()
         packet.WritePrimitive((int)cAssaultWeapon["Ammo"]);
     }
 
-    m_Unreliable.Send(packet);
+    m_Reliable.Send(packet);
 }
 
 void Client::identifyPacketLoss()
@@ -645,6 +691,26 @@ void Client::displayServerlist()
     }
 }
 
+
+void Client::removeWorld()
+{
+    std::vector<EntityID> childrenToBeDeleted;
+    auto rootEntites = m_World->GetDirectChildren(EntityID_Invalid);
+    for (auto it = rootEntites.first; it != rootEntites.second; it++) {
+        childrenToBeDeleted.push_back(it->second);
+    }
+    for (int i = 0; i < childrenToBeDeleted.size(); ++i) {
+        m_World->DeleteEntity(childrenToBeDeleted[i]);
+    }
+}
+
+
+void Client::createMainMenu()
+{
+    auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/StartMenu.xml");
+    entityFile->MergeInto(m_World);
+}
+
 bool Client::clientServerMapsHasEntity(EntityID clientEntityID)
 {
     if (m_ClientIDToServerID.find(clientEntityID) != m_ClientIDToServerID.end()) {

src/Engine/Network/Packet.cpp

@@ -49,18 +49,24 @@ void Packet::WriteString(const std::string& str)
     // Message, add one extra byte for null terminator
     size_t sizeOfString = str.size() + 1;
     if (m_Offset + sizeOfString > m_MaxPacketSize) {
-        //LOG_WARNING("Package::WriteString(): Data size in packet exceeded maximum package size. New size is %i bytes\n", m_MaxPacketSize*2);
+        if (m_MaxPacketSize >= 32000) {
+            LOG_WARNING("Package::WriteString(): New size is huge %i bytes\n", m_MaxPacketSize*2);
+        }
         resizeData();
     }
-    memcpy(m_Data + m_Offset, str.data(), sizeOfString * sizeof(char));
-    m_Offset += sizeOfString * sizeof(char);
+    memcpy(m_Data + m_Offset, str.data(), str.size() * sizeof(char));
+    m_Offset += str.size() * sizeof(char);
+    m_Data[m_Offset] = '\0';
+    m_Offset += 1;
 }
 
 void Packet::WriteData(char * data, int sizeOfData)
 {
 
     if (m_Offset + sizeOfData > m_MaxPacketSize) {
-        //LOG_WARNING("Packet::WriteData(): Data size in packet exceeded maximum packet size. New size is %i bytes\n", m_MaxPacketSize*2);
+        if (m_MaxPacketSize >= 32000) {
+            LOG_WARNING("Package::WriteData(): New size is huge %i bytes\n", m_MaxPacketSize*2);
+        }
         while (m_Offset + sizeOfData > m_MaxPacketSize) {
             resizeData();
         }

src/Engine/Network/Server.cpp

@@ -7,6 +7,8 @@ Server::Server(World* world, EventBroker* eventBroker, int port)
     ConfigFile* config = ResourceManager::Load<ConfigFile>("Config.ini");
     snapshotInterval = 1000 * config->Get<float>("Networking.SnapshotInterval", 0.05f);
     pingIntervalMs = config->Get<float>("Networking.PingIntervalMs", 1000);
+    m_ServerName = config->Get<std::string>("Networking.Name", "Unnamed");
+
     // Subscribe to events
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Server::OnInputCommand);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &Server::OnPlayerSpawned);
@@ -14,6 +16,7 @@ Server::Server(World* world, EventBroker* eventBroker, int port)
     EVENT_SUBSCRIBE_MEMBER(m_EComponentDeleted, &Server::OnComponentDeleted);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Server::OnPlayerDamage);
     EVENT_SUBSCRIBE_MEMBER(m_EAmmoPickup, &Server::OnAmmoPickup);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &Server::OnPlayerDeath);
     // BindWW
     if (port == 0) {
         port = config->Get<float>("Networking.Port", 27666);
@@ -46,19 +49,19 @@ void Server::Update()
         }
     }
 
-    PlayerDefinition pd;
-    while (m_Unreliable.IsSocketAvailable()) {
-        // Packet will get real data in receive
-        Packet packet(MessageType::Invalid);
-        m_Unreliable.Receive(packet, pd);
-        m_Address = pd.Endpoint.address();
-        m_Port = pd.Endpoint.port();
-        if (packet.GetMessageType() == MessageType::Connect) {
-            parseUDPConnect(packet);
-        } else {
-            parseMessageType(packet);
-        }
-    }
+    //PlayerDefinition pd;
+    //while (m_Unreliable.IsSocketAvailable()) {
+    //    // Packet will get real data in receive
+    //    Packet packet(MessageType::Invalid);
+    //    m_Unreliable.Receive(packet, pd);
+    //    m_Address = pd.Endpoint.address();
+    //    m_Port = pd.Endpoint.port();
+    //    if (packet.GetMessageType() == MessageType::Connect) {
+    //        parseUDPConnect(packet);
+    //    } else {
+    //        parseMessageType(packet);
+    //    }
+    //}
 
     while (m_ServerlistRequest.IsSocketAvailable()) {
         Packet packet(MessageType::Invalid);
@@ -141,6 +144,9 @@ void Server::parseMessageType(Packet& packet)
     case MessageType::OnDoubleJump:
         parseDoubleJump(packet);
         break;
+    case MessageType::OnDashEffect:
+        parseDashEffect(packet);
+        break;
     default:
         break;
     }
@@ -158,7 +164,7 @@ void Server::unreliableBroadcast(Packet& packet)
 {
     for (auto& kv : m_ConnectedPlayers) {
         packet.ChangePacketID(kv.second.PacketID);
-        m_Unreliable.Send(packet, kv.second);
+        //        m_Unreliable.Send(packet, kv.second);
     }
 }
 
@@ -168,7 +174,7 @@ void Server::sendSnapshot()
     Packet packet(MessageType::Snapshot);
     addInputCommandsToPacket(packet);
     addPlayersToPacket(packet, EntityID_Invalid);
-    unreliableBroadcast(packet);
+    reliableBroadcast(packet);
 }
 
 void Server::addInputCommandsToPacket(Packet& packet)
@@ -316,25 +322,28 @@ void Server::checkForTimeOuts()
     }
 }
 
-void Server::parseUDPConnect(Packet & packet)
-{
-    // Pop size of message int
-    packet.ReadPrimitive<int>();
-    int messageType = packet.ReadPrimitive<int>();
-    // Read packet ID 
-    m_PreviousPacketID = m_PacketID;    // Set previous packet id
-    m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
-    // parse player id and other stuff
-    PlayerID playerID = packet.ReadPrimitive<int>();
-    // Do something here?
-    boost::asio::ip::udp::endpoint endpoint(m_Address, m_Port);
-    m_ConnectedPlayers.at(playerID).Endpoint = endpoint;
-    LOG_INFO("parseUDPConnect: Spectator \"%s\" connected on IP: %s", m_ConnectedPlayers.at(playerID).Name.c_str(), m_ConnectedPlayers.at(playerID).Endpoint.address().to_string().c_str());
-    // Send a message to the player that connected
-    Packet connnectPacket(MessageType::Connect, m_ConnectedPlayers.at(playerID).PacketID);
-    m_Unreliable.Send(connnectPacket);
-    LOG_INFO("UDP Connect sent to client");
-}
+//void Server::parseUDPConnect(Packet & packet)
+//{
+//    // Pop size of message int
+//    packet.ReadPrimitive<int>();
+//    int messageType = packet.ReadPrimitive<int>();
+//    // Read packet ID 
+//    m_PreviousPacketID = m_PacketID;    // Set previous packet id
+//    m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
+//    // parse player id and other stuff
+//    PlayerID playerID = packet.ReadPrimitive<int>();
+//    if (!EntityWrapper(m_World, playerID).Valid()) {
+//
+//    }
+//    // Do something here?
+//    boost::asio::ip::udp::endpoint endpoint(m_Address, m_Port);
+//    m_ConnectedPlayers.at(playerID).Endpoint = endpoint;
+//    LOG_INFO("parseUDPConnect: Spectator \"%s\" connected on IP: %s", m_ConnectedPlayers.at(playerID).Name.c_str(), m_ConnectedPlayers.at(playerID).Endpoint.address().to_string().c_str());
+//    // Send a message to the player that connected
+//    Packet connnectPacket(MessageType::Connect, m_ConnectedPlayers.at(playerID).PacketID);
+//    m_Unreliable.Send(connnectPacket);
+//    LOG_INFO("UDP Connect sent to client");
+//}
 
 void Server::parseTCPConnect(Packet & packet)
 {
@@ -348,7 +357,7 @@ void Server::parseTCPConnect(Packet & packet)
     LOG_INFO("Parsing connections");
     // Check if player is already connected
     // Ska vara till lagd i TCPServer receive
-    PlayerID playerID = GetPlayerIDFromEndpoint();
+    PlayerID playerID = getPlayerIDFromEndpoint();
     if (playerID == -1) {
         return;
     }
@@ -360,6 +369,11 @@ void Server::parseTCPConnect(Packet & packet)
     m_ConnectedPlayers.at(playerID).TCPAddress = m_Address;
     m_ConnectedPlayers.at(playerID).TCPPort = m_Port;
 
+    Events::PlayerConnected e;
+    e.PlayerID = playerID;
+    e.PlayerName = m_ConnectedPlayers.at(playerID).Name;
+    m_EventBroker->Publish(e);
+
     LOG_INFO("parseTCPConnect: Spectator \"%s\" connected on IP: %s", m_ConnectedPlayers.at(playerID).Name.c_str(),
         m_ConnectedPlayers.at(playerID).TCPAddress.to_string().c_str());
 
@@ -398,7 +412,7 @@ void Server::parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint)
     Packet packet(MessageType::ServerlistRequest);
     packet.WriteString(m_Reliable.Address());
     packet.WritePrimitive<int>(m_Reliable.Port());
-    packet.WriteString("SERVERNAME");
+    packet.WriteString(m_ServerName);
     packet.WritePrimitive<int>(m_ConnectedPlayers.size());
     m_ServerlistRequest.Send(packet);
 }
@@ -523,10 +537,20 @@ bool Server::OnAmmoPickup(const Events::AmmoPickup & e)
     return true;
 }
 
+
+bool Server::OnPlayerDeath(const Events::PlayerDeath& e)
+{
+    Events::KillDeath eKD;
+    eKD.Casualty = getPlayerIDFromEntityID(e.Player.ID);
+    eKD.Killer = getPlayerIDFromEntityID(e.Killer.ID);
+    m_EventBroker->Publish(eKD);
+    return false;
+}
+
 void Server::parseClientPing()
 {
     LOG_INFO("%i: Parsing ping", m_PacketID);
-    PlayerID player = GetPlayerIDFromEndpoint();
+    PlayerID player = getPlayerIDFromEndpoint();
     if (player == -1) {
         return;
     }
@@ -555,11 +579,16 @@ bool Server::parseDoubleJump(Packet & packet)
     return true;
 }
 
+void Server::parseDashEffect(Packet& packet)
+{
+    reliableBroadcast(packet);
+}
+
 void Server::parseOnInputCommand(Packet& packet)
 {
     PlayerID player = -1;
     // Check which player it was who sent the message
-    player = GetPlayerIDFromEndpoint();
+    player = getPlayerIDFromEndpoint();
     if (player != -1) {
         while (packet.DataReadSize() < packet.Size()) {
             Events::InputCommand e;
@@ -578,7 +607,7 @@ void Server::parseOnInputCommand(Packet& packet)
 
 void Server::parsePlayerTransform(Packet& packet)
 {
-    PlayerID playerID = GetPlayerIDFromEndpoint();
+    PlayerID playerID = getPlayerIDFromEndpoint();
     if (playerID == -1) {
         return;
     }
@@ -614,20 +643,10 @@ void Server::parsePlayerTransform(Packet& packet)
 
 bool Server::shouldSendToClient(EntityWrapper childEntity)
 {
-    auto children = m_World->GetDirectChildren(childEntity.ID);
-    for (auto it = children.first; it != children.second; it++) {
-        EntityWrapper child(m_World, it->second);
-        if (child.HasComponent("CapturePoint") || child.HasComponent("HealthPickup")
-            || child.HasComponent("AmmoPickup")) {
-            return true;
-        }
-    }
-    return childEntity.HasComponent("Player") || childEntity.FirstParentWithComponent("Player").Valid()
-        || childEntity.HasComponent("CapturePoint") || childEntity.HasComponent("HealthPickup")
-        || childEntity.HasComponent("AmmoPickup");
+    return childEntity.HasComponent("NetworkComponent") || childEntity.FirstParentWithComponent("NetworkComponent").Valid();
 }
 
-PlayerID Server::GetPlayerIDFromEndpoint()
+PlayerID Server::getPlayerIDFromEndpoint()
 {
     // check both tcp and udp connection
     for (auto& kv : m_ConnectedPlayers) {
@@ -639,4 +658,14 @@ PlayerID Server::GetPlayerIDFromEndpoint()
         }
     }
     return -1;
-}
+}
+
+PlayerID Server::getPlayerIDFromEntityID(EntityID entityID)
+{
+    for (auto& kv : m_ConnectedPlayers) {
+        if (entityID == kv.second.EntityID) {
+            return kv.first;
+        }
+    }
+    return -1;
+}

src/Engine/Network/TCPClient.cpp

@@ -10,7 +10,7 @@ TCPClient::~TCPClient()
 {
 }
 
-void TCPClient::Connect(std::string playerName, std::string address, int port)
+bool TCPClient::Connect(std::string playerName, std::string address, int port)
 {
     if (m_Socket) {
         if (m_IsConnected) {
@@ -19,6 +19,7 @@ void TCPClient::Connect(std::string playerName, std::string address, int port)
             Send(packet);
             LOG_INFO("Connect message sent again!");
         }
+        return true;
     }
     else if (!m_IsConnected) {
         boost::system::error_code error = boost::asio::error::host_not_found;
@@ -34,11 +35,13 @@ void TCPClient::Connect(std::string playerName, std::string address, int port)
             packet.WriteString(playerName);
             Send(packet);
             LOG_INFO("Connect message sent!");
+            return true;
         }
         // If error
         else {
             m_Socket->close();
             m_Socket = nullptr;
+            return false;
         }
     }
 }
@@ -74,7 +77,10 @@ size_t TCPClient::readBuffer()
         boost::asio::ip::tcp::socket::message_peek, error);
     unsigned int sizeOfPacket = 0;
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-
+    if (sizeOfPacket > m_Socket->available()) {
+        LOG_WARNING("TCPClient::readBuffer(): We haven't got the whole packet yet.");
+        //return 0;
+    }
     // if the buffer is to small increase the size of it
     // TODO if message is huge 1 time the buffer will not decrease.
     if (sizeOfPacket > m_BufferSize) {
@@ -82,12 +88,15 @@ size_t TCPClient::readBuffer()
         m_ReadBuffer = new char[sizeOfPacket];
         m_BufferSize = sizeOfPacket;
     }
-    // Read the rest of the message
-    size_t bytesReceived = m_Socket->read_some(boost
-        ::asio::buffer((void*)(m_ReadBuffer), sizeOfPacket),
-        error);
-    if (error) {
-        //LOG_ERROR("receive: %s", error.message().c_str());
+    size_t bytesReceived = 0;
+    while (sizeOfPacket > bytesReceived) {
+        // Read the rest of the message
+        bytesReceived += m_Socket->read_some(boost
+            ::asio::buffer((void*)(m_ReadBuffer), sizeOfPacket - bytesReceived),
+            error);
+        if (error) {
+            //LOG_ERROR("receive: %s", error.message().c_str());
+        }
     }
     if (sizeOfPacket > 1000000)
         LOG_WARNING("The packets received are bigger than 1MB");

src/Engine/Network/TCPServer.cpp

@@ -106,7 +106,10 @@ int TCPServer::readBuffer(PlayerDefinition & playerDefinition)
         boost::asio::ip::tcp::socket::message_peek, error);
     unsigned int sizeOfPacket = 0;
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-
+    if (sizeOfPacket > playerDefinition.TCPSocket->available()) {
+        LOG_WARNING("TCPServer::readBuffer(): We haven't got the whole packet yet.");
+        return 0;
+    }
     // if the buffer is to small increase the size of it
     if (sizeOfPacket > m_BufferSize) {
         delete[] m_ReadBuffer;

src/Engine/Network/UDPClient.cpp

@@ -10,14 +10,15 @@ UDPClient::~UDPClient()
 { 
 }
 
-void UDPClient::Connect(std::string playerName, std::string address, int port)
+bool UDPClient::Connect(std::string playerName, std::string address, int port)
 {
     if (m_Socket) {
-        return;
+        return false;
     }
     m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address().from_string(address), port);
     m_Socket = boost::shared_ptr<boost::asio::ip::udp::socket>(new boost::asio::ip::udp::socket(m_IOService));
     m_Socket->open(boost::asio::ip::udp::v4());
+    return true;
 }
 
 void UDPClient::Disconnect()
@@ -45,7 +46,10 @@ int UDPClient::readBuffer()
          boost::asio::ip::udp::socket::message_peek, error);
     int sizeOfPacket = 0;
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-
+    if (sizeOfPacket > m_Socket->available()) {
+        LOG_WARNING("UDPClient::readBuffer(): We haven't got the whole packet yet.");
+        //return 0;
+    }
     // if the buffer is to small increase the size of it
     if (sizeOfPacket > m_BufferSize) {
         delete[] m_ReadBuffer;

src/Engine/Network/UDPServer.cpp

@@ -21,33 +21,38 @@ void UDPServer::Send(Packet& packet, PlayerDefinition & playerDefinition)
             boost::asio::buffer(packet.Data(), packet.Size()),
             playerDefinition.Endpoint,
             0);
+        LOG_INFO("Size of packet is %i", bytesSent);
     } catch (const boost::system::system_error& e) {
+        LOG_INFO(e.what());
         // TODO: Clean up invalid endpoints out of m_ConnectedPlayers later
         playerDefinition.Endpoint = boost::asio::ip::udp::endpoint();
     }
+
 }
 // Send back to endpoint of received packet
 void UDPServer::Send(Packet & packet)
 {
     packet.UpdateSize();
-    m_Socket->send_to(
+     size_t bytesSent = m_Socket->send_to(
         boost::asio::buffer(
             packet.Data(),
             packet.Size()),
         m_ReceiverEndpoint,
         0);
+     LOG_INFO("Size of packet is %i", bytesSent);
 }
 
 // Broadcasting respond specific logic
 void UDPServer::Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint)
 {
     packet.UpdateSize();
-    m_Socket->send_to(
+    size_t bytesSent = m_Socket->send_to(
         boost::asio::buffer(
             packet.Data(),
             packet.Size()),
         endpoint,
         0);
+    LOG_INFO("Size of packet is %i", bytesSent);
 }
 
 // Broadcasting
@@ -55,7 +60,7 @@ void UDPServer::Broadcast(Packet & packet, int port)
 {
     packet.UpdateSize();
     m_Socket->set_option(boost::asio::socket_base::broadcast(true));
-    m_Socket->send_to(
+    size_t bytesSent = m_Socket->send_to(
         boost::asio::buffer(
             packet.Data(),
             packet.Size()),
@@ -92,6 +97,11 @@ int UDPServer::readBuffer()
     unsigned int sizeOfPacket = 0;
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
 
+    if (sizeOfPacket > m_Socket->available()) {
+        LOG_WARNING("UDPServer::readBuffer(): We haven't got the whole packet yet.");
+        //return 0;
+    }
+
     // if the buffer is to small increase the size of it
     if (sizeOfPacket > m_BufferSize) {
         delete[] m_ReadBuffer;

src/Engine/Rendering/AnimationSystem.cpp

@@ -1,71 +1,348 @@
 #include "Rendering/AnimationSystem.h"
 
-void AnimationSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& animationComponent, double dt)
+AnimationSystem::AnimationSystem(SystemParams params)
+    : System(params)
 {
-    if(!entity.HasComponent("Model")) {
+    EVENT_SUBSCRIBE_MEMBER(m_EAutoAnimationBlend, &AnimationSystem::OnAutoAnimationBlend);
+    EVENT_SUBSCRIBE_MEMBER(m_EEntityDeleted, &AnimationSystem::OnEntityDeleted);
+    EVENT_SUBSCRIBE_MEMBER(m_ESetBlendWeight, &AnimationSystem::OnSetBlendWeight);
+}
+
+void AnimationSystem::Update(double dt)
+{
+    UpdateAnimations(dt);
+    CreateBlendTrees();
+    UpdateWeights(dt);
+
+
+    for(auto& autoBlendQueue : m_AutoBlendQueues) {
+        autoBlendQueue.second.UpdateTime(dt);
+    }
+}
+
+void AnimationSystem::CreateBlendTrees()
+{
+    auto modelComponents = m_World->GetComponents("Model");
+    if (modelComponents == nullptr) {
         return;
     }
 
-    Model* model;
-    try {
-        model = ResourceManager::Load<::Model, true>(entity["Model"]["Resource"]);
-    } catch (const std::exception&) {
-        return;
+    for (auto& modelC : *modelComponents) {
+        EntityWrapper entity = EntityWrapper(m_World, modelC.EntityID);
+
+        Model* model;
+        try {
+            model = ResourceManager::Load<::Model, true>(entity["Model"]["Resource"]);
+        } catch (const std::exception&) {
+            continue;;
+        }
+
+        Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+        if (skeleton == nullptr) {
+            continue;
+        }
+
+        if (entity.HasComponent("Blend") || entity.HasComponent("BlendOverride") ||
+            entity.HasComponent("BlendAdditive") || entity.HasComponent("Animation"))
+        {
+            std::shared_ptr<BlendTree> blendTree = std::shared_ptr<BlendTree>(new BlendTree(entity, skeleton));
+
+            if(blendTree->IsValid()) {
+                skeleton->BlendTrees[entity] = blendTree;
+            }
+            
+        }
     }
-    
-    Skeleton* skeleton = model->m_RawModel->m_Skeleton;
-    if(skeleton == nullptr) {
+}
+
+void AnimationSystem::UpdateAnimations(double dt)
+{
+    auto animationComponents = m_World->GetComponents("Animation");
+    if(animationComponents == nullptr) {
         return;
     }
 
-    for (int i = 1; i <= 3; i++) {
-        const Skeleton::Animation* animation = skeleton->GetAnimation(animationComponent["AnimationName" + std::to_string(i)]);
+    for (auto& animationC : *animationComponents) {
+        EntityWrapper entity = EntityWrapper(m_World, animationC.EntityID);
+        EntityWrapper modelEntity;
+        if(!entity.HasComponent("Model")) {
+            modelEntity = entity.FirstParentWithComponent("Model");
+        } else {
+            modelEntity = entity;
+        }
+
+        Model* model;
+        try {
+            model = ResourceManager::Load<::Model, true>(modelEntity["Model"]["Resource"]);
+        } catch (const std::exception&) {
+            return;
+        }
+
+        Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+        if (skeleton == nullptr) {
+            return;
+        }
+
+        const Skeleton::Animation* animation = skeleton->GetAnimation(animationC["AnimationName"]);
 
         if (animation == nullptr) {
             continue;;
         }
 
-        double animationSpeed = (double)animationComponent["Speed" + std::to_string(i)];
+        double animationSpeed = (double)animationC["Speed"];
 
-        if (animationSpeed != 0.0) {
-            double nextTime = (double)animationComponent["Time" + std::to_string(i)] + animationSpeed * dt;
+        if((bool)animationC["Reverse"]) {
+            animationSpeed *= -1;
+        }
 
 
-            if (!(bool)animationComponent["Loop" + std::to_string(i)]) {
+        if ((bool)animationC["Play"]) {
+
+            double nextTime = (double)animationC["Time"] + animationSpeed * dt;
+            if (!(bool)animationC["Loop"]) {
                 if (nextTime > animation->Duration) {
                     nextTime = animation->Duration;
-                    Events::AnimationComplete e;
-                    e.Entity = entity;
-                    e.Name = (std::string)animationComponent["AnimationName" + std::to_string(i)];
-                    m_EventBroker->Publish(e);
+                    (bool&)animationC["Play"] = false;
                 } else if (nextTime < 0) {
-                    Events::AnimationComplete e;
-                    e.Entity = entity;
-                    e.Name = (std::string)animationComponent["AnimationName" + std::to_string(i)];
-                    m_EventBroker->Publish(e);
                     nextTime = 0;
+                    (bool&)animationC["Play"] = false;
                 }
-
-                (double&)animationComponent["Speed" + std::to_string(i)] = 0.0;
-                
             } else {
                 if (nextTime > animation->Duration) {
-                    Events::AnimationComplete e;
-                    e.Entity = entity;
-                    e.Name = (std::string)animationComponent["AnimationName" + std::to_string(i)];
-                    m_EventBroker->Publish(e);
-                    nextTime -= animation->Duration;
+
+                    while (nextTime > animation->Duration) {
+                        nextTime -= animation->Duration;
+                    }
                 } else if (nextTime < 0) {
-                    Events::AnimationComplete e;
-                    e.Entity = entity;
-                    e.Name = (std::string)animationComponent["AnimationName" + std::to_string(i)];
-                    m_EventBroker->Publish(e);
-                    nextTime += animation->Duration;
+                    while (nextTime < 0) {
+                        nextTime += animation->Duration;
+                    }
                 }
             }
-
-            (double&)animationComponent["Time" + std::to_string(i)] = nextTime;
+            (double&)animationC["Time"] = nextTime;
         }
-    } 
+    }
 }
 
+void AnimationSystem::UpdateWeights(double dt)
+{
+    for (auto it = m_AutoBlendQueues.begin(); it != m_AutoBlendQueues.end(); ) {
+        LOG_INFO("%s", it->first.Name().c_str());
+        it->second.PrintQueue();
+        
+        if(it->second.HasActiveBlendJob()) {
+            AutoBlendQueue::AutoBlendJob& blendJob = it->second.GetActiveBlendJob();
+            LOG_INFO("%s", blendJob.RootNode.Name().c_str());
+            std::shared_ptr<BlendTree> blendTree = it->second.GetBlendTree();
+            if (blendTree != nullptr) {
+                if (blendJob.Duration != 0.0) {
+                    blendJob.BlendInfo.progress = glm::clamp(blendJob.CurrentTime / blendJob.Duration, 0.0, 1.0);
+                } else {
+                    blendJob.BlendInfo.progress = 1.0;
+                }
+
+                blendJob.BlendInfo = blendTree->AutoBlendStep(blendJob.BlendInfo);
+            } else {
+                it = m_AutoBlendQueues.erase(it);
+            }
+            it++;
+        } else {
+            if (it->second.Empty()) {
+                it = m_AutoBlendQueues.erase(it);
+            } else {
+                it++;
+            }
+        }
+    }
+}
+
+bool AnimationSystem::OnAutoAnimationBlend(Events::AutoAnimationBlend& e)
+{
+
+    if (!e.RootNode.Valid()) {
+        return false;
+    }
+
+    if (!e.RootNode.HasComponent("Model")) {
+        return false;
+    }
+
+    Model* model;
+    try {
+        model = ResourceManager::Load<::Model, true>((std::string)e.RootNode["Model"]["Resource"]);
+    } catch (const std::exception&) {
+        return false;
+    }
+
+    Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+    if (skeleton == nullptr) {
+        return false;
+    }
+
+    std::shared_ptr<BlendTree> blendTree;
+    if (skeleton->BlendTrees.find(e.RootNode) != skeleton->BlendTrees.end()) {
+        blendTree = skeleton->BlendTrees.at(e.RootNode);
+    } else {
+        return false;
+    }
+
+    EntityWrapper subTreeRoot;
+
+
+    if (e.SingleLevelBlend) {
+        subTreeRoot = blendTree->GetSubTreeRoot(e.NodeName);
+
+        if (!subTreeRoot.Valid()) {
+            return false;
+        }
+
+        AutoBlendQueue::AutoBlendJob abj;
+        abj.AnimationEntity = e.AnimationEntity;
+        abj.CurrentTime = 0.0;
+        abj.Delay = e.Delay;
+        abj.Duration = e.Duration;
+        abj.RootNode = e.RootNode;
+
+        abj.BlendInfo.NodeName = e.NodeName;
+        abj.BlendInfo.progress = 0.0;
+        abj.BlendInfo.Start = e.Start;
+        abj.BlendInfo.SingleBlend = e.SingleLevelBlend;
+        abj.BlendInfo.Weight = e.Weight;
+
+        std::vector<EntityWrapper> animationEntities = blendTree->GetEntitesByName(e.NodeName); // more than one
+        for(auto entity : animationEntities)
+        if (entity.Valid()) {
+            if (entity.HasComponent("Animation")) {
+                const Skeleton::Animation* animation = skeleton->GetAnimation(entity["Animation"]["AnimationName"]);
+                (bool&)entity["Animation"]["Reverse"] = e.Reverse;
+
+                if (e.Restart) {
+                    if (animation != nullptr) {
+                        if (e.Restart) {
+                            if (e.Reverse) {
+                                (double&)entity["Animation"]["Time"] = animation->Duration;
+                            } else {
+                                (double&)entity["Animation"]["Time"] = 0.0;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        m_AutoBlendQueues[subTreeRoot].Insert(abj);
+    } else {
+        std::vector<EntityWrapper> subtreeroots = blendTree->GetSingleLevelRoots(e.NodeName);
+
+        for(auto entity : subtreeroots) {
+            subTreeRoot = entity;
+
+            if (!subTreeRoot.Valid()) {
+                return false;
+            }
+
+            AutoBlendQueue::AutoBlendJob abj;
+            abj.AnimationEntity = e.AnimationEntity;
+            abj.CurrentTime = 0.0;
+            abj.Delay = e.Delay;
+            abj.Duration = e.Duration;
+            abj.RootNode = e.RootNode;
+
+            abj.BlendInfo.NodeName = e.NodeName;
+            abj.BlendInfo.progress = 0.0;
+            abj.BlendInfo.Start = e.Start;
+            abj.BlendInfo.SingleBlend = e.SingleLevelBlend;
+            abj.BlendInfo.Weight = e.Weight;
+            m_AutoBlendQueues[subTreeRoot].Insert(abj);
+        }
+
+        std::vector<EntityWrapper> animationEntities = blendTree->GetEntitesByName(e.NodeName); // more than one
+        for (auto entity : animationEntities)
+            if (entity.Valid()) {
+                if (entity.HasComponent("Animation")) {
+                    const Skeleton::Animation* animation = skeleton->GetAnimation(entity["Animation"]["AnimationName"]);
+                    (bool&)entity["Animation"]["Reverse"] = e.Reverse;
+
+                    if (e.Restart) {
+                        if (animation != nullptr) {
+                            if (e.Restart) {
+                                if (e.Reverse) {
+                                    (double&)entity["Animation"]["Time"] = animation->Duration;
+                                } else {
+                                    (double&)entity["Animation"]["Time"] = 0.0;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+    }
+
+   
+    return true;
+}
+
+bool AnimationSystem::OnEntityDeleted(Events::EntityDeleted& e)
+{
+    EntityWrapper entity = EntityWrapper(m_World, e.DeletedEntity);
+
+    if (entity.HasComponent("Model")) {
+        Model* model;
+        try {
+            model = ResourceManager::Load<::Model, true>(entity["Model"]["Resource"]);
+        } catch (const std::exception&) {
+            return false;
+        }
+
+        Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+        if (skeleton == nullptr) {
+            return false;
+        }
+
+        if (skeleton->BlendTrees.find(entity) != skeleton->BlendTrees.end()) {
+            skeleton->BlendTrees.erase(entity);
+        }
+
+
+    }
+
+}
+
+bool AnimationSystem::OnSetBlendWeight(Events::SetBlendWeight& e)
+{
+    if (!e.RootNode.Valid()) {
+        return false;
+    }
+
+    if (!e.RootNode.HasComponent("Model")) {
+        return false;
+    }
+
+    Model* model;
+    try {
+        model = ResourceManager::Load<::Model, true>((std::string)e.RootNode["Model"]["Resource"]);
+    } catch (const std::exception&) {
+        return false;
+    }
+
+    Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+    if (skeleton == nullptr) {
+        return false;
+    }
+
+    std::shared_ptr<BlendTree> blendTree;
+    if (skeleton->BlendTrees.find(e.RootNode) != skeleton->BlendTrees.end()) {
+        blendTree = skeleton->BlendTrees.at(e.RootNode);
+    } else {
+        return false;
+    }
+
+    if(e.Weight >= 0 && e.Weight <= 1) {
+
+        blendTree->SetWeightByName(e.NodeName, e.Weight);
+
+        return true;
+    } else {
+        return false;
+    }
+
+}

src/Engine/Rendering/AutoBlendQueue.cpp

@@ -0,0 +1,197 @@
+#include "Rendering/AutoBlendQueue.h"
+
+void AutoBlendQueue::Insert(AutoBlendJob autoBlendJob)
+{
+    if(!autoBlendJob.RootNode.HasComponent("Model")) {
+        return;
+    }
+
+    AutoblendNode blendNode;
+    blendNode.BlendJob = autoBlendJob;
+    blendNode.StartTime = autoBlendJob.Delay;
+    blendNode.EndTime = autoBlendJob.Delay + autoBlendJob.Duration;
+
+
+
+    if (autoBlendJob.AnimationEntity.Valid()) {
+        if (autoBlendJob.AnimationEntity.HasComponent("Animation")) {
+            Model* model;
+            try {
+                model = ResourceManager::Load<::Model, true>((std::string)autoBlendJob.RootNode["Model"]["Resource"]);
+            } catch (const std::exception&) {
+                return;
+            }
+
+            Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+            if (skeleton == nullptr) {
+                return;
+            }
+
+            const Skeleton::Animation* animation = skeleton->GetAnimation((std::string)autoBlendJob.AnimationEntity["Animation"]["AnimationName"]);
+
+            if (animation == nullptr) {
+                return;
+            }
+
+            double AnimationDuration = 0.0;
+
+            double animationSpeed = (double)autoBlendJob.AnimationEntity["Animation"]["Speed"];
+            double animationTime = (double)autoBlendJob.AnimationEntity["Animation"]["Time"];
+
+            if (animationSpeed != 0) {
+                if ((bool)autoBlendJob.AnimationEntity["Animation"]["Reverse"]) {
+                    AnimationDuration = (animation->Duration / animationSpeed) - (animation->Duration - animationTime);
+                } else {
+                    AnimationDuration = (animation->Duration / animationSpeed) - animationTime;
+                }
+            } else {
+                return;
+            }
+
+            blendNode.StartTime += AnimationDuration;
+            blendNode.EndTime += AnimationDuration;
+            if (m_BlendQueue.size() == 0) {
+                m_BlendQueue.push_back(blendNode);
+            } else {
+                for (auto it = m_BlendQueue.begin(); it != m_BlendQueue.end(); it++) {
+                    auto next = std::next(it, 1);
+
+
+                    if (it->BlendJob.BlendInfo.NodeName == autoBlendJob.BlendInfo.NodeName) {
+                        (*it) = blendNode;
+                    }
+
+                    if (next != m_BlendQueue.end()) {
+                        if (it->StartTime >= blendNode.StartTime && next->StartTime <= blendNode.StartTime) {
+                            m_BlendQueue.insert(next, blendNode);
+                            return;
+                        }
+                    } else if(it->StartTime > blendNode.StartTime){
+                        m_BlendQueue.push_front(blendNode);
+                        return;
+                    } else if (it->StartTime <= blendNode.StartTime) {
+                        m_BlendQueue.push_back(blendNode);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+
+    m_BlendQueue.clear();
+    m_BlendQueue.push_back(blendNode);
+}
+
+void AutoBlendQueue::UpdateTime(double dt)
+{
+    for (auto it = m_BlendQueue.begin(); it != m_BlendQueue.end();) {
+        if (it->EndTime <= 0) {
+            it = m_BlendQueue.erase(it);
+        } else {
+            it->EndTime -= dt;
+            it->StartTime -= dt;
+            it++;
+        }
+    }
+}
+
+void AutoBlendQueue::PrintQueue()
+{
+    for (auto it = m_BlendQueue.begin(); it != m_BlendQueue.end(); it++) {
+        LOG_INFO("Start: %f End: %f \t %s", it->StartTime, it->EndTime, it->BlendJob.BlendInfo.NodeName.c_str());
+    }
+}
+
+
+bool AutoBlendQueue::HasActiveBlendJob()
+{
+    if(m_BlendQueue.empty()) {
+        return false;
+    } else {
+        AutoblendNode blendNode = m_BlendQueue.front();
+        if (blendNode.StartTime <= 0) {
+            AutoBlendJob blendJob = blendNode.BlendJob;
+
+            if (!blendJob.RootNode.Valid()) {
+                m_BlendQueue.pop_front();
+                return false;
+            }
+
+            if (!blendJob.RootNode.HasComponent("Model")) {
+                m_BlendQueue.pop_front();
+                return HasActiveBlendJob();
+            }
+
+            Model* model;
+            try {
+                model = ResourceManager::Load<::Model, true>(blendJob.RootNode["Model"]["Resource"]);
+            } catch (const std::exception&) {
+                //m_BlendQueue.pop_front();
+                return HasActiveBlendJob();
+            }
+
+            Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+            if (skeleton == nullptr) {
+                m_BlendQueue.pop_front();
+                return HasActiveBlendJob();
+            }
+
+
+            if (skeleton->BlendTrees.find(blendJob.RootNode) != skeleton->BlendTrees.end()) {
+                return true;
+            } else {
+                m_BlendQueue.pop_front();
+                return HasActiveBlendJob();
+            }
+
+            
+        } else {
+            return false;
+        }
+    }
+}
+
+
+std::shared_ptr<BlendTree> AutoBlendQueue::GetBlendTree()
+{
+    AutoblendNode blendNode = m_BlendQueue.front();
+    AutoBlendJob blendJob = blendNode.BlendJob;
+
+    if (!blendJob.RootNode.Valid()) {
+        m_BlendQueue.pop_front();
+        return false;
+    }
+
+    if (!blendJob.RootNode.HasComponent("Model")) {
+        return nullptr;
+    }
+
+    Model* model;
+    try {
+        model = ResourceManager::Load<::Model, true>(blendJob.RootNode["Model"]["Resource"]);
+    } catch (const std::exception&) {
+        return nullptr;
+    }
+
+    Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+    if (skeleton == nullptr) {
+        return nullptr;
+    }
+
+
+    if (skeleton->BlendTrees.find(blendJob.RootNode) != skeleton->BlendTrees.end()) {
+        return skeleton->BlendTrees.at(blendJob.RootNode);
+    } else {
+        return nullptr;
+    }
+
+
+
+}
+
+AutoBlendQueue::AutoBlendJob& AutoBlendQueue::GetActiveBlendJob()
+{
+    AutoblendNode& blendNode = m_BlendQueue.front();
+    blendNode.BlendJob.CurrentTime = -blendNode.StartTime;
+    return blendNode.BlendJob;
+}

src/Engine/Rendering/BlendTree.cpp

@@ -0,0 +1,546 @@
+#include "Rendering/BlendTree.h"
+
+BlendTree::BlendTree(EntityWrapper ModelEntity, Skeleton* skeleton)
+{
+    m_Skeleton = skeleton;
+
+    if (ModelEntity.HasComponent("Animation")) {
+        const Skeleton::Animation* animation = skeleton->GetAnimation(ModelEntity["Animation"]["AnimationName"]);
+        if (animation == nullptr) {
+            return;
+        }
+
+        m_Root = new Node();
+        m_Root->Entity = ModelEntity;
+        m_Root->Name = ModelEntity.Name();
+        m_Root->Pose = m_Skeleton->GetFrameBones(animation, (double)ModelEntity["Animation"]["Time"], (bool)ModelEntity["Animation"]["Additive"]);
+        m_Root->Parent = nullptr;
+        m_Root->Type = NodeType::Animation;
+
+    } else if (ModelEntity.HasComponent("Blend")) {
+        m_Root = new Node();
+        m_Root->Entity = ModelEntity;
+        m_Root->Name = ModelEntity.Name();
+        m_Root->Parent = nullptr;
+        m_Root->Type = NodeType::Blend;
+        m_Root->Weight = (double)ModelEntity["Blend"]["Weight"];
+        m_Root->SubTreeRoot = (bool)ModelEntity["Blend"]["SubTreeRoot"];
+        (double&)ModelEntity["Blend"]["Weight"] = glm::clamp((double)ModelEntity["Blend"]["Weight"], 0.0, 1.0);
+        m_Root->Child[0] = FillTreeByName(m_Root, (std::string)ModelEntity["Blend"]["Pose1"], ModelEntity);
+        m_Root->Child[1] = FillTreeByName(m_Root, (std::string)ModelEntity["Blend"]["Pose2"], ModelEntity);
+
+    } else if (ModelEntity.HasComponent("BlendOverride")) {
+        m_Root = new Node();
+        m_Root->Entity = ModelEntity;
+        m_Root->Name = ModelEntity.Name();
+        m_Root->Parent = nullptr;
+        m_Root->Type = NodeType::Override;
+        m_Root->Child[0] = FillTreeByName(m_Root, (std::string)ModelEntity["BlendOverride"]["Master"], ModelEntity);
+        m_Root->Child[1] = FillTreeByName(m_Root, (std::string)ModelEntity["BlendOverride"]["Slave"], ModelEntity);
+
+    } else if (ModelEntity.HasComponent("BlendAdditive")) {
+        m_Root = new Node();
+        m_Root->Entity = ModelEntity;
+        m_Root->Name = ModelEntity.Name();
+        m_Root->Parent = nullptr;
+        m_Root->Type = NodeType::Additive;
+        m_Root->Child[0] = FillTreeByName(m_Root, (std::string)ModelEntity["BlendAdditive"]["Adder"], ModelEntity);
+        m_Root->Child[1] = FillTreeByName(m_Root, (std::string)ModelEntity["BlendAdditive"]["Receiver"], ModelEntity);
+    }
+
+    m_FinalPose = AccumulateFinalPose();
+   // PrintTree();
+}
+
+BlendTree::~BlendTree()
+{
+    Node* currentNode = m_Root;
+    if (currentNode != nullptr) {
+        while (currentNode->Child[0] != nullptr) {
+            currentNode = currentNode->Child[0];
+        }
+
+        std::list<Node*> m_NodesToRemove;
+
+        while (currentNode != nullptr) {
+            m_NodesToRemove.push_back(currentNode);
+            currentNode = currentNode->Next();
+        }
+
+        for (auto it = m_NodesToRemove.begin(); it != m_NodesToRemove.end(); it++) {
+            delete (*it);
+        }
+    }
+}
+
+
+glm::mat4 BlendTree::GetBoneTransform(int boneID)
+{
+    if(m_FinalBoneTransforms.find(boneID) != m_FinalBoneTransforms.end()) {
+        return m_FinalBoneTransforms.at(boneID);
+    } else {
+        return glm::mat4(1);
+    }
+    
+}
+
+void BlendTree::PrintTree()
+{
+    Node* currentNode = m_Root;
+    LOG_INFO("\n\n");
+
+    while(currentNode->Child[0] != nullptr) {
+        currentNode = currentNode->Child[0];
+    }
+
+    while (currentNode != nullptr)
+    {
+        LOG_INFO("%s", currentNode->Name.c_str());
+        currentNode = currentNode->Next();
+    }
+}
+
+BlendTree::Node* BlendTree::FillTreeByName(Node* parentNode, std::string name, EntityWrapper parentEntity)
+{
+    EntityWrapper childEntity = parentEntity.FirstLevelChildByName(name); // Make first level child by name
+
+    if (!childEntity.Valid()) {
+        return nullptr;
+    }
+
+    if (childEntity.HasComponent("Animation")) {
+        const Skeleton::Animation* animation = m_Skeleton->GetAnimation(childEntity["Animation"]["AnimationName"]);
+        if (animation == nullptr) {
+            return nullptr;
+        }
+
+        Node* node = new Node();
+        node->Entity = childEntity;
+        node->Name = childEntity.Name();
+        node->Pose = m_Skeleton->GetFrameBones(animation, (double)childEntity["Animation"]["Time"], (bool)childEntity["Animation"]["Additive"]);
+        node->Parent = parentNode;
+        node->Type = NodeType::Animation;
+        return node;
+
+    } else if (childEntity.HasComponent("Blend")) {
+        Node* node = new Node();
+        node->Entity = childEntity;
+        node->Name = childEntity.Name();
+        node->Parent = parentNode;
+        node->Type = NodeType::Blend;
+        (double&)childEntity["Blend"]["Weight"] = glm::clamp((double)childEntity["Blend"]["Weight"], 0.0, 1.0);
+        node->Weight = (double)childEntity["Blend"]["Weight"];
+        node->SubTreeRoot = (bool)childEntity["Blend"]["SubTreeRoot"];
+        //if (node->Weight < 1.f && node->Weight > 0.f) {
+            node->Child[0] = FillTreeByName(node, (std::string)childEntity["Blend"]["Pose1"], childEntity);
+            node->Child[1] = FillTreeByName(node, (std::string)childEntity["Blend"]["Pose2"], childEntity);
+       /* } else if (node->Weight == 1.f) {
+            node->Child[0] = FillTreeByName(node, (std::string)childEntity["Blend"]["Pose1"], childEntity);
+        } else if (node->Weight == 0.f) {
+            node->Child[1] = FillTreeByName(node, (std::string)childEntity["Blend"]["Pose2"], childEntity);
+        }*/
+        
+        if(node->Child[0] == nullptr && node->Child[1] == nullptr) {
+            return nullptr;
+        } else {
+            return node;
+        }
+
+    } else if (childEntity.HasComponent("BlendOverride")) {
+        Node* node = new Node();
+        node->Entity = childEntity;
+        node->Name = childEntity.Name();
+        node->Parent = parentNode;
+        node->Type = NodeType::Override;
+        node->Child[0] = FillTreeByName(node, (std::string)childEntity["BlendOverride"]["Master"], childEntity);
+        node->Child[1] = FillTreeByName(node, (std::string)childEntity["BlendOverride"]["Slave"], childEntity);
+        
+        if (node->Child[0] == nullptr && node->Child[1] == nullptr) {
+            return nullptr;
+        } else {
+            return node;
+        }
+    } else if (childEntity.HasComponent("BlendAdditive")) {
+        Node* node = new Node();
+        node->Entity = childEntity;
+        node->Name = childEntity.Name();
+        node->Parent = parentNode;
+        node->Type = NodeType::Additive;
+        node->Child[0] = FillTreeByName(node, (std::string)childEntity["BlendAdditive"]["Adder"], childEntity);
+        node->Child[1] = FillTreeByName(node, (std::string)childEntity["BlendAdditive"]["Receiver"], childEntity);
+        
+        if(node->Child[0] == nullptr && node->Child[1] == nullptr) {
+            return nullptr;
+        } else {
+            return node;
+        }
+    }
+    
+
+    return nullptr;
+}
+
+
+std::vector<BlendTree::Node*> BlendTree::FindNodesByName(std::string name)
+{
+    std::vector<Node*> Nodes;
+    Node* currentNode = m_Root;
+
+    while (currentNode->Child[0] != nullptr) {
+        currentNode = currentNode->Child[0];
+    }
+
+    while (currentNode != nullptr) {
+        if(currentNode->Name == name) {
+            Nodes.push_back(currentNode);
+        }
+        currentNode = currentNode->Next();
+    }
+    return Nodes;
+}
+
+
+BlendTree::AutoBlendInfo BlendTree::AutoBlendStep(AutoBlendInfo blendInfo)
+{
+    std::vector<Node*> goalNodes = FindNodesByName(blendInfo.NodeName);
+
+    if(blendInfo.Weight >= 0 && blendInfo.Weight <= 1.0) {
+        for (auto it = goalNodes.begin(); it != goalNodes.end(); it++) {
+            EntityWrapper entity = (*it)->Entity;
+
+            if (entity.Valid()) {
+                if (entity.HasComponent("Blend")) {
+                    (double&)entity["Blend"]["Weight"] = blendInfo.Weight;
+                }
+            }
+        }
+        return blendInfo;
+    }
+
+
+
+    if (blendInfo.Start) {
+        for (auto it = goalNodes.begin(); it != goalNodes.end(); it++) {
+            EntityWrapper entity = (*it)->Entity;
+
+            if (entity.Valid()) {
+                if (entity.HasComponent("Animation")) {
+                    (bool&)entity["Animation"]["Play"] = true;
+                }
+            }
+        }
+    }
+
+    if(goalNodes.size() == 0) {
+        return blendInfo;
+    } else if(goalNodes.size() == 1) {
+        Node* currentNode = goalNodes[0]->Parent;
+        Node* lastNode = goalNodes[0];
+
+        while (currentNode != nullptr)
+        {
+            if(!currentNode->Entity.HasComponent("Blend")) {
+                return blendInfo;
+            }
+
+            double startWeight;
+            if(blendInfo.StartWeights.find(currentNode->Entity) != blendInfo.StartWeights.end()) {
+                startWeight = blendInfo.StartWeights.at(currentNode->Entity);
+            } else {
+                startWeight = currentNode->Weight;
+                blendInfo.StartWeights[currentNode->Entity] = startWeight;
+            }
+
+            double goalWeight;
+            if(currentNode->Child[0] == lastNode) {
+                goalWeight = 0.0;
+            } else if (currentNode->Child[1] == lastNode) {
+                goalWeight = 1.0;
+            }
+
+            double weight = ((goalWeight - startWeight) * blendInfo.progress) + startWeight;
+            (double&)currentNode->Entity["Blend"]["Weight"] = weight;
+            currentNode->Weight = weight;
+
+            lastNode = currentNode;
+            currentNode = currentNode->Parent;
+
+            if (blendInfo.SingleBlend) {
+                return blendInfo;;
+            }
+        }
+    } else if(goalNodes.size() >= 2) {
+        std::vector<Node*> sharedParents;
+        std::vector<Node*> nodes = goalNodes;
+
+        for (auto it = nodes.begin(); it != nodes.end(); it++) {
+            auto next = std::next(it, 1);
+            if (next != nodes.end()) {
+                Node* commonParent = FirstCommonParent((*it), (*next));
+                sharedParents.push_back(commonParent);
+                (*next) = commonParent;
+                nodes.erase(it);
+                it = nodes.begin();
+            }
+        }
+
+
+        for (auto it = goalNodes.begin(); it != goalNodes.end(); it++) {
+
+            Node* currentNode = (*it)->Parent;
+            Node* lastNode = (*it);
+
+            while (currentNode != nullptr) {
+                if (!currentNode->Entity.HasComponent("Blend")) {
+                    return blendInfo;
+                }
+
+                bool ShouldBreak = false;
+                for (auto it = sharedParents.begin(); it != sharedParents.end(); it++) {
+                    if(currentNode == (*it)) {
+                        ShouldBreak = true;
+                    }
+                }
+
+                if(ShouldBreak) {
+                    break;
+                }
+
+                double startWeight;
+                if (blendInfo.StartWeights.find(currentNode->Entity) != blendInfo.StartWeights.end()) {
+                    startWeight = blendInfo.StartWeights.at(currentNode->Entity);
+                } else {
+                    startWeight = currentNode->Weight;
+                    blendInfo.StartWeights[currentNode->Entity] = startWeight;
+                }
+
+                double goalWeight;
+                if (currentNode->Child[0] == lastNode) {
+                    goalWeight = 0.0;
+                } else if (currentNode->Child[1] == lastNode) {
+                    goalWeight = 1.0;
+                }
+
+                double weight = ((goalWeight - startWeight) * blendInfo.progress) + startWeight;
+                (double&)currentNode->Entity["Blend"]["Weight"] = weight;
+                currentNode->Weight = weight;
+
+                lastNode = currentNode;
+                currentNode = currentNode->Parent;
+                if (blendInfo.SingleBlend) {
+                    return blendInfo;
+                }
+            }
+        }
+    }
+
+    return blendInfo;
+}
+
+BlendTree::Node* BlendTree::GetCommonParent(std::string NodeName1, std::string NodeName2)
+{
+    std::vector<Node*> nodes1 = FindNodesByName(NodeName1);
+    std::vector<Node*> nodes2 = FindNodesByName(NodeName2);
+
+    for (auto it = nodes1.begin(); it != nodes1.end(); it++) {
+        auto next = std::next(it, 1);
+
+        if(next != nodes1.end()) {
+            Node* commonParent = FirstCommonParent((*it), (*next));
+            (*next) = commonParent;
+            nodes1.erase(it);
+            it = nodes1.begin();
+        }
+    }
+
+    for (auto it = nodes2.begin(); it != nodes2.end(); it++) {
+        auto next = std::next(it, 1);
+
+        if (next != nodes2.end()) {
+            Node* commonParent = FirstCommonParent((*it), (*next));
+            (*next) = commonParent;
+            nodes2.erase(it);
+            it = nodes2.begin();
+        }
+    }
+
+    return FirstCommonParent(nodes1.front(), nodes2.front());;
+}
+
+
+BlendTree::Node* BlendTree::FirstCommonParent(Node* node1, Node* node2)
+{
+    std::list<Node*> node1Parents;
+
+    Node* currentNode = node1;
+    while (currentNode != nullptr) {
+        node1Parents.push_back(currentNode);
+        currentNode = currentNode->Parent;
+    }
+
+    currentNode = node2;
+    while (currentNode != nullptr) {
+        for (auto it = node1Parents.begin(); it != node1Parents.end(); it++) {
+            if (currentNode == (*it)) {
+                return currentNode;
+            }
+        }
+        currentNode = currentNode->Parent;
+    }
+
+    return nullptr;
+}
+
+
+EntityWrapper BlendTree::GetSubTreeRoot(std::string nodeName)
+{
+    std::vector<Node*> nodes = FindNodesByName(nodeName);
+
+    if (nodes.size() == 0) {
+        return EntityWrapper::Invalid;
+    }
+
+    std::vector<Node*> subTreeRoots;
+
+    for (auto it = nodes.begin(); it != nodes.end(); it++) {
+        Node* currentNode = (*it)->Parent;
+        while (!currentNode->SubTreeRoot) {
+            currentNode = currentNode->Parent;
+        }
+        subTreeRoots.push_back(currentNode);
+    }
+
+
+    for (auto it = subTreeRoots.begin(); it != subTreeRoots.end(); it++) {
+        auto next = std::next(it, 1);
+
+        if (next != subTreeRoots.end()) {
+            Node* commonParent = FirstCommonParent((*it), (*next));
+            (*next) = commonParent;
+            subTreeRoots.erase(it);
+            it = subTreeRoots.begin();
+        }
+    }
+
+    return subTreeRoots.front()->Entity;
+}
+
+
+std::vector<EntityWrapper> BlendTree::GetSingleLevelRoots(std::string name)
+{
+    std::vector<Node*> nodes = FindNodesByName(name);
+    std::vector<EntityWrapper> entities;
+
+    for (auto it = nodes.begin(); it != nodes.end(); it++) {
+        Node* currentNode = (*it)->Parent;
+        
+        if(currentNode->Entity.Valid()) {
+            entities.push_back(currentNode->Entity);
+        }
+    }
+
+    return entities;
+}
+
+
+std::vector<EntityWrapper> BlendTree::GetEntitesByName(std::string name)
+{
+    std::vector<Node*> nodes = FindNodesByName(name);
+    std::vector<EntityWrapper> entities;
+
+    for (auto it = nodes.begin(); it != nodes.end(); it++) {
+        Node* currentNode = (*it);
+
+        if (currentNode->Entity.Valid()) {
+            entities.push_back(currentNode->Entity);
+        }
+    }
+
+    return entities;
+}
+
+
+void BlendTree::SetWeightByName(std::string name, double weight)
+{
+    std::vector<Node*> nodes = FindNodesByName(name);
+
+    for (auto node : nodes) {
+        EntityWrapper entity = node->Entity;
+
+        if(entity.HasComponent("Blend")) {
+            entity["Blend"]["Weight"] = weight;
+            node->Weight = weight;
+        }
+    }
+}
+
+void BlendTree::Blend(std::map<int, Skeleton::PoseData>& pose)
+{
+    Node* currentNode;
+    Node* start = m_Root;
+    while (start->Child[0] != nullptr) {
+        start = start->Child[0];
+    }
+
+    currentNode = start;
+
+    while (m_Root->Pose.size() == 0) {
+        if(currentNode->Pose.size() == 0) {
+            if (currentNode->Child[0] != nullptr && currentNode->Child[1] != nullptr) {
+                if (currentNode->Child[0]->Pose.size() != 0 && currentNode->Child[1]->Pose.size() != 0) {
+                    switch (currentNode->Type) {
+                    case BlendTree::NodeType::Additive:
+                        currentNode->Pose = m_Skeleton->BlendPoseAdditive(currentNode->Child[0]->Pose, currentNode->Child[1]->Pose);
+                        break;
+                    case BlendTree::NodeType::Blend:
+                        currentNode->Pose = m_Skeleton->BlendPoses(currentNode->Child[0]->Pose, currentNode->Child[1]->Pose, currentNode->Weight);
+                        break;
+                    case BlendTree::NodeType::Override:
+                        currentNode->Pose = m_Skeleton->OverridePose(currentNode->Child[0]->Pose, currentNode->Child[1]->Pose);
+                        break;
+                    case BlendTree::NodeType::Animation:
+                        // do nothing
+                        break;
+                    } 
+                } 
+            } else if (currentNode->Child[0] != nullptr) {
+                if (currentNode->Child[0]->Pose.size() != 0) {
+                    currentNode->Pose = currentNode->Child[0]->Pose;
+                }
+            } else if (currentNode->Child[1] != nullptr) {
+                if (currentNode->Child[1]->Pose.size() != 0) {
+                    currentNode->Pose = currentNode->Child[1]->Pose;
+                }
+            }
+        } 
+
+        currentNode = currentNode->Next();
+
+        if (currentNode == nullptr) {
+            currentNode = start;
+        }
+        
+    }
+
+    pose = m_Root->Pose;
+}
+
+std::vector<glm::mat4> BlendTree::AccumulateFinalPose()
+{
+    std::vector<glm::mat4> finalPose;
+    if (m_Skeleton == nullptr || m_Root == nullptr || (m_Root->Child[0] == nullptr && m_Root->Child[1] == nullptr)) {
+        
+        for (int i = 0; i < m_Skeleton->Bones.size(); i++) {
+            finalPose.push_back(glm::mat4(1));
+        }
+        return finalPose;
+    }
+
+    std::map<int, Skeleton::PoseData> pose;
+    Blend(pose);
+
+    m_Skeleton->GetFinalPose(pose, finalPose, m_FinalBoneTransforms);
+
+    return finalPose;
+}
+

src/Engine/Rendering/BlurHUD.cpp

@@ -0,0 +1,282 @@
+#include "Rendering/BlurHUD.h"
+
+BlurHUD::BlurHUD(IRenderer* renderer)
+    : m_Renderer(renderer)
+{
+    InitializeShaderPrograms();
+    InitializeBuffers();
+	InitializeTextures();
+}
+
+void BlurHUD::InitializeTextures()
+{
+    m_BlackTexture = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/Black.png");
+    m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.mesh");
+}
+
+void BlurHUD::InitializeShaderPrograms()
+{
+    m_GaussianProgram_horiz = ResourceManager::Load<ShaderProgram>("##GaussianProgramHoriz");
+	if (m_GaussianProgram_horiz->GetHandle() == 0) {
+		m_GaussianProgram_horiz->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Gaussian_horiz.vert.glsl")));
+		m_GaussianProgram_horiz->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Gaussian_horiz.frag.glsl")));
+		m_GaussianProgram_horiz->Compile();
+        m_GaussianProgram_horiz->BindFragDataLocation(0, "fragmentColor");
+		m_GaussianProgram_horiz->Link();
+	}
+
+	m_GaussianProgram_vert = ResourceManager::Load<ShaderProgram>("##GaussianProgramVert");
+	if (m_GaussianProgram_vert->GetHandle() == 0) {
+		m_GaussianProgram_vert->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Gaussian_vert.vert.glsl")));
+		m_GaussianProgram_vert->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Gaussian_vert.frag.glsl")));
+		m_GaussianProgram_vert->Compile();
+        m_GaussianProgram_vert->BindFragDataLocation(0, "fragmentColor");
+		m_GaussianProgram_vert->Link();
+	}
+    m_FillDepthStencilProgram = ResourceManager::Load<ShaderProgram>("#FillDepthStencilProgram");
+    if (m_FillDepthStencilProgram->GetHandle() == 0) {
+        m_FillDepthStencilProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/FillDepthBuffer.vert.glsl")));
+        m_FillDepthStencilProgram->Compile();
+        m_FillDepthStencilProgram->Link();
+    }
+    m_CombineTexturesProgram = ResourceManager::Load<ShaderProgram>("#CombineTexturesProgram");
+    if (m_CombineTexturesProgram->GetHandle() == 0) {
+        m_CombineTexturesProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/CombineTexture.vert.glsl")));
+        m_CombineTexturesProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/CombineTexture.frag.glsl")));
+        m_CombineTexturesProgram->Compile();
+        m_CombineTexturesProgram->BindFragDataLocation(0, "sceneColor");
+        m_CombineTexturesProgram->BindFragDataLocation(1, "bloomColor");
+        m_CombineTexturesProgram->Link();
+    }
+    GLERROR("Creating DepthFill program");
+}
+
+void BlurHUD::InitializeBuffers()
+{
+    glm::vec2 res = glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+    glm::vec2 res2 = glm::vec2(m_Renderer->GetViewportSize().Width/m_BlurQuality, m_Renderer->GetViewportSize().Height/m_BlurQuality);
+
+
+    CommonFunctions::GenerateTexture(&m_DepthStencil_horiz, GL_CLAMP_TO_BORDER, GL_NEAREST,
+        res2, GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8);
+    CommonFunctions::GenerateTexture(&m_GaussianTexture_horiz, GL_CLAMP_TO_EDGE, GL_NEAREST, 
+        res2, GL_RGBA16F, GL_RGBA, GL_FLOAT);
+
+	if (m_GaussianFrameBuffer_horiz.GetHandle() == 0) {
+        m_GaussianFrameBuffer_horiz.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_DepthStencil_horiz, GL_DEPTH_STENCIL_ATTACHMENT)));
+		m_GaussianFrameBuffer_horiz.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_GaussianTexture_horiz, GL_COLOR_ATTACHMENT0)));
+	}
+	m_GaussianFrameBuffer_horiz.Generate();
+
+    CommonFunctions::GenerateTexture(&m_DepthStencil_vert, GL_CLAMP_TO_BORDER, GL_NEAREST,
+        res2, GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8);
+    CommonFunctions::GenerateTexture(&m_GaussianTexture_vert, GL_CLAMP_TO_EDGE, GL_NEAREST,
+        res2, GL_RGBA16F, GL_RGBA, GL_FLOAT);
+
+	if (m_GaussianFrameBuffer_vert.GetHandle() == 0) {
+        m_GaussianFrameBuffer_vert.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_DepthStencil_vert, GL_DEPTH_STENCIL_ATTACHMENT)));
+		m_GaussianFrameBuffer_vert.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_GaussianTexture_vert, GL_COLOR_ATTACHMENT0)));
+	}
+	m_GaussianFrameBuffer_vert.Generate();
+
+    CommonFunctions::GenerateTexture(&m_CombinedTexture, GL_CLAMP_TO_BORDER, GL_NEAREST,
+        res, GL_RGB16F, GL_RGB, GL_FLOAT);
+
+    if (m_CombinedTextureBuffer.GetHandle() == 0) {
+        m_CombinedTextureBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_CombinedTexture, GL_COLOR_ATTACHMENT0)));
+    }
+    m_CombinedTextureBuffer.Generate();
+}
+
+
+void BlurHUD::ClearBuffer()
+{
+    GLERROR("PRE");
+    m_GaussianFrameBuffer_horiz.Bind();
+    glClearColor(0.f, 0.f, 0.f, 0.f);
+    glClearStencil(0x00);
+    glStencilMask(~0);
+    glDisable(GL_SCISSOR_TEST);
+    glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+    m_GaussianFrameBuffer_horiz.Unbind();
+    m_GaussianFrameBuffer_vert.Bind();
+    glClearColor(0.f, 0.f, 0.f, 0.f);
+    glClearStencil(0x00);
+    glStencilMask(~0);
+    glDisable(GL_SCISSOR_TEST);
+    glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+    m_GaussianFrameBuffer_vert.Unbind();
+
+    m_CombinedTextureBuffer.Bind();
+    glClearColor(0.f, 0.f, 0.f, 0.f);
+    glClear(GL_COLOR_BUFFER_BIT);
+    m_CombinedTextureBuffer.Unbind();
+    GLERROR("END");
+}
+
+//Returns the finished blurred texture
+GLuint BlurHUD::Draw(GLuint texture, RenderScene& scene)
+{
+    GLERROR("DrawBloomPass::Draw: Pre");
+
+    FillStencil(scene);
+
+    RenderState state;
+    state.Disable(GL_BLEND);
+    state.Disable(GL_DEPTH_TEST);
+    state.Disable(GL_CULL_FACE);
+
+    state.Enable(GL_STENCIL_TEST);
+    state.StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
+    state.StencilFunc(GL_EQUAL, 1, 0xFF);
+    state.StencilMask(0x00);
+    state.DepthMask(GL_FALSE);
+    state.Enable(GL_SCISSOR_TEST);
+
+    GLuint shaderHandle_horiz = m_GaussianProgram_horiz->GetHandle();
+    GLuint shaderHandle_vert = m_GaussianProgram_vert->GetHandle();
+
+    //Horizontal pass, first use the given texture then save it to the horizontal framebuffer.
+    m_GaussianFrameBuffer_horiz.Bind();
+
+    glViewport(0, 0, m_Renderer->GetViewportSize().Width/m_BlurQuality, m_Renderer->GetViewportSize().Height/m_BlurQuality);
+    glScissor(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+    
+    m_GaussianProgram_horiz->Bind();
+    glActiveTexture(GL_TEXTURE0);
+    glBindTexture(GL_TEXTURE_2D, texture);
+    glBindVertexArray(m_ScreenQuad->VAO);
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ScreenQuad->ElementBuffer);
+    glDrawElementsBaseVertex(GL_TRIANGLES, m_ScreenQuad->MaterialGroups()[0].material->EndIndex - m_ScreenQuad->MaterialGroups()[0].material->StartIndex +1
+        , GL_UNSIGNED_INT, 0, m_ScreenQuad->MaterialGroups()[0].material->StartIndex);
+    //Iterate some times to make it more gaussian.
+    for (int i = 1; i < m_Iterations; i++) {
+        //Vertical pass
+        m_GaussianFrameBuffer_vert.Bind();
+        m_GaussianProgram_vert->Bind();
+
+		glActiveTexture(GL_TEXTURE0);
+        glBindTexture(GL_TEXTURE_2D, m_GaussianTexture_horiz);
+
+        glBindVertexArray(m_ScreenQuad->VAO);
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ScreenQuad->ElementBuffer);
+        glDrawElementsBaseVertex(GL_TRIANGLES, m_ScreenQuad->MaterialGroups()[0].material->EndIndex - m_ScreenQuad->MaterialGroups()[0].material->StartIndex +1
+            , GL_UNSIGNED_INT, 0, m_ScreenQuad->MaterialGroups()[0].material->StartIndex);
+        //horizontal pass
+		m_GaussianFrameBuffer_vert.Unbind();
+        m_GaussianFrameBuffer_horiz.Bind();
+        m_GaussianProgram_horiz->Bind();
+
+		glActiveTexture(GL_TEXTURE0);
+        glBindTexture(GL_TEXTURE_2D, m_GaussianTexture_vert);
+
+        glBindVertexArray(m_ScreenQuad->VAO);
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ScreenQuad->ElementBuffer);
+        glDrawElementsBaseVertex(GL_TRIANGLES, m_ScreenQuad->MaterialGroups()[0].material->EndIndex - m_ScreenQuad->MaterialGroups()[0].material->StartIndex +1
+            , GL_UNSIGNED_INT, 0, m_ScreenQuad->MaterialGroups()[0].material->StartIndex);
+		m_GaussianFrameBuffer_horiz.Unbind();
+    }
+
+    //final vertical gaussian after the iterations are done
+
+    m_GaussianFrameBuffer_vert.Bind();
+    m_GaussianProgram_vert->Bind();
+
+	glActiveTexture(GL_TEXTURE0);
+    glBindTexture(GL_TEXTURE_2D, m_GaussianTexture_horiz);
+    glBindVertexArray(m_ScreenQuad->VAO);
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ScreenQuad->ElementBuffer);
+    glDrawElementsBaseVertex(GL_TRIANGLES, m_ScreenQuad->MaterialGroups()[0].material->EndIndex - m_ScreenQuad->MaterialGroups()[0].material->StartIndex +1
+        , GL_UNSIGNED_INT, 0, m_ScreenQuad->MaterialGroups()[0].material->StartIndex);
+
+    GLERROR("DrawBloomPass::Draw: END");
+    glViewport(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+    glScissor(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+
+
+    return m_GaussianTexture_vert;
+}
+
+
+void BlurHUD::OnWindowResize()
+{
+    CommonFunctions::GenerateTexture(&m_GaussianTexture_vert, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width/m_BlurQuality, m_Renderer->GetViewportSize().Height/m_BlurQuality), GL_RGB16F, GL_RGB, GL_FLOAT);
+    m_GaussianFrameBuffer_vert.Generate();
+    CommonFunctions::GenerateTexture(&m_GaussianTexture_horiz, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width/m_BlurQuality, m_Renderer->GetViewportSize().Height/m_BlurQuality), GL_RGB16F, GL_RGB, GL_FLOAT);
+    m_GaussianFrameBuffer_horiz.Generate();
+}
+
+void BlurHUD::FillStencil(RenderScene& scene)
+{
+    RenderState state;
+
+    state.BindFramebuffer(m_GaussianFrameBuffer_horiz.GetHandle());
+    state.Disable(GL_DEPTH_TEST);
+    state.Enable(GL_CULL_FACE);
+    state.Enable(GL_STENCIL_TEST);
+    state.StencilFunc(GL_ALWAYS, 1, 0xFF);
+    state.StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
+    state.StencilMask(0xFF);
+    glViewport(0, 0, m_Renderer->GetViewportSize().Width/m_BlurQuality, m_Renderer->GetViewportSize().Height/m_BlurQuality);
+
+    m_FillDepthStencilProgram->Bind();
+
+    GLuint shaderHandle = m_FillDepthStencilProgram->GetHandle();
+
+    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+
+    for (auto& job : scene.Jobs.SpriteJob) {
+        auto spriteJob = std::dynamic_pointer_cast<SpriteJob>(job);
+        if (!spriteJob) {
+            continue;
+        }
+        if (!spriteJob->BlurBackground) {
+            continue;
+        }
+        glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(spriteJob->Matrix));
+
+        glBindVertexArray(spriteJob->Model->VAO);
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, spriteJob->Model->ElementBuffer);
+        glDrawElements(GL_TRIANGLES, spriteJob->EndIndex - spriteJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(spriteJob->StartIndex*sizeof(unsigned int)));
+    }
+
+    state.BindFramebuffer(m_GaussianFrameBuffer_vert.GetHandle());
+    for (auto& job : scene.Jobs.SpriteJob) {
+        auto spriteJob = std::dynamic_pointer_cast<SpriteJob>(job);
+        if (!spriteJob) {
+            continue;
+        }
+        if(!spriteJob->BlurBackground) {
+            continue;
+        }
+        glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(spriteJob->Matrix));
+
+        glBindVertexArray(spriteJob->Model->VAO);
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, spriteJob->Model->ElementBuffer);
+        glDrawElements(GL_TRIANGLES, spriteJob->EndIndex - spriteJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(spriteJob->StartIndex*sizeof(unsigned int)));
+    }
+    glViewport(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+}
+
+//Texture 1 will be used if texture 2 is black at that texel, else texture 2 is used.
+GLuint BlurHUD::CombineTextures(GLuint texture1, GLuint texture2)
+{
+    //RenderState state;
+    //state.BindFramebuffer(m_CombinedTextureBuffer.GetHandle());
+    //state.Disable(GL_DEPTH_TEST);
+    //state.Disable(GL_STENCIL_TEST);
+
+    m_CombineTexturesProgram->Bind();
+
+    glActiveTexture(GL_TEXTURE0);
+    glActiveTexture(GL_TEXTURE1);
+    glBindTexture(GL_TEXTURE_2D, texture1);
+    glBindTexture(GL_TEXTURE_2D, texture2);
+    glBindVertexArray(m_ScreenQuad->VAO);
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ScreenQuad->ElementBuffer);
+    glDrawElementsBaseVertex(GL_TRIANGLES, m_ScreenQuad->MaterialGroups()[0].material->EndIndex - m_ScreenQuad->MaterialGroups()[0].material->StartIndex +1
+        , GL_UNSIGNED_INT, 0, m_ScreenQuad->MaterialGroups()[0].material->StartIndex);
+
+    return m_CombinedTexture;
+}

src/Engine/Rendering/BoneAttachmentSystem.cpp

@@ -8,10 +8,13 @@ void BoneAttachmentSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapp
         return;
     }
 
-    auto parent = entity.FirstParentWithComponent("Animation");
-    if (!parent.HasComponent("Model")) {
+    auto parent = entity.FirstParentWithComponent("Model");
+
+    if(!parent.Valid()) {
         return;
     }
+
+
     Model* model;
     try {
         model = ResourceManager::Load<::Model, true>(parent["Model"]["Resource"]);
@@ -35,66 +38,31 @@ void BoneAttachmentSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapp
         return;
     }
 
-    std::vector<::Skeleton::AnimationData> Animations;
-    ::Skeleton::AnimationOffset AnimationOffset;
-    glm::mat4 boneTransform;
+    if (skeleton->BlendTrees.find(parent) != skeleton->BlendTrees.end()) {
 
-    if (parent.HasComponent("Animation")) {
-        for (int i = 1; i <= 3; i++) {
-            ::Skeleton::AnimationData animationData;
-            animationData.animation = model->m_RawModel->m_Skeleton->GetAnimation(parent["Animation"]["AnimationName" + std::to_string(i)]);
-            if (animationData.animation == nullptr) {
-                continue;
-            }
-            animationData.time = (double)parent["Animation"]["Time" + std::to_string(i)];
-            animationData.weight = (double)parent["Animation"]["Weight" + std::to_string(i)];
 
-            Animations.push_back(animationData);
-        }
-    }
+        glm::mat4 boneTransform = skeleton->BlendTrees.at(parent)->GetBoneTransform(id);
 
-    if (parent.HasComponent("AnimationOffset")) {
-        AnimationOffset.animation = model->m_RawModel->m_Skeleton->GetAnimation(parent["AnimationOffset"]["AnimationName"]);
-        AnimationOffset.time = (double)parent["AnimationOffset"]["Time"];
+        glm::vec3 scale;
+        glm::quat rotation;
+        glm::vec3 translation;
+        glm::vec3 skew;
+        glm::vec4 perspective;
+        glm::decompose(boneTransform, scale, rotation, translation, skew, perspective);
 
-        if(AnimationOffset.animation != nullptr) {
-            boneTransform = skeleton->GetBoneTransform(false, skeleton->Bones.at(id), Animations, AnimationOffset, glm::mat4(1));
-        } else {
-            boneTransform = skeleton->GetBoneTransform(false, skeleton->Bones.at(id), Animations, glm::mat4(1));
-        }
+        rotation = glm::quat((glm::vec3)entity["BoneAttachment"]["OrientationOffset"]) * rotation;
+        rotation = glm::inverse(rotation);
+        glm::vec3 angles = glm::eulerAngles(rotation);
         
-    } else {
-        boneTransform = skeleton->GetBoneTransform(false, skeleton->Bones.at(id), Animations, glm::mat4(1));
+        if ((bool)entity["BoneAttachment"]["InheritPosition"]) {
+            (glm::vec3&)entity["Transform"]["Position"] = translation + (glm::vec3)entity["BoneAttachment"]["PositionOffset"];
+        }
+        if ((bool)entity["BoneAttachment"]["InheritOrientation"]) {
+            (glm::vec3&)entity["Transform"]["Orientation"] = angles;
+        }
+        if ((bool)entity["BoneAttachment"]["InheritScale"]) {
+            (glm::vec3&)entity["Transform"]["Scale"] = scale  * (glm::vec3)entity["BoneAttachment"]["ScaleOffset"];
+        }
     }
-    
-    
 
-    glm::vec3 scale;
-    glm::quat rotation;
-    glm::vec3 translation;
-    glm::vec3 skew;
-    glm::vec4 perspective;
-    glm::decompose(boneTransform, scale, rotation, translation, skew, perspective);
-
-    glm::vec3 angles = glm::vec3(-glm::pitch(rotation), -glm::yaw(rotation), -glm::roll(rotation));
-/*
-
-    angles.y = asin(-boneTransform[0][2]);
-    if (cos(angles.y) != 0) {
-        angles.x = atan2(boneTransform[1][2], boneTransform[2][2]);
-        angles.z = atan2(boneTransform[0][1], boneTransform[0][0]);
-    } else {
-        angles.x = atan2(-boneTransform[2][0], boneTransform[1][1]);
-        angles.z = 0;
-    }*/
-
-    if ((bool)entity["BoneAttachment"]["InheritPosition"]) {
-        (glm::vec3&)entity["Transform"]["Position"] = translation + (glm::vec3)entity["BoneAttachment"]["PositionOffset"];
-    }
-    if ((bool)entity["BoneAttachment"]["InheritOrientation"]) {
-        (glm::vec3&)entity["Transform"]["Orientation"] = angles  + (glm::vec3)entity["BoneAttachment"]["OrientationOffset"];
-    }
-    if ((bool)entity["BoneAttachment"]["InheritScale"]) {
-        (glm::vec3&)entity["Transform"]["Scale"] = scale  * (glm::vec3)entity["BoneAttachment"]["ScaleOffset"];
-    }
 }

src/Engine/Rendering/DrawBloomPass.cpp

@@ -9,9 +9,14 @@ DrawBloomPass::DrawBloomPass(IRenderer* renderer, ConfigFile* config)
 	ChangeQuality(m_Config->Get<int>("GLOW.Quality", 2));
 }
 
+DrawBloomPass::~DrawBloomPass() {
+	CommonFunctions::DeleteTexture(&m_GaussianTexture_horiz);
+	CommonFunctions::DeleteTexture(&m_GaussianTexture_vert);
+}
+
 void DrawBloomPass::InitializeTextures()
 {
-    m_BlackTexture = CommonFunctions::LoadTexture("Textures/Core/Black.png", false);
+    m_BlackTexture = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/Black.png");
 }
 
 void DrawBloomPass::ChangeQuality(int quality)
@@ -45,6 +50,7 @@ void DrawBloomPass::InitializeShaderPrograms()
 		m_GaussianProgram_horiz->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Gaussian_horiz.vert.glsl")));
 		m_GaussianProgram_horiz->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Gaussian_horiz.frag.glsl")));
 		m_GaussianProgram_horiz->Compile();
+        m_GaussianProgram_horiz->BindFragDataLocation(0, "fragmentColor");
 		m_GaussianProgram_horiz->Link();
 	}
 
@@ -53,6 +59,7 @@ void DrawBloomPass::InitializeShaderPrograms()
 		m_GaussianProgram_vert->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Gaussian_vert.vert.glsl")));
 		m_GaussianProgram_vert->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Gaussian_vert.frag.glsl")));
 		m_GaussianProgram_vert->Compile();
+        m_GaussianProgram_vert->BindFragDataLocation(0, "fragmentColor");
 		m_GaussianProgram_vert->Link();
 	}
 }

src/Engine/Rendering/DrawColorCorrectionPass.cpp

@@ -18,7 +18,7 @@ void DrawColorCorrectionPass::InitializeShaderPrograms()
     m_ColorCorrectionProgram->Link();
 }
 
-void DrawColorCorrectionPass::Draw(GLuint sceneTexture, GLuint bloomTexture, GLuint sceneTextureLowRes, GLuint bloomTextureLowRes, GLfloat gamma, GLfloat exposure)
+void DrawColorCorrectionPass::Draw(GLuint sceneTexture, GLuint bloomTexture, GLfloat gamma, GLfloat exposure)
 {
     //glBindFramebuffer(GL_FRAMEBUFFER, 0);
     GLERROR("DrawScreenQuadPass::Draw: Pre");
@@ -33,10 +33,6 @@ void DrawColorCorrectionPass::Draw(GLuint sceneTexture, GLuint bloomTexture, GLu
     glBindTexture(GL_TEXTURE_2D, sceneTexture);
     glActiveTexture(GL_TEXTURE1);
     glBindTexture(GL_TEXTURE_2D, bloomTexture);
-    glActiveTexture(GL_TEXTURE2);
-    glBindTexture(GL_TEXTURE_2D, sceneTextureLowRes);
-    glActiveTexture(GL_TEXTURE3);
-    glBindTexture(GL_TEXTURE_2D, bloomTextureLowRes);
 
     glBindVertexArray(m_ScreenQuad->VAO);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ScreenQuad->ElementBuffer);

src/Engine/Rendering/DrawFinalPassState.cpp

@@ -8,13 +8,12 @@ DrawFinalPassState::DrawFinalPassState(GLuint frameBuffer)
     Enable(GL_BLEND);
     BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     Enable(GL_DEPTH_TEST);
-	DepthMask(GL_FALSE);
-	DepthFunc(GL_LEQUAL);
+	DepthMask(GL_TRUE);
     Enable(GL_CULL_FACE);
-    Enable(GL_STENCIL_TEST);
-    StencilFunc(GL_NOTEQUAL, 1, 0xFF);
-    StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
-    StencilMask(0xFF);
+   // Enable(GL_STENCIL_TEST);
+   // StencilFunc(GL_NOTEQUAL, 1, 0xFF);
+   // StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
+   // StencilMask(0xFF);
     ClearColor(glm::vec4(0.f, 0.f, 0.f, 0.f));
 }
 
@@ -26,11 +25,9 @@ DrawFinalPassState::~DrawFinalPassState()
 DrawStencilState::DrawStencilState(GLuint frameBuffer)
 {
     BindFramebuffer(frameBuffer);
-    Enable(GL_STENCIL_TEST);
-    StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
-    StencilFunc(GL_ALWAYS, 1, 0xFF);
-    StencilMask(0xFF);
     Enable(GL_DEPTH_TEST);
+	DepthMask(GL_TRUE);
+	Enable(GL_CULL_FACE);
     ClearColor(glm::vec4(0.f));
 }
 

src/Engine/Rendering/FrameBuffer.cpp

@@ -24,6 +24,13 @@ RenderBuffer::~RenderBuffer()
     }
 }
 
+Texture2DArray::~Texture2DArray()
+{
+	if (m_ResourceHandle != 0) {
+		glDeleteTextures(1, m_ResourceHandle);
+	}
+}
+
 
 FrameBuffer::~FrameBuffer()
 {
@@ -53,12 +60,15 @@ void FrameBuffer::Generate()
 		case GL_TEXTURE_2D:
 			glFramebufferTexture2D(GL_FRAMEBUFFER, (*it)->m_Attachment, (*it)->m_ResourceType, *(*it)->m_ResourceHandle, 0);
 			GLERROR("FrameBuffer generate: glFramebufferTexture2D");
-
 			break;
 		case GL_RENDERBUFFER:
 			glFramebufferRenderbuffer(GL_FRAMEBUFFER, (*it)->m_Attachment, (*it)->m_ResourceType, *(*it)->m_ResourceHandle);
 			GLERROR("FrameBuffer generate: glFramebufferRenderbuffer");
 			break;
+		case GL_TEXTURE_2D_ARRAY:
+			glFramebufferTexture(GL_FRAMEBUFFER, (*it)->m_Attachment, *(*it)->m_ResourceHandle, 0);
+			GLERROR("FrameBuffer generate: glFramebufferTexture2DArray");
+			break;
 		}
 		GLERROR("2");
 
@@ -70,7 +80,7 @@ void FrameBuffer::Generate()
 	}
 	GLERROR("3");
 
-    GLenum* bufferTextures = &attachments[0];
+    GLenum* bufferTextures = attachments.data();
     glDrawBuffers(attachments.size(), bufferTextures);
     if (GLERROR("GLBufferAttachement error")) {
         printf(": AttachmentSize %i", attachments.size());

src/Engine/Rendering/Model.cpp

@@ -10,31 +10,31 @@ Model::Model(std::string fileName)
 		case RawModel::MaterialType::SingleTextures:
 		{
 			RawModel::MaterialSingleTextures* materialSingleTexture = static_cast<RawModel::MaterialSingleTextures*>(materialProperty.material);
-            materialSingleTexture->ColorMap.Texture = CommonFunctions::LoadTexture(materialSingleTexture->ColorMap.TexturePath, false);
-            materialSingleTexture->NormalMap.Texture = CommonFunctions::LoadTexture(materialSingleTexture->NormalMap.TexturePath, false);
-            materialSingleTexture->SpecularMap.Texture = CommonFunctions::LoadTexture(materialSingleTexture->SpecularMap.TexturePath, false);
-            materialSingleTexture->IncandescenceMap.Texture = CommonFunctions::LoadTexture(materialSingleTexture->IncandescenceMap.TexturePath, false);
+            materialSingleTexture->ColorMap.Texture = CommonFunctions::TryLoadResource<Texture, false>(materialSingleTexture->ColorMap.TexturePath);
+            materialSingleTexture->NormalMap.Texture = CommonFunctions::TryLoadResource<Texture, false>(materialSingleTexture->NormalMap.TexturePath);
+            materialSingleTexture->SpecularMap.Texture = CommonFunctions::TryLoadResource<Texture, false>(materialSingleTexture->SpecularMap.TexturePath);
+            materialSingleTexture->IncandescenceMap.Texture = CommonFunctions::TryLoadResource<Texture, false>(materialSingleTexture->IncandescenceMap.TexturePath);
 		}
 			break;
 		case RawModel::MaterialType::SplatMapping:
 		{
 			RawModel::MaterialSplatMapping* materialSplatMapping = static_cast<RawModel::MaterialSplatMapping*>(materialProperty.material);
-			materialSplatMapping->SplatMap.Texture = CommonFunctions::LoadTexture(materialSplatMapping->SplatMap.TexturePath, false);
+			materialSplatMapping->SplatMap.Texture = CommonFunctions::TryLoadResource<Texture, false>(materialSplatMapping->SplatMap.TexturePath);
 			for (auto& texture : materialSplatMapping->ColorMaps)
 			{
-				texture.Texture = CommonFunctions::LoadTexture(texture.TexturePath, false);
+				texture.Texture = CommonFunctions::TryLoadResource<Texture, false>(texture.TexturePath);
 			}
 			for (auto& texture : materialSplatMapping->NormalMaps)
 			{
-				texture.Texture = CommonFunctions::LoadTexture(texture.TexturePath, false);
+				texture.Texture = CommonFunctions::TryLoadResource<Texture, false>(texture.TexturePath);
 			}
 			for (auto& texture : materialSplatMapping->SpecularMaps)
 			{
-				texture.Texture = CommonFunctions::LoadTexture(texture.TexturePath, false);
+				texture.Texture = CommonFunctions::TryLoadResource<Texture, false>(texture.TexturePath);
 			}
 			for (auto& texture : materialSplatMapping->IncandescenceMaps)
 			{
-				texture.Texture = CommonFunctions::LoadTexture(texture.TexturePath, false);
+				texture.Texture = CommonFunctions::TryLoadResource<Texture, false>(texture.TexturePath);
 			}
 		}
 			break;

src/Engine/Rendering/PickingPass.cpp

@@ -12,7 +12,8 @@ PickingPass::PickingPass(IRenderer* renderer, EventBroker* eb)
 
 PickingPass::~PickingPass()
 {
-
+	CommonFunctions::DeleteTexture(&m_PickingTexture);
+	CommonFunctions::DeleteTexture(&m_DepthBuffer);
 }
 
 
@@ -23,11 +24,12 @@ void PickingPass::InitializeTextures()
         glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RG8, GL_RG, GL_UNSIGNED_BYTE);
 
 	CommonFunctions::GenerateTexture(&m_DepthBuffer, GL_CLAMP_TO_BORDER, GL_NEAREST,
-		glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8);
+		glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_DEPTH_COMPONENT32, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT);
 }
 
 void PickingPass::InitializeFrameBuffers()
 {
+
     m_PickingBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_DepthBuffer, GL_DEPTH_ATTACHMENT)));
     m_PickingBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_PickingTexture, GL_COLOR_ATTACHMENT0)));
     m_PickingBuffer.Generate();
@@ -60,8 +62,9 @@ void PickingPass::Draw(RenderScene& scene)
     //TODO: Render: Add code for more jobs than modeljobs.
     GLuint shaderHandle = m_PickingProgram->GetHandle();
     GLuint shaderSkinnedHandle = m_PickingSkinnedProgram->GetHandle();
+	GLuint lastShader = 0;
+	unsigned int lastModel = 0;
     m_PickingProgram->Bind();
-
     if (scene.ClearDepth) {
         //glClear(GL_DEPTH_BUFFER_BIT);
 		state->Disable(GL_DEPTH_TEST);
@@ -97,32 +100,36 @@ void PickingPass::Draw(RenderScene& scene)
             m_PickingColorsToEntity[glm::ivec2(pickColor[0], pickColor[1])] = pickInfo;
 
             if (modelJob->Model->IsSkinned()) {
-                m_PickingSkinnedProgram->Bind();
-                glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
-                glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
-                glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+				if (lastShader != m_PickingSkinnedProgram->GetHandle()) {
+					m_PickingSkinnedProgram->Bind();
+					lastShader = m_PickingSkinnedProgram->GetHandle();
+				}
+                glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
-                if (modelJob->Model->m_RawModel->m_Skeleton != nullptr) {
-
-                    std::vector<glm::mat4> frameBones;
-                    if (modelJob->AnimationOffset.animation != nullptr) {
-                        frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
-                    } else {
-                        frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
-                    }
-                    glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                std::vector<glm::mat4> frameBones;
+				if (modelJob->BlendTree != nullptr) {
+                    frameBones = modelJob->BlendTree->GetFinalPose();
+                } else {
+                    frameBones = modelJob->Skeleton->GetTPose();
                 }
+                glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
+
             } else {
-                m_PickingProgram->Bind();
-                glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
-                glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
-                glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+				if (lastShader != m_PickingProgram->GetHandle()) {
+					m_PickingProgram->Bind();
+					lastShader = m_PickingProgram->GetHandle();
+				}
+				glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
                 glUniform2fv(glGetUniformLocation(shaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
             }
 
-            glBindVertexArray(modelJob->Model->VAO);
-            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+			if (lastModel != modelJob->ModelID) {
+				glBindVertexArray(modelJob->Model->VAO);
+				glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+				lastModel = modelJob->ModelID;
+			}
             glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
         }
     }
@@ -161,13 +168,11 @@ void PickingPass::Draw(RenderScene& scene)
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
-                std::vector<glm::mat4> frameBones;
-                if (modelJob->AnimationOffset.animation != nullptr) {
-                    frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
-                } else {
-                    frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
+                if (modelJob->BlendTree != nullptr) {
+                    std::vector<glm::mat4> frameBones;
+                    frameBones = modelJob->BlendTree->GetFinalPose();
+                    glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
                 }
-                glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
             } else {
                 m_PickingProgram->Bind();
                 glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
@@ -210,34 +215,41 @@ void PickingPass::Draw(RenderScene& scene)
             m_PickingColorsToEntity[glm::ivec2(pickColor[0], pickColor[1])] = pickInfo;
 
             if (modelJob->Model->IsSkinned()) {
-                m_PickingSkinnedProgram->Bind();
-                glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
-                glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
-                glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+				if (lastShader != m_PickingSkinnedProgram->GetHandle()) {
+					m_PickingSkinnedProgram->Bind();
+					lastShader = m_PickingSkinnedProgram->GetHandle();
+				}
+				glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
                 std::vector<glm::mat4> frameBones;
-                if (modelJob->AnimationOffset.animation != nullptr) {
-                    frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
+                if (modelJob->BlendTree != nullptr) {
+                    frameBones = modelJob->BlendTree->GetFinalPose();
                 } else {
-                    frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
+                    frameBones = modelJob->Skeleton->GetTPose();
                 }
+
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
             } else {
-                m_PickingProgram->Bind();
-                glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
-                glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
-                glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+				if (lastShader != m_PickingProgram->GetHandle()) {
+					m_PickingProgram->Bind();
+					lastShader = m_PickingProgram->GetHandle();
+				}
+				glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
                 glUniform2fv(glGetUniformLocation(shaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
             }
 
-            glBindVertexArray(modelJob->Model->VAO);
-            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+			if (lastModel != modelJob->ModelID) {
+				glBindVertexArray(modelJob->Model->VAO);
+				glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+				lastModel = modelJob->ModelID;
+			}
             glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
         }
     }
 
+	m_PickingProgram->Bind();
     for (auto& job : scene.Jobs.SpriteJob) {
         auto spriteJob = std::dynamic_pointer_cast<SpriteJob>(job);
         if (!spriteJob->Pickable) {
@@ -272,14 +284,11 @@ void PickingPass::Draw(RenderScene& scene)
 
             m_PickingColorsToEntity[glm::ivec2(pickColor[0], pickColor[1])] = pickInfo;
 
-            m_PickingProgram->Bind();
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(spriteJob->Matrix));
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+			glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * spriteJob->Matrix));
             glUniform2fv(glGetUniformLocation(shaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
-            glBindVertexArray(spriteJob->Model->VAO);
-            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, spriteJob->Model->ElementBuffer);
+			glBindVertexArray(spriteJob->Model->VAO);
+			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, spriteJob->Model->ElementBuffer);
             glDrawElements(GL_TRIANGLES, spriteJob->EndIndex - spriteJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(spriteJob->StartIndex * sizeof(unsigned int)));
         }
     }
@@ -321,16 +330,10 @@ void PickingPass::Draw(RenderScene& scene)
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
-                if (modelJob->Model->m_RawModel->m_Skeleton != nullptr) {
-
+                if (modelJob->BlendTree != nullptr) {
                     std::vector<glm::mat4> frameBones;
-                    if (modelJob->AnimationOffset.animation != nullptr) {
-                        frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
-                    } else {
-                        frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
-                    }
+                    frameBones = modelJob->BlendTree->GetFinalPose();
                     glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
-
                 }
             } else {
                 m_PickingProgram->Bind();

src/Engine/Rendering/RenderSystem.cpp

@@ -240,6 +240,8 @@ void RenderSystem::fillModels(RenderScene::Queues &Jobs)
             fillColor = (glm::vec4)fillComponent["Color"];
         }
 
+		bool isShielded = m_World->HasComponent(cModel.EntityID, "Shielded") || m_World->HasComponent(cModel.EntityID, "Player");
+
         glm::mat4 modelMatrix = Transform::ModelMatrix(cModel.EntityID, m_World);
         //Loop through all materialgroups of a model
         for (auto matGroup : model->MaterialGroups()) {
@@ -255,20 +257,20 @@ void RenderSystem::fillModels(RenderScene::Queues &Jobs)
                     cModel, 
                     m_World, 
                     fillColor, 
-                    fillPercentage
+                    fillPercentage,
+					isShielded,
+					false
                 ));
                 if (m_World->HasComponent(cModel.EntityID, "Shield")){
                     explosionEffectJob->CalculateHash();
                     Jobs.ShieldObjects.push_back(explosionEffectJob);
-                } else if (m_World->HasComponent(cModel.EntityID, "Shielded")
-                    || m_World->HasComponent(cModel.EntityID, "Player")) {
-
+                } else if (isShielded) {
                     if (explosionEffectJob->Color.a != 1.f || explosionEffectJob->EndColor.a != 1.f || explosionEffectJob->DiffuseColor.a != 1.f) {
                         cModel["Transparent"] = true;
                     }
 
                     if (cModel["Transparent"]) {
-                        Jobs.TransparentShieldedObjects.push_back(explosionEffectJob);
+                        Jobs.TransparentObjects.push_back(explosionEffectJob);
                     } else {
 					    explosionEffectJob->CalculateHash();
                         Jobs.OpaqueShieldedObjects.push_back(explosionEffectJob);
@@ -294,20 +296,21 @@ void RenderSystem::fillModels(RenderScene::Queues &Jobs)
                     cModel, 
                     m_World, 
                     fillColor, 
-                    fillPercentage
+                    fillPercentage,
+					isShielded,
+					(bool)cModel["Shadow"]
                 ));
                 if (m_World->HasComponent(cModel.EntityID, "Shield")) {
                     modelJob->CalculateHash();
                     Jobs.ShieldObjects.push_back(modelJob);
-                } else if (m_World->HasComponent(cModel.EntityID, "Shielded")
-                    || m_World->HasComponent(cModel.EntityID, "Player")) {
+                } else if (isShielded) {
 
                     if (modelJob->Color.a != 1.f || modelJob->DiffuseColor.a != 1.f) {
                         cModel["Transparent"] = true;
                     }
 
                     if (cModel["Transparent"]) {
-                        Jobs.TransparentShieldedObjects.push_back(modelJob);
+                        Jobs.TransparentObjects.push_back(modelJob);
                     } else {
 					    modelJob->CalculateHash();
                         Jobs.OpaqueShieldedObjects.push_back(modelJob);
@@ -434,6 +437,7 @@ void RenderSystem::Update(double dt)
     }
 
     RenderScene scene;
+    scene.ShouldBlur = true;
     scene.Camera = m_Camera;
     scene.Viewport = Rectangle(1280, 720);
 
@@ -447,7 +451,7 @@ void RenderSystem::Update(double dt)
     fillModels(scene.Jobs);
     fillPointLights(scene.Jobs.PointLight, m_World);
     //TODO: Make sure all objects needed are also sorted.
-	scene.Jobs.OpaqueObjects.sort();
+	scene.Jobs.OpaqueObjects.sort([](auto& a, auto& b) {return *a < *b; });
     fillSprites(scene.Jobs.SpriteJob, m_World);
     fillDirectionalLights(scene.Jobs.DirectionalLight, m_World);
     fillText(scene.Jobs.Text, m_World);

src/Engine/Rendering/Renderer.cpp

@@ -2,6 +2,19 @@
 
 std::unordered_map<GLFWwindow*, Renderer*> Renderer::m_WindowToRenderer;
 
+Renderer::~Renderer() {
+	delete m_PickingPass;
+	delete m_LightCullingPass;
+	delete m_ImGuiRenderPass;
+	delete m_DrawFinalPass;
+	delete m_DrawScreenQuadPass;
+	delete m_DrawBloomPass;
+	delete m_DrawColorCorrectionPass;
+	delete m_SSAOPass;
+	delete m_CubeMapPass;
+	delete m_TextPass;
+}
+
 void Renderer::Initialize()
 {
 	m_SSAO_Quality = m_Config->Get<int>("SSAO.Quality", 0);
@@ -17,7 +30,7 @@ void Renderer::Initialize()
     m_TextPass->Initialize();
 
    /* m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.obj");
-    m_UnitQuad = ResourceManager::Load<Model>("Models/Core/UnitQuad.obj");
+    m_UnitQuad = ResourceManager::Load<Model>(sModels/Core/UnitQuad.obj");
     m_UnitSphere = ResourceManager::Load<Model>("Models/Core/UnitSphere.obj");*/
 
     m_ImGuiRenderPass = new ImGuiRenderPass(this, m_EventBroker);
@@ -110,7 +123,7 @@ void Renderer::Draw(RenderFrame& frame)
 {
     GLERROR("PRE");
 	glBindFramebuffer(GL_FRAMEBUFFER, 0);
-    ImGui::Combo("Draw textures", &m_DebugTextureToDraw, "Final\0Scene\0Bloom\0SceneLowRes\0BloomLowRes\0Gaussian\0Picking\0Ambient Occlusion");
+    ImGui::Combo("Draw textures", &m_DebugTextureToDraw, "Final\0Scene\0Bloom\0Gaussian\0Picking\0Ambient Occlusion\0Combined Scene Texture\0Full Blurred Texture");
     ImGui::Combo("CubeMap", &m_CubeMapTexture, "Nevada(512)\0Sky(1024)");
     if(m_CubeMapTexture == 0) {
         m_CubeMapPass->LoadTextures("Nevada");
@@ -133,6 +146,9 @@ void Renderer::Draw(RenderFrame& frame)
     m_DrawFinalPass->ClearBuffer();
     m_DrawBloomPass->ClearBuffer();
 	m_SSAOPass->ClearBuffer();
+	m_ShadowPass->ClearBuffer();
+    m_BlurHUDPass->ClearBuffer();
+	m_ShadowPass->DebugGUI();
     PerformanceTimer::StopTimer("Renderer-ClearBuffers");
     GLERROR("ClearBuffers");
 	for (auto scene : frame.RenderScenes) {
@@ -148,6 +164,9 @@ void Renderer::Draw(RenderFrame& frame)
         PerformanceTimer::StartTimer("Renderer-Depth");
         SortRenderJobsByDepth(*scene);
         GLERROR("SortByDepth");
+		PerformanceTimer::StartTimerAndStopPrevious("Draw shadow maps");
+		m_ShadowPass->Draw(*scene);
+		GLERROR("Draw shadow maps");
         PerformanceTimer::StartTimerAndStopPrevious("Renderer-Generate Frustrums");
         m_LightCullingPass->GenerateNewFrustum(*scene);
         GLERROR("Generate frustums");
@@ -158,7 +177,7 @@ void Renderer::Draw(RenderFrame& frame)
         m_LightCullingPass->CullLights(*scene);
         GLERROR("LightCulling");
 		PerformanceTimer::StartTimerAndStopPrevious("Renderer-Draw Geometry+Light");
-		m_DrawFinalPass->Draw(*scene);
+		m_DrawFinalPass->Draw(*scene, m_BlurHUDPass);
         GLERROR("Draw Geometry+Light");
         //m_DrawScenePass->Draw(*scene);
 
@@ -174,7 +193,7 @@ void Renderer::Draw(RenderFrame& frame)
 
     if (m_DebugTextureToDraw == 0) {
         PerformanceTimer::StartTimer("Renderer-Color Correction Pass");
-        m_DrawColorCorrectionPass->Draw(m_DrawFinalPass->SceneTexture(), m_DrawBloomPass->GaussianTexture(), m_DrawFinalPass->SceneTextureLowRes(), m_DrawFinalPass->BloomTextureLowRes(), frame.Gamma, frame.Exposure);
+        m_DrawColorCorrectionPass->Draw(m_DrawFinalPass->SceneTexture(), m_DrawBloomPass->GaussianTexture(), frame.Gamma, frame.Exposure);
         PerformanceTimer::StopTimer("Renderer-Color Correction Pass");
     }
 
@@ -186,20 +205,20 @@ void Renderer::Draw(RenderFrame& frame)
         m_DrawScreenQuadPass->Draw(m_DrawFinalPass->BloomTexture());
     }
     if (m_DebugTextureToDraw == 3) {
-        m_DrawScreenQuadPass->Draw(m_DrawFinalPass->SceneTextureLowRes());
-    }
-    if (m_DebugTextureToDraw == 4) {
-        m_DrawScreenQuadPass->Draw(m_DrawFinalPass->BloomTextureLowRes());
-    }
-    if (m_DebugTextureToDraw == 5) {
         m_DrawScreenQuadPass->Draw(m_DrawBloomPass->GaussianTexture());
     }
-    if (m_DebugTextureToDraw == 6) {
+    if (m_DebugTextureToDraw == 4) {
         m_DrawScreenQuadPass->Draw(m_PickingPass->PickingTexture());
     }
-	if (m_DebugTextureToDraw == 7) {
+	if (m_DebugTextureToDraw == 5) {
 		m_DrawScreenQuadPass->Draw(m_SSAOPass->SSAOTexture());
 	}
+    if (m_DebugTextureToDraw == 6) {
+        m_DrawScreenQuadPass->Draw(m_DrawFinalPass->CombinedSceneTexture());
+    }
+    if (m_DebugTextureToDraw == 7) {
+        m_DrawScreenQuadPass->Draw(m_DrawFinalPass->FullBlurredTexture());
+    }
 	PerformanceTimer::StopTimer("Renderer-Misc Debug Draws");
 
     PerformanceTimer::StartTimer("Renderer-ImGuiRenderPass");
@@ -219,8 +238,8 @@ PickData Renderer::Pick(glm::vec2 screenCoord)
 
 void Renderer::InitializeTextures()
 {
-    m_ErrorTexture = CommonFunctions::LoadTexture("Textures/Core/ErrorTexture.png", false);
-    m_WhiteTexture = CommonFunctions::LoadTexture("Textures/Core/White.png", false);
+    m_ErrorTexture = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/ErrorTexture.png");
+    m_WhiteTexture = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/White.png");
 }
 
 
@@ -250,9 +269,11 @@ void Renderer::InitializeRenderPasses()
     m_LightCullingPass = new LightCullingPass(this);
     m_CubeMapPass = new CubeMapPass(this);
 	m_SSAOPass = new SSAOPass(this, m_Config);
-    m_DrawFinalPass = new DrawFinalPass(this, m_LightCullingPass, m_CubeMapPass, m_SSAOPass, m_PickingPass->DepthBuffer());
+	m_ShadowPass = new ShadowPass(this);
+    m_BlurHUDPass = new BlurHUD(this);
+    m_DrawFinalPass = new DrawFinalPass(this, m_LightCullingPass, m_CubeMapPass, m_SSAOPass, m_ShadowPass);
     m_DrawScreenQuadPass = new DrawScreenQuadPass(this);
     m_DrawBloomPass = new DrawBloomPass(this, m_Config);
     m_DrawColorCorrectionPass = new DrawColorCorrectionPass(this);
-  
+
 }

src/Engine/Rendering/SSAOPass.cpp

@@ -4,12 +4,19 @@ SSAOPass::SSAOPass(IRenderer* renderer, ConfigFile* config)
 	: m_Renderer(renderer)
 	, m_Config(config)
 {
-	m_WhiteTexture = CommonFunctions::LoadTexture("Textures/Core/White.png", false);
+	m_WhiteTexture = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/White.png");
 
 	ChangeQuality(m_Config->Get<int>("SSAO.Quality", 0));
 
 }
 
+SSAOPass::~SSAOPass() {
+	CommonFunctions::DeleteTexture(&m_SSAOTexture);
+	CommonFunctions::DeleteTexture(&m_SSAOViewSpaceZTexture);
+	CommonFunctions::DeleteTexture(&m_Gaussian_horiz);
+	CommonFunctions::DeleteTexture(&m_Gaussian_vert);
+}
+
 void SSAOPass::ChangeQuality(int quality)
 {
 	if (m_Quality == quality) {
@@ -56,6 +63,7 @@ void SSAOPass::InitializeShaderProgram()
 		m_SSAOProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/SSAO.vert.glsl")));
 		m_SSAOProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/SSAO.frag.glsl")));
 		m_SSAOProgram->Compile();
+        m_SSAOProgram->BindFragDataLocation(0, "AO");
 		m_SSAOProgram->Link();
 	}
 
@@ -64,6 +72,7 @@ void SSAOPass::InitializeShaderProgram()
 		m_SSAOViewSpaceZProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/SSAO.vert.glsl")));
 		m_SSAOViewSpaceZProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/SSAOViewSpaceZ.frag.glsl")));
 		m_SSAOViewSpaceZProgram->Compile();
+        m_SSAOViewSpaceZProgram->BindFragDataLocation(0, "depthLinear");
 		m_SSAOViewSpaceZProgram->Link();
 	}
 
@@ -72,6 +81,7 @@ void SSAOPass::InitializeShaderProgram()
 		m_GaussianProgram_horiz->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Gaussian_horiz.vert.glsl")));
 		m_GaussianProgram_horiz->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Gaussian_horiz.frag.glsl")));
 		m_GaussianProgram_horiz->Compile();
+        m_GaussianProgram_horiz->BindFragDataLocation(0, "fragmentColor");
 		m_GaussianProgram_horiz->Link();
 	}
 
@@ -80,6 +90,7 @@ void SSAOPass::InitializeShaderProgram()
 		m_GaussianProgram_vert->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Gaussian_vert.vert.glsl")));
 		m_GaussianProgram_vert->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Gaussian_vert.frag.glsl")));
 		m_GaussianProgram_vert->Compile();
+        m_GaussianProgram_vert->BindFragDataLocation(0, "fragmentColor");
 		m_GaussianProgram_vert->Link();
 	}
 }

src/Engine/Rendering/ShaderProgram.cpp

@@ -4,22 +4,32 @@ GLuint Shader::CompileShader(GLenum shaderType, std::string fileName)
 {
 	LOG_INFO("Compiling shader \"%s\"", fileName.c_str());
 
-	std::string shaderFile;
-	std::ifstream in(fileName, std::ios::in);
-	if (!in) {
-		LOG_ERROR("Error: Failed to open shader file \"%s\"", fileName.c_str());
-		return 0;
-	}
-	in.seekg(0, std::ios::end);
-	shaderFile.resize((int)in.tellg());
-	in.seekg(0, std::ios::beg);
-	in.read(&shaderFile[0], shaderFile.size());
-	in.close();
+    std::string shaderFile = ReadFile(fileName);
 
 	GLuint shader = glCreateShader(shaderType);
 	if (GLERROR("glCreateShader"))
 		return 0;
 
+    std::size_t startPos = 0;
+    std::size_t SEofNewFile[2];
+    std::string key = "#include";
+    while((startPos = shaderFile.find(key, startPos)) != std::string::npos)
+    {
+        SEofNewFile[0] = shaderFile.find('"', startPos+key.length())+1;
+        SEofNewFile[1] = shaderFile.find('"', SEofNewFile[0]);
+        if (SEofNewFile[0] == std::string::npos || SEofNewFile[1] == std::string::npos)
+            return 0;
+
+        std::string replacementFileName = shaderFile.substr(SEofNewFile[0], SEofNewFile[1] - SEofNewFile[0]);
+        std::string replacementString = ReadFile(replacementFileName);
+        size_t firstof = replacementString.find_first_of((char)0);
+        replacementString.erase(firstof, replacementString.size() - firstof);
+        if (replacementString.length() <= 0)
+            return 0;
+        shaderFile.replace(startPos, SEofNewFile[1]+2 - startPos, replacementString + "\n");
+        startPos += replacementString.length(); //This might not be wanted.
+    }
+
 	const GLchar* shaderFiles = shaderFile.c_str();
 	const GLint length = static_cast<GLint>(shaderFile.length());
 	glShaderSource(shader, 1, &shaderFiles, &length);
@@ -46,6 +56,24 @@ GLuint Shader::CompileShader(GLenum shaderType, std::string fileName)
 	return shader;
 }
 
+std::string Shader::ReadFile(std::string fileName)
+{
+    std::string shaderFile;
+    std::ifstream in(fileName, std::ios::in);
+    if (!in) {
+        LOG_ERROR("Error: Failed to open shader file \"%s\"", fileName.c_str());
+        return "";
+    }
+
+    in.seekg(0, std::ios::end);
+    shaderFile.resize((int)in.tellg());
+    in.seekg(0, std::ios::beg);
+    in.read(&shaderFile[0], shaderFile.size());
+    in.close();
+    return shaderFile;
+}
+
+
 Shader::Shader(GLenum shaderType, std::string fileName) : m_ShaderType(shaderType), m_FileName(fileName)
 {
 	m_ShaderHandle = 0;

src/Engine/Rendering/ShadowPass.cpp

@@ -0,0 +1,313 @@
+#include "Rendering/ShadowPass.h"
+
+ShadowPass::ShadowPass(IRenderer * renderer, int shadow_res_x, int shadow_res_y)
+{
+	m_Renderer = renderer;
+	m_ResolutionSizeWidth = shadow_res_x;
+	m_ResolutionSizeHeight = shadow_res_y;
+
+	InitializeFrameBuffers();
+	InitializeShaderPrograms();
+}
+
+ShadowPass::ShadowPass(IRenderer * renderer)
+{
+	m_Renderer = renderer;
+
+	InitializeFrameBuffers();
+	InitializeShaderPrograms();
+}
+
+ShadowPass::~ShadowPass()
+{
+
+}
+
+void ShadowPass::DebugGUI()
+{
+	ImGui::Checkbox("EnableShadows", &m_EnableShadows);
+	ImGui::DragFloat2("ShadowMapNearFar", m_NearFarPlane, 1.f, -1000.f, 1000.f);
+	ImGui::DragFloat("ShadowClippingWeight", &m_SplitWeight, 0.001f, 0.f, 1.f);
+	ImGui::Checkbox("ShadowTransparentObjects", &m_TransparentObjects);
+	ImGui::Checkbox("ShadowOnTextureAlphas", &m_TexturedShadows);
+}
+
+void ShadowPass::InitializeCameras(RenderScene & scene)
+{
+	for (int i = 0; i < m_CurrentNrOfSplits; i++) {
+		m_shadowFrusta[i].AspectRatio = scene.Camera->AspectRatio();
+		m_shadowFrusta[i].FOV = scene.Camera->FOV();
+	}
+}
+
+// UpdateSplitDist computes the near and far distances for every frustum slice
+// in camera eye space - that is, at what distance does a slice start and end
+void ShadowPass::UpdateSplitDist(std::array<ShadowFrustum, MAX_SPLITS>& frusta, float near_distance, float far_distance)
+{
+	float lambda = m_SplitWeight;
+	float ratio = far_distance / near_distance;
+
+	frusta[0].NearClip = near_distance;
+
+	for (int i = 1; i < m_CurrentNrOfSplits; i++) {
+		float si = i / static_cast<float>(m_CurrentNrOfSplits);
+
+		frusta[i].NearClip = lambda * (near_distance * powf(ratio, si)) + (1 - lambda) * (near_distance + (far_distance - near_distance) * si);
+		frusta[i - 1].FarClip = frusta[i].NearClip * 1.005f;
+	}
+
+	frusta[m_CurrentNrOfSplits - 1].FarClip = far_distance;
+}
+
+void ShadowPass::UpdateFrustumPoints(ShadowFrustum& frustum, glm::mat4 p, glm::mat4 v)
+{
+	std::array<glm::vec4, 8> CornerPoint = {
+		glm::vec4(-1.f, -1.f,	-1.f,	1.f),
+		glm::vec4(-1.f, 1.f,	-1.f,	1.f),
+		glm::vec4(1.f,	1.f,	-1.f,	1.f),
+		glm::vec4(1.f,	-1.f,	-1.f,	1.f),
+		glm::vec4(-1.f,	-1.f,	1.f,	1.f),
+		glm::vec4(-1.f,	1.f,	1.f,	1.f),
+		glm::vec4(1.f,	1.f,	1.f,	1.f),
+		glm::vec4(1.f,	-1.f,	1.f,	1.f)
+	};
+
+	for (int i = 0; i < 8; i++) {
+		glm::vec4 NDC = glm::inverse(p) * CornerPoint[i];
+		NDC = NDC / NDC.w;
+		frustum.CornerPoint[i] = glm::vec3(glm::inverse(v) * NDC);
+	}
+}
+
+// Compute the 8 corner points of the current view frustum in world space
+void ShadowPass::UpdateFrustumPoints(ShadowFrustum& frustum, glm::vec3 camera_position, glm::vec3 view_dir)
+{
+	glm::vec3 up = glm::vec3(0.f, 1.f, 0.f);
+	glm::vec3 right = glm::normalize(glm::cross(view_dir, up));
+
+	glm::vec3 far_center = camera_position + glm::normalize(view_dir) * frustum.FarClip;
+	glm::vec3 near_center = camera_position + glm::normalize(view_dir) * frustum.NearClip;
+	frustum.MiddlePoint = near_center + (far_center - near_center) * 0.5f;
+
+	up = glm::normalize(glm::cross(right, view_dir));
+
+	// these heights and widths are half the heights and widths of the near and far plane rectangles.
+	float near_height = tan(frustum.FOV / 2.f) * frustum.NearClip;
+	float near_width = near_height * frustum.AspectRatio;
+	float far_height = tan(frustum.FOV / 2.f) * frustum.FarClip;
+	float far_width = far_height * frustum.AspectRatio;
+
+	frustum.CornerPoint[0] = near_center - up * near_height - right * near_width;
+	frustum.CornerPoint[1] = near_center + up * near_height - right * near_width;
+	frustum.CornerPoint[2] = near_center + up * near_height + right * near_width;
+	frustum.CornerPoint[3] = near_center - up * near_height + right * near_width;
+
+	frustum.CornerPoint[4] = far_center - up * far_height - right * far_width;
+	frustum.CornerPoint[5] = far_center + up * far_height - right * far_width;
+	frustum.CornerPoint[6] = far_center + up * far_height + right * far_width;
+	frustum.CornerPoint[7] = far_center - up * far_height + right * far_width;
+}
+
+float ShadowPass::FindRadius(ShadowFrustum& frustum)
+{
+	float radius = 0.f;
+
+	for (int i = 0; i < 8; i++) {
+		float distance = glm::distance(frustum.MiddlePoint, frustum.CornerPoint[i]);
+		if (distance > radius) {
+			radius = distance;
+		}
+	}
+
+	frustum.Radius = radius;
+	return radius;
+}
+
+void ShadowPass::InitializeFrameBuffers()
+{
+	// Depth texture
+	glGenTextures(1, &m_DepthMap);
+
+	glBindTexture(GL_TEXTURE_2D_ARRAY, m_DepthMap);
+	glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_DEPTH_COMPONENT16, m_ResolutionSizeWidth, m_ResolutionSizeHeight, m_CurrentNrOfSplits);
+
+	//glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0, m_ResolutionSizeWidth, m_ResolutionSizeHeight, m_CurrentNrOfSplits, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, nullptr);
+
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE);
+	glTexParameterfv(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BORDER_COLOR, glm::vec4(1.f).data);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
+
+	m_DepthBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2DArray(&m_DepthMap, GL_DEPTH_ATTACHMENT)));
+	m_DepthBuffer.Generate();
+
+	GLERROR("depthMap failed END");
+}
+
+void ShadowPass::InitializeShaderPrograms()
+{
+	m_ShadowProgram = ResourceManager::Load<ShaderProgram>("#ShadowProgram");
+	m_ShadowProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Shadow.vert.glsl")));
+	m_ShadowProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Shadow.frag.glsl")));
+	m_ShadowProgram->Compile();
+	m_ShadowProgram->BindFragDataLocation(0, "ShadowMap");
+	m_ShadowProgram->Link();
+
+
+}
+
+void ShadowPass::ClearBuffer()
+{
+	m_DepthBuffer.Bind();
+
+	for (int i = 0; i < m_CurrentNrOfSplits; i++) {
+		glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, m_DepthMap, 0, i);
+
+		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	}
+
+	m_DepthBuffer.Unbind();
+}
+
+void ShadowPass::PointsToLightspace(ShadowFrustum& frustum, glm::mat4 v)
+{
+	float left = INFINITY;
+	float right = -INFINITY;
+	float bottom = INFINITY;
+	float top = -INFINITY;
+
+	for (int i = 0; i < 8; i++)
+	{
+		glm::vec3 tempPoint = glm::vec3(v * glm::vec4(frustum.CornerPoint[i], 1.f));
+
+		if (tempPoint.x < left) { left = tempPoint.x; }
+		if (tempPoint.x > right) { right = tempPoint.x; }
+		if (tempPoint.y < bottom) { bottom = tempPoint.y; }
+		if (tempPoint.y > top) { top = tempPoint.y; }
+	}
+
+	frustum.LRBT = { left, right, bottom, top };
+}
+
+void ShadowPass::RadiusToLightspace(ShadowFrustum& frustum)
+{
+	float quantizationStep = 1.0f / m_ResolutionSizeHeight;
+
+	float left = -frustum.Radius;
+	float right = frustum.Radius;
+	float bottom = -frustum.Radius;
+	float top = frustum.Radius;
+
+	frustum.LRBT = { left, right, bottom, top };
+}
+
+void ShadowPass::Draw(RenderScene & scene)
+{
+	if (m_EnableShadows) {
+		InitializeCameras(scene);
+		UpdateSplitDist(m_shadowFrusta, scene.Camera->NearClip(), scene.Camera->FarClip());
+
+		ShadowPassState* state = new ShadowPassState(m_DepthBuffer.GetHandle());
+
+		m_ShadowProgram->Bind();
+		GLuint shaderHandle = m_ShadowProgram->GetHandle();
+		glViewport(0, 0, m_ResolutionSizeWidth, m_ResolutionSizeHeight);
+
+		for (int i = 0; i < m_CurrentNrOfSplits; i++) {
+			UpdateFrustumPoints(m_shadowFrusta[i], scene.Camera->Position(), scene.Camera->Forward());
+
+			glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, m_DepthMap, 0, i);
+
+			for (auto &job : scene.Jobs.DirectionalLight) {
+				auto directionalLightJob = std::dynamic_pointer_cast<DirectionalLightJob>(job);
+
+				if (directionalLightJob) {
+					m_LightView[i] = glm::lookAt(glm::vec3(-directionalLightJob->Direction) + m_shadowFrusta[i].MiddlePoint, m_shadowFrusta[i].MiddlePoint, glm::vec3(0.f, 1.f, 0.f));
+
+					PointsToLightspace(m_shadowFrusta[i], m_LightView[i]);
+					//FindRadius(m_shadowFrusta[i]);
+					//RadiusToLightspace(m_shadowFrusta[i]);
+					m_LightProjection[i] = glm::ortho(m_shadowFrusta[i].LRBT[LEFT], m_shadowFrusta[i].LRBT[RIGHT], m_shadowFrusta[i].LRBT[BOTTOM], m_shadowFrusta[i].LRBT[TOP], m_NearFarPlane[NEAR], m_NearFarPlane[FAR]);
+
+					glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(m_LightProjection[i]));
+					glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(m_LightView[i]));
+
+					GLERROR("ShadowLight ERROR");
+
+					for (auto &objectJob : scene.Jobs.OpaqueObjects) {
+						if (!std::dynamic_pointer_cast<ExplosionEffectJob>(objectJob)) {
+							auto modelJob = std::dynamic_pointer_cast<ModelJob>(objectJob);
+
+							if (!modelJob->Shadow) {
+								continue;
+							}
+
+							glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
+							glUniform1f(glGetUniformLocation(shaderHandle, "Alpha"), 1.f);
+
+							glBindVertexArray(modelJob->Model->VAO);
+							glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+							glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
+
+							GLERROR("Shadow Draw ERROR");
+						}
+					}
+					if (m_TransparentObjects) {
+						state->CullFace(GL_BACK);
+						for (auto &objectJob : scene.Jobs.TransparentObjects) {
+							if (!std::dynamic_pointer_cast<ExplosionEffectJob>(objectJob)) {
+								auto modelJob = std::dynamic_pointer_cast<ModelJob>(objectJob);
+
+								if (!modelJob->Shadow) {
+									continue;
+								}
+
+								glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
+								glUniform1f(glGetUniformLocation(shaderHandle, "Alpha"), modelJob->Color.a);
+
+								if (m_TexturedShadows) {
+									switch (modelJob->Type) {
+									case RawModel::MaterialType::SingleTextures:
+									case RawModel::MaterialType::Basic:
+									{
+										glActiveTexture(GL_TEXTURE24);
+										if (modelJob->DiffuseTexture.size() > 0 && modelJob->DiffuseTexture[0]->Texture != nullptr) {
+											glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture[0]->Texture->m_Texture);
+											glUniform2fv(glGetUniformLocation(shaderHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(modelJob->DiffuseTexture[0]->UVRepeat));
+										}
+										else {
+											glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
+											glUniform2fv(glGetUniformLocation(shaderHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(glm::vec2(1.0f, 1.0f)));
+										}
+										break;
+									}
+									case RawModel::MaterialType::SplatMapping:
+									{
+										glActiveTexture(GL_TEXTURE24);
+										glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
+										glUniform2fv(glGetUniformLocation(shaderHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(glm::vec2(1.0f, 1.0f)));
+										break;
+									}
+									}
+								}
+
+								glBindVertexArray(modelJob->Model->VAO);
+								glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+								glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
+
+								GLERROR("Shadow Draw ERROR");
+							}
+						}
+						state->CullFace(GL_FRONT);
+					}
+				}
+			}
+		}
+		glViewport(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+		m_DepthBuffer.Unbind();
+		delete state;
+	}
+}

src/Engine/Rendering/ShadowPassState.cpp

@@ -0,0 +1,19 @@
+#include "Rendering/ShadowPassState.h"
+
+ShadowPassState::ShadowPassState(GLuint frameBuffer)
+{
+	BindFramebuffer(frameBuffer);
+	Enable(GL_DEPTH_TEST);
+	Enable(GL_CULL_FACE);
+	Disable(GL_BLEND);
+	Disable(GL_TEXTURE_2D);
+	CullFace(GL_FRONT);
+	ClearColor(glm::vec4(0.f, 0.f, 0.f, 0.f));
+	//Enable(GL_ALPHA_TEST);
+	//glAlphaFunc(GL_GREATER, 0.9f);
+}
+
+ShadowPassState::~ShadowPassState()
+{
+
+}

src/Engine/Rendering/Skeleton.cpp

@@ -1,343 +1,37 @@
 #include "Rendering/Skeleton.h"
 
-int Skeleton::CreateBone(int ID, int parentID, std::string name, glm::mat4 offsetMatrix)
+std::map<int, Skeleton::PoseData> Skeleton::GetFrameBones(const Animation* animation, double time, bool additive, bool noRootMotion /*= false*/)
 {
-	if (m_BonesByName.find(name) != m_BonesByName.end()) {
-		return m_BonesByName.at(name)->ID;
-	} else {
-		Bone* bone;
-
-		if (parentID == -1) {
-			bone = new Bone(ID, nullptr, name, offsetMatrix);
-			RootBone = bone;
-		} else {
-			Bone* parent = Bones[parentID];
-			bone = new Bone(ID, parent, name, offsetMatrix);
-			parent->Children.push_back(bone);
-		}
-		
-		Bones[ID] = bone;
-		m_BonesByName[name] = bone;
-		return ID;
-	}
-}
-
-Skeleton::~Skeleton()
-{
-	for (auto &kv : Bones) {
-		delete kv.second;
-	}
-}
-
-
-
-const Skeleton::Animation* Skeleton::GetAnimation(std::string name)
-{
-	auto it = Animations.find(name);
-	if (it != Animations.end()) {
-		return const_cast<const Animation*>(&it->second);
-	} else {
-		return nullptr;
-	}
-}
-
-std::vector<glm::mat4> Skeleton::GetFrameBones(std::vector<AnimationData> animations, bool noRootMotion /*= false*/)
-{
-    if (animations.size() <= 0) {
-        std::vector<glm::mat4> finalMatrices;
+    if (animation == nullptr) {
+        std::map<int, PoseData> finalMatrices;
         for (auto& b : Bones) {
-            finalMatrices.push_back(glm::mat4(1));//b.second->OffsetMatrix);
+            PoseData poseData;
+            poseData.Translation = glm::vec3(0);
+            poseData.Orientation = glm::quat();
+            poseData.Scale = glm::vec3(1);
+
+
+            finalMatrices[b.second->ID] = poseData;
         }
         return finalMatrices;
     }
 
-    std::map<int, glm::mat4> frameBones;
-    AccumulateBoneTransforms(true, animations, frameBones, RootBone, glm::mat4(1));
 
-    std::vector<glm::mat4> finalMatrices;
-    for (auto &kv : frameBones) {
-        finalMatrices.push_back(kv.second);
+    std::map<int, PoseData> frameBones;
+
+    if(!additive) {
+        AccumulateBoneTransforms(true, animation, time, frameBones, RootBone);
+    } else {
+        AdditiveBoneTransforms(animation, time, frameBones, RootBone);
     }
-    return finalMatrices;
+
+    return frameBones;
 }
 
-std::vector<glm::mat4> Skeleton::GetFrameBones(std::vector<AnimationData> animations, AnimationOffset animationOffset, bool noRootMotion /*= false*/)
+void Skeleton::AccumulateBoneTransforms(bool noRootMotion, const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone)
 {
-    if (animations.size() <= 0 || animationOffset.animation == nullptr) {
-        std::vector<glm::mat4> finalMatrices;
-        for (auto& b : Bones) {
-            finalMatrices.push_back(glm::mat4(1));//b.second->OffsetMatrix);
-        }
-        return finalMatrices;
-    }
-
+    PoseData poseData;
     
-    std::map<int, glm::mat4> frameBones;
-    AccumulateBoneTransforms(true, animations, animationOffset, frameBones, RootBone, glm::mat4(1));
-
-    std::vector<glm::mat4> finalMatrices;
-    for (auto &kv : frameBones) {
-        finalMatrices.push_back(kv.second);
-    }
-    return finalMatrices;
-}
-
-void Skeleton::AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, std::map<int, glm::mat4>& boneMatrices, const Bone* bone, glm::mat4 parentMatrix)
-{
-    glm::mat4 boneMatrix;
-    std::vector<JointFrameTransform> JointTransforms;
-
-    for (const AnimationData animationData : animations) {
-        const Animation* animation = animationData.animation;
-        const float time = animationData.time;
-
-        JointFrameTransform jointTransform;
-        jointTransform.Weight = animationData.weight;;
-
-        if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
-            std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
-
-            Animation::Keyframe currentFrame;
-            Animation::Keyframe nextFrame;
-
-            if (boneKeyFrames.size() > 1) { // 2+ keyframes for the current bone
-                for (int index = boneKeyFrames.size()-1; index >= 0; index--) { // find the bone keyframes that surrounds the current frame
-                    if (time >= boneKeyFrames.at(index).Time) {
-                        currentFrame = boneKeyFrames.at(index);
-                        nextFrame = boneKeyFrames.at((index + 1) % boneKeyFrames.size());
-                        break;
-                    }
-                }
-
-                float progress;
-
-                if (nextFrame.Index == 0) {
-                    nextFrame = currentFrame;
-                    progress = (time - currentFrame.Time) / (animation->Duration - currentFrame.Time);
-                } else {
-                    progress = (time - currentFrame.Time) / (nextFrame.Time - currentFrame.Time);
-
-                }
-
-
-                if (progress > 1.0f || progress < 0.0f) {
-                    progress = glm::clamp(progress, 0.0f, 1.0f);
-                }
-                Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
-                Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
-
-                jointTransform.PositionInterp = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
-                jointTransform.RotationInterp = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
-                jointTransform.ScaleInterp = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
-
-                // Flag for no root motion
-                if (bone == RootBone && noRootMotion) {
-                    jointTransform.PositionInterp.x = 0;
-                    jointTransform.PositionInterp.z = 0;
-                }
-
-                JointTransforms.push_back(jointTransform);
-
-            } else { // 1 keyframes for the current bone
-                currentFrame = boneKeyFrames.at(0);
-                jointTransform.PositionInterp = currentFrame.BoneProperties.Position;
-                jointTransform.RotationInterp = currentFrame.BoneProperties.Rotation;
-                jointTransform.ScaleInterp = currentFrame.BoneProperties.Scale;
-                JointTransforms.push_back(jointTransform);
-
-            }
-        } else { // 0 keyframes for the current bone
-
-        }
-
-    }
-
-    if (JointTransforms.size() <= 0) {
-        if (bone->Parent) {
-            boneMatrix = parentMatrix * glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix;
-            boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
-        } else {
-            boneMatrix = glm::inverse(bone->OffsetMatrix);
-            boneMatrices[bone->ID] = parentMatrix;
-        }
-    } else if (JointTransforms.size() == 1) {
-        boneMatrix = parentMatrix *(glm::translate(JointTransforms.at(0).PositionInterp) * glm::toMat4(JointTransforms.at(0).RotationInterp) * glm::scale(JointTransforms.at(0).ScaleInterp));
-        boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
-    } else {
-
-        glm::vec3 finalPosInterp;
-        glm::quat finalRotInterp;
-        glm::vec3 finalScaleInterp;
-        float totalWeight = 0;
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            totalWeight += jointTransform.Weight;
-        }
-
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            if (jointTransform.Weight == 1.0f) {
-                finalPosInterp = jointTransform.PositionInterp;
-                finalRotInterp = jointTransform.RotationInterp;
-                finalScaleInterp = jointTransform.ScaleInterp;
-                break;
-            } else {
-                finalPosInterp += jointTransform.PositionInterp * (jointTransform.Weight/totalWeight);
-                finalRotInterp *= glm::slerp(glm::quat(), jointTransform.RotationInterp, (jointTransform.Weight/totalWeight));
-                finalScaleInterp += jointTransform.ScaleInterp * (jointTransform.Weight/totalWeight);
-            }
-
-        }
-
-        boneMatrix = parentMatrix *(glm::translate(finalPosInterp) * glm::toMat4(finalRotInterp) * glm::scale(finalScaleInterp));
-        boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
-    }
-
-
-
-    for (auto &child : bone->Children) {
-        AccumulateBoneTransforms(noRootMotion, animations, boneMatrices, child, boneMatrix);
-    }
-}
-
-void Skeleton::AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, AnimationOffset animationOffset, std::map<int, glm::mat4>& boneMatrices, const Bone* bone, glm::mat4 parentMatrix)
-{
-    glm::mat4 boneMatrix;
-
-    std::vector<JointFrameTransform> JointTransforms;
-
-    for (const AnimationData animationData : animations) {
-        const Animation* animation = animationData.animation;
-        const float time = animationData.time;
-
-        JointFrameTransform jointTransform;
-        jointTransform.Weight = animationData.weight;;
-
-        if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
-            std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
-
-            Animation::Keyframe currentFrame;
-            Animation::Keyframe nextFrame;
-
-            if (boneKeyFrames.size() > 1) { // 2+ keyframes for the current bone
-                for (int index = boneKeyFrames.size()-1; index >= 0; index--) { // find the bone keyframes that surrounds the current frame
-                    if (time >= boneKeyFrames.at(index).Time) {
-                        currentFrame = boneKeyFrames.at(index);
-                        nextFrame = boneKeyFrames.at((index + 1) % boneKeyFrames.size());
-                        break;
-                    }
-                }
-
-                float progress;
-
-                if (nextFrame.Index == 0) {
-                    nextFrame = currentFrame;
-                    progress = (time - currentFrame.Time) / (animation->Duration - currentFrame.Time);
-                } else {
-                    progress = (time - currentFrame.Time) / (nextFrame.Time - currentFrame.Time);
-
-                }
-
-
-                if (progress > 1.0f || progress < 0.0f) {
-                    progress = glm::clamp(progress, 0.0f, 1.0f);
-                }
-                Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
-                Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
-
-                jointTransform.PositionInterp = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
-                jointTransform.RotationInterp = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
-                jointTransform.ScaleInterp = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
-
-                // Flag for no root motion
-                if (bone == RootBone && noRootMotion) {
-                    jointTransform.PositionInterp.x = 0;
-                    jointTransform.PositionInterp.z = 0;
-                }
-
-                JointTransforms.push_back(jointTransform);
-
-            } else { // 1 keyframes for the current bone
-                currentFrame = boneKeyFrames.at(0);
-                jointTransform.PositionInterp = currentFrame.BoneProperties.Position;
-                jointTransform.RotationInterp = currentFrame.BoneProperties.Rotation;
-                jointTransform.ScaleInterp = currentFrame.BoneProperties.Scale;
-                JointTransforms.push_back(jointTransform);
-
-            }
-        } else { // 0 keyframes for the current bone
-
-        }
-
-    }
-
-
-    glm::mat4 offset = GetOffsetTransform(bone, animationOffset);
-
-    if (JointTransforms.size() == 0) {
-        if (bone->Parent) {
-            if (offset != glm::mat4(1)) {
-                boneMatrix = parentMatrix * offset;// *((glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix));
-            } else {
-                boneMatrix = parentMatrix  *((glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix));
-
-            }
-            boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
-        } else {
-            boneMatrix = offset * glm::inverse(bone->OffsetMatrix);
-            boneMatrices[bone->ID] = parentMatrix;
-        }
-    } else {
-
-        glm::vec3 finalPosInterp;
-        glm::quat finalRotInterp;
-        glm::vec3 finalScaleInterp;
-        float totalWeight = 0;
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            totalWeight += jointTransform.Weight;
-        }
-
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            if (jointTransform.Weight == 1.0f) {
-                finalPosInterp = jointTransform.PositionInterp;
-                finalRotInterp = jointTransform.RotationInterp;
-                finalScaleInterp = jointTransform.ScaleInterp;
-                break;
-            } else {
-                finalPosInterp += jointTransform.PositionInterp * (jointTransform.Weight/totalWeight);
-                finalRotInterp *= glm::slerp(glm::quat(), jointTransform.RotationInterp, (jointTransform.Weight/totalWeight));
-                finalScaleInterp += jointTransform.ScaleInterp * (jointTransform.Weight/totalWeight);
-            }
-
-        }
-
-
-
-        if (offset != glm::mat4(1)) {
-            boneMatrix = parentMatrix * ((glm::translate(finalPosInterp) * glm::toMat4(finalRotInterp) * glm::scale(finalScaleInterp)) + offset);
-        } else {
-            boneMatrix = parentMatrix * (glm::translate(finalPosInterp) * glm::toMat4(finalRotInterp) * glm::scale(finalScaleInterp));
-        }
-
-        boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
-    }
-
-    for (auto &child : bone->Children) {
-        AccumulateBoneTransforms(noRootMotion, animations, animationOffset, boneMatrices, child, boneMatrix);
-    }
-}
-
-glm::mat4 Skeleton::GetOffsetTransform(const Bone* bone, AnimationOffset animationOffset)
-{
-    const Animation* animation = animationOffset.animation;
-    float time = animationOffset.time;
-
-    glm::vec3 position = glm::vec3(0);
-    glm::quat rotation = glm::quat();
-    glm::vec3 scale = glm::vec3(1);
-
     if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
         std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
 
@@ -364,37 +58,70 @@ glm::mat4 Skeleton::GetOffsetTransform(const Bone* bone, AnimationOffset animati
             }
 
             progress = glm::clamp(progress, 0.0f, 1.0f);
-            
             Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
             Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
 
-            position = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
-            rotation = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
-            scale = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
+            glm::vec3 position = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
+            glm::quat rotation = glm::normalize(glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress));
+            glm::vec3 scale = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
 
+            // Flag for no root motion
+            if (bone == RootBone && noRootMotion) {
+                position.x = 0;
+                position.z = 0;
+            }
+
+            poseData.Translation = position;
+            poseData.Orientation = rotation;
+            poseData.Scale = scale;
+            boneMatrices[bone->ID] = poseData;
 
         } else { // 1 keyframes for the current bone
             currentFrame = boneKeyFrames.at(0);
-            position = currentFrame.BoneProperties.Position;
-            rotation = currentFrame.BoneProperties.Rotation;
-            scale = currentFrame.BoneProperties.Scale;
+            poseData.Translation = currentFrame.BoneProperties.Position;
+            poseData.Orientation = currentFrame.BoneProperties.Rotation;
+            poseData.Scale = currentFrame.BoneProperties.Scale;
+            boneMatrices[bone->ID] = poseData;
         }
     }
 
-    return (glm::translate(position) * glm::toMat4(rotation) * glm::scale(scale));
+    for (auto &child : bone->Children) {
+        AccumulateBoneTransforms(noRootMotion, animation, time, boneMatrices, child);
+    }
 }
 
 
-glm::mat4 Skeleton::GetBoneTransform(const Bone* bone, const Animation* animation, float time, glm::mat4 childMatrix)
+void Skeleton::AdditiveBoneTransforms(const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone)
 {
-    glm::mat4 boneMatrix;
+    if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
+        PoseData refPose = GetAdditiveBonePose(bone, animation, 0.0);
+        PoseData srcPose = GetAdditiveBonePose(bone, animation, time + 1.0/60.0);
+        
+        PoseData finalPose;
+        finalPose.Translation = srcPose.Translation - refPose.Translation;
+        finalPose.Orientation = srcPose.Orientation * glm::inverse(refPose.Orientation);
+        finalPose.Scale = srcPose.Scale - refPose.Scale;
 
-    Animation::Keyframe currentFrame;
-    Animation::Keyframe nextFrame;
+        boneMatrices[bone->ID] = finalPose;
+    }
+
+    for (auto &child : bone->Children) {
+        AdditiveBoneTransforms(animation, time, boneMatrices, child);
+    }
+}
+
+Skeleton::PoseData Skeleton::GetAdditiveBonePose(const Bone* bone, const Animation* animation, double time)
+{
+    glm::vec3 position = glm::vec3(0);
+    glm::quat rotation = glm::quat();
+    glm::vec3 scale = glm::vec3(1);
 
     if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
         std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
 
+        Animation::Keyframe currentFrame;
+        Animation::Keyframe nextFrame;
+
         if (boneKeyFrames.size() > 1) { // 2+ keyframes for the current bone
             for (int index = boneKeyFrames.size()-1; index >= 0; index--) { // find the bone keyframes that surrounds the current frame
                 if (time >= boneKeyFrames.at(index).Time) {
@@ -413,276 +140,148 @@ glm::mat4 Skeleton::GetBoneTransform(const Bone* bone, const Animation* animatio
                 progress = (time - currentFrame.Time) / (nextFrame.Time - currentFrame.Time);
             }
 
-            if (progress > 1.0f || progress < 0.0f) {
-                LOG_INFO("Progress %f", progress);
-                progress = glm::clamp(progress, 0.0f, 1.0f);
-            }
+            progress = glm::clamp(progress, 0.0f, 1.0f);
+            
             Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
             Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
 
-            glm::vec3 positionInterp = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
-            glm::quat rotationInterp = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
-            glm::vec3 scaleInterp = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
+            position = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
+            rotation = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
+            scale = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
 
-            boneMatrix = (glm::translate(positionInterp) * glm::toMat4(rotationInterp) * glm::scale(scaleInterp)) * childMatrix;
 
         } else { // 1 keyframes for the current bone
             currentFrame = boneKeyFrames.at(0);
-            boneMatrix = (glm::translate(currentFrame.BoneProperties.Position) * glm::toMat4(currentFrame.BoneProperties.Rotation) * glm::scale(currentFrame.BoneProperties.Scale)) * childMatrix;
-
-        }
-    } else { // 0 keyframes for the current bone
-        if (bone->Parent) {
-            boneMatrix = bone->Parent->OffsetMatrix * glm::inverse(bone->OffsetMatrix) * childMatrix;
-        } else {
-            boneMatrix = glm::inverse(bone->OffsetMatrix) * childMatrix;
+            position = currentFrame.BoneProperties.Position;
+            rotation = currentFrame.BoneProperties.Rotation;
+            scale = currentFrame.BoneProperties.Scale;
         }
     }
 
-    if (bone->Parent) {
-        return  GetBoneTransform(bone->Parent, animation, time, boneMatrix);
-    } else {
-        return boneMatrix;
+    PoseData finalPose;
+    finalPose.Translation = position;
+    finalPose.Orientation = rotation;
+    finalPose.Scale = scale;
+
+    return finalPose;
+}
+
+std::map<int, Skeleton::PoseData> Skeleton::BlendPoses(const std::map<int, PoseData>& pose1, const std::map<int, PoseData>& pose2, double weight)
+{
+    std::map<int, PoseData> finalPose;
+
+    float weight1 = (float)(1.0 - weight);
+    float weight2 = (float)(weight);
+
+    for (auto& b : Bones) {
+        int boneID = b.second->ID;
+        PoseData blendedPose;
+        blendedPose.Translation = glm::vec3(0);
+        blendedPose.Orientation = glm::quat();
+        blendedPose.Scale = glm::vec3(1);
+
+        if(pose1.find(boneID) != pose1.end() && pose2.find(boneID) != pose2.end()) {
+            blendedPose.Translation = pose1.at(boneID).Translation * weight1 + pose2.at(boneID).Translation * weight2;
+            blendedPose.Orientation = glm::slerp(pose1.at(boneID).Orientation, pose2.at(boneID).Orientation, weight2);
+            blendedPose.Scale = pose1.at(boneID).Scale * weight1 + pose2.at(boneID).Scale * weight2;
+            finalPose[boneID] = blendedPose;
+        } else if(pose1.find(boneID) != pose1.end()) {
+            finalPose[boneID] = pose1.at(boneID);
+        } else if (pose2.find(boneID) != pose2.end()) {
+            finalPose[boneID] = pose2.at(boneID);
+        }
     }
+
+    return finalPose;
+}
+
+std::map<int, Skeleton::PoseData> Skeleton::OverridePose(const std::map<int, PoseData>& overridePose, const std::map<int, PoseData>& targetPose)
+{
+    std::map<int, PoseData> finalPose;
+
+    for (auto& b : Bones) {
+        int boneID = b.second->ID;
+        if (overridePose.find(boneID) != overridePose.end()) {
+            finalPose[boneID] = overridePose.at(boneID);
+        } else if (targetPose.find(boneID) != targetPose.end()) {
+            finalPose[boneID] = targetPose.at(boneID);
+        }
+    }
+    return finalPose;
+}
+
+std::map<int, Skeleton::PoseData> Skeleton::BlendPoseAdditive(const std::map<int, PoseData>& additivePose, const std::map<int, PoseData>& targetPose)
+{
+    std::map<int, PoseData> finalPose;
+
+    for (auto& b : Bones) {
+        int boneID = b.second->ID;
+        PoseData blendedPose;
+        blendedPose.Translation = glm::vec3(0);
+        blendedPose.Orientation = glm::quat();
+        blendedPose.Scale = glm::vec3(1);
+
+        if (additivePose.find(boneID) != additivePose.end() && targetPose.find(boneID) != targetPose.end()) {
+            blendedPose.Translation = additivePose.at(boneID).Translation + targetPose.at(boneID).Translation;
+            blendedPose.Orientation = additivePose.at(boneID).Orientation * targetPose.at(boneID).Orientation;
+            blendedPose.Scale = additivePose.at(boneID).Scale + targetPose.at(boneID).Scale;
+            finalPose[boneID] = blendedPose;
+        } else if (additivePose.find(boneID) != additivePose.end()) {
+            finalPose[boneID] = additivePose.at(boneID);
+        } else if (targetPose.find(boneID) != targetPose.end()) {
+            finalPose[boneID] = targetPose.at(boneID);
+        }
+    }
+
+    return finalPose;
+}
+
+void Skeleton::GetFinalPose(std::map<int, Skeleton::PoseData>& poseDatas, std::vector<glm::mat4>& finalPose, std::map<int, glm::mat4>& boneTransforms)
+{
+
+    std::map<int, glm::mat4> boneMatrices;
+
+    AccumulateFinalPose(boneMatrices, poseDatas, boneTransforms, RootBone, glm::mat4(1));
+
+    for(auto& b : boneMatrices) {
+        finalPose.push_back(b.second);
+    }
+
 }
 
 
-glm::mat4 Skeleton::GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, AnimationOffset animationOffset, glm::mat4 childMatrix)
+std::vector<glm::mat4> Skeleton::GetTPose()
 {
-    glm::mat4 boneMatrix;
-
-    std::vector<JointFrameTransform> JointTransforms;
-
-    for (const AnimationData animationData : animations) {
-        const Animation* animation = animationData.animation;
-        const float time = animationData.time;
-
-        JointFrameTransform jointTransform;
-        jointTransform.Weight = animationData.weight;;
-
-        if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
-            std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
-
-            Animation::Keyframe currentFrame;
-            Animation::Keyframe nextFrame;
-
-            if (boneKeyFrames.size() > 1) { // 2+ keyframes for the current bone
-                for (int index = boneKeyFrames.size()-1; index >= 0; index--) { // find the bone keyframes that surrounds the current frame
-                    if (time >= boneKeyFrames.at(index).Time) {
-                        currentFrame = boneKeyFrames.at(index);
-                        nextFrame = boneKeyFrames.at((index + 1) % boneKeyFrames.size());
-                        break;
-                    }
-                }
-
-                float progress;
-
-                if (nextFrame.Index == 0) {
-                    nextFrame = currentFrame;
-                    progress = (time - currentFrame.Time) / (animation->Duration - currentFrame.Time);
-                } else {
-                    progress = (time - currentFrame.Time) / (nextFrame.Time - currentFrame.Time);
-
-                }
-
-
-                if (progress > 1.0f || progress < 0.0f) {
-                    progress = glm::clamp(progress, 0.0f, 1.0f);
-                }
-                Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
-                Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
-
-                jointTransform.PositionInterp = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
-                jointTransform.RotationInterp = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
-                jointTransform.ScaleInterp = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
-
-                // Flag for no root motion
-                if (bone == RootBone && noRootMotion) {
-                    jointTransform.PositionInterp.x = 0;
-                    jointTransform.PositionInterp.z = 0;
-                }
-
-                JointTransforms.push_back(jointTransform);
-
-            } else { // 1 keyframes for the current bone
-                currentFrame = boneKeyFrames.at(0);
-                jointTransform.PositionInterp = currentFrame.BoneProperties.Position;
-                jointTransform.RotationInterp = currentFrame.BoneProperties.Rotation;
-                jointTransform.ScaleInterp = currentFrame.BoneProperties.Scale;
-                JointTransforms.push_back(jointTransform);
-
-            }
-        } else { // 0 keyframes for the current bone
-
-        }
+    std::vector<glm::mat4> finalMatrices;
 
+    for (auto b : Bones) {
+        finalMatrices.push_back(glm::mat4(1));
     }
 
-
-    glm::mat4 offset = GetOffsetTransform(bone, animationOffset);
-
-    if (JointTransforms.size() == 0) {
-        if (bone->Parent) {
-            if (offset != glm::mat4(1)) {
-                boneMatrix = offset * childMatrix;// *((glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix));
-            } else {
-                boneMatrix = ((glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix)) * childMatrix;
-            }
-        } else {
-            boneMatrix = offset * glm::inverse(bone->OffsetMatrix);
-        }
-    } else {
-
-        glm::vec3 finalPosInterp;
-        glm::quat finalRotInterp;
-        glm::vec3 finalScaleInterp;
-        float totalWeight = 0;
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            totalWeight += jointTransform.Weight;
-        }
-
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            if (jointTransform.Weight == 1.0f) {
-                finalPosInterp = jointTransform.PositionInterp;
-                finalRotInterp = jointTransform.RotationInterp;
-                finalScaleInterp = jointTransform.ScaleInterp;
-                break;
-            } else {
-                finalPosInterp += jointTransform.PositionInterp * (jointTransform.Weight/totalWeight);
-                finalRotInterp *= glm::slerp(glm::quat(), jointTransform.RotationInterp, (jointTransform.Weight/totalWeight));
-                finalScaleInterp += jointTransform.ScaleInterp * (jointTransform.Weight/totalWeight);
-            }
-
-        }
-
-        if (offset != glm::mat4(1)) {
-            boneMatrix = ((glm::translate(finalPosInterp) * glm::toMat4(finalRotInterp) * glm::scale(finalScaleInterp)) + offset) * childMatrix;
-        } else {
-            boneMatrix = (glm::translate(finalPosInterp) * glm::toMat4(finalRotInterp) * glm::scale(finalScaleInterp)) * childMatrix;
-        }
-    }
-
-    if (bone->Parent != nullptr) {
-        return GetBoneTransform(noRootMotion, bone->Parent, animations, animationOffset, boneMatrix);
-    } else {
-        return boneMatrix;
-    }
+    return finalMatrices;
 }
 
-
-glm::mat4 Skeleton::GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, glm::mat4 childMatrix)
+void Skeleton::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)
 {
     glm::mat4 boneMatrix;
-    std::vector<JointFrameTransform> JointTransforms;
 
-    for (const AnimationData animationData : animations) {
-        const Animation* animation = animationData.animation;
-        const float time = animationData.time;
-
-        JointFrameTransform jointTransform;
-        jointTransform.Weight = animationData.weight;;
-
-        if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
-            std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
-
-            Animation::Keyframe currentFrame;
-            Animation::Keyframe nextFrame;
-
-            if (boneKeyFrames.size() > 1) { // 2+ keyframes for the current bone
-                for (int index = boneKeyFrames.size()-1; index >= 0; index--) { // find the bone keyframes that surrounds the current frame
-                    if (time >= boneKeyFrames.at(index).Time) {
-                        currentFrame = boneKeyFrames.at(index);
-                        nextFrame = boneKeyFrames.at((index + 1) % boneKeyFrames.size());
-                        break;
-                    }
-                }
-
-                float progress;
-
-                if (nextFrame.Index == 0) {
-                    nextFrame = currentFrame;
-                    progress = (time - currentFrame.Time) / (animation->Duration - currentFrame.Time);
-                } else {
-                    progress = (time - currentFrame.Time) / (nextFrame.Time - currentFrame.Time);
-                }
-
-
-                if (progress > 1.0f || progress < 0.0f) {
-                    progress = glm::clamp(progress, 0.0f, 1.0f);
-                }
-                Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
-                Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
-
-                jointTransform.PositionInterp = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
-                jointTransform.RotationInterp = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
-                jointTransform.ScaleInterp = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
-
-                // Flag for no root motion
-                if (bone == RootBone && noRootMotion) {
-                    jointTransform.PositionInterp.x = 0;
-                    jointTransform.PositionInterp.z = 0;
-                }
-
-                JointTransforms.push_back(jointTransform);
-
-            } else { // 1 keyframes for the current bone
-                currentFrame = boneKeyFrames.at(0);
-                jointTransform.PositionInterp = currentFrame.BoneProperties.Position;
-                jointTransform.RotationInterp = currentFrame.BoneProperties.Rotation;
-                jointTransform.ScaleInterp = currentFrame.BoneProperties.Scale;
-                JointTransforms.push_back(jointTransform);
-
-            }
-        } else { // 0 keyframes for the current bone
-
-        }
-
-    }
-
-    if (JointTransforms.size() <= 0) {
+    if (poseDatas.find(bone->ID) != poseDatas.end()) {
+        boneMatrix = parentMatrix * (glm::translate(poseDatas.at(bone->ID).Translation) * glm::mat4(poseDatas.at(bone->ID).Orientation) * glm::scale(poseDatas.at(bone->ID).Scale));
+        boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
+    } else {
         if (bone->Parent) {
-            boneMatrix = glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix * childMatrix;
+            boneMatrix = parentMatrix * (glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix);
+            boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
         } else {
-            boneMatrix = glm::inverse(bone->OffsetMatrix) * childMatrix;
+            boneMatrix = glm::inverse(bone->OffsetMatrix);
+            boneMatrices[bone->ID] = parentMatrix;
         }
-    } else if (JointTransforms.size() == 1) {
-        boneMatrix = (glm::translate(JointTransforms.at(0).PositionInterp) * glm::toMat4(JointTransforms.at(0).RotationInterp) * glm::scale(JointTransforms.at(0).ScaleInterp)) * childMatrix;
-    } else {
-
-        glm::vec3 finalPosInterp;
-        glm::quat finalRotInterp;
-        glm::vec3 finalScaleInterp;
-        float totalWeight = 0;
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            totalWeight += jointTransform.Weight;
-        }
-
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            if (jointTransform.Weight == 1.0f) {
-                finalPosInterp = jointTransform.PositionInterp;
-                finalRotInterp = jointTransform.RotationInterp;
-                finalScaleInterp = jointTransform.ScaleInterp;
-                break;
-            } else {
-                finalPosInterp += jointTransform.PositionInterp * (jointTransform.Weight/totalWeight);
-                finalRotInterp *= glm::slerp(glm::quat(), jointTransform.RotationInterp, (jointTransform.Weight/totalWeight));
-                finalScaleInterp += jointTransform.ScaleInterp * (jointTransform.Weight/totalWeight);
-            }
-        }
-
-        boneMatrix = (glm::translate(finalPosInterp) * glm::toMat4(finalRotInterp) * glm::scale(finalScaleInterp)) * childMatrix;
     }
 
+    boneTransforms[bone->ID] = boneMatrix;
 
-
-    if (bone->Parent != nullptr) {
-        return GetBoneTransform(noRootMotion, bone->Parent, animations, boneMatrix);
-    } else {
-        return boneMatrix;
+    for (auto &child : bone->Children) {
+        AccumulateFinalPose(boneMatrices, poseDatas, boneTransforms, child, boneMatrix);
     }
 }
 
@@ -695,46 +294,43 @@ int Skeleton::GetBoneID(std::string name)
 	}
 }
 
-void Skeleton::PrintSkeleton()
+int Skeleton::CreateBone(int ID, int parentID, std::string name, glm::mat4 offsetMatrix)
 {
-	if (LOG_LEVEL < LOG_LEVEL_DEBUG) {
-		return;
-	}
-	PrintSkeleton(RootBone, 0);
+    if (m_BonesByName.find(name) != m_BonesByName.end()) {
+        return m_BonesByName.at(name)->ID;
+    } else {
+        Bone* bone;
+
+        if (parentID == -1) {
+            bone = new Bone(ID, nullptr, name, offsetMatrix);
+            RootBone = bone;
+        } else {
+            Bone* parent = Bones[parentID];
+            bone = new Bone(ID, parent, name, offsetMatrix);
+            parent->Children.push_back(bone);
+        }
+
+        Bones[ID] = bone;
+        m_BonesByName[name] = bone;
+        return ID;
+    }
 }
 
-void Skeleton::PrintSkeleton(const Bone* bone, int depthCount)
+Skeleton::~Skeleton()
 {
-	std::stringstream ss;
-	ss << std::string(depthCount, ' ');
-	ss << bone->ID << ": " << bone->Name;
-	std::cout << ss.str() << std::endl;
-	
-	depthCount++;
+    for (auto &kv : Bones) {
+        delete kv.second;
+    }
 
-	for (auto &child : bone->Children) {
-		PrintSkeleton(child, depthCount);
-	}
+    BlendTrees.clear();
 }
 
-int Skeleton::GetKeyframe(const Animation& animation, double time)
+const Skeleton::Animation* Skeleton::GetAnimation(std::string name)
 {
-
-/*
-	if (time < 0) {
-		time = 0;
-	}
-	if (time >= animation.Duration) {
-		return animation..size() - 1;
-	}
-
-	for (int keyframe = 0; keyframe < animation.Keyframes.size(); ++keyframe) {
-		if (animation.Keyframes[keyframe].Time > time) {
-			return (keyframe - 1) % animation.Keyframes.size();
-		}
-	}
-*/
-
-
-	return 0;
-}
+    auto it = Animations.find(name);
+    if (it != Animations.end()) {
+        return const_cast<const Animation*>(&it->second);
+    } else {
+        return nullptr;
+    }
+}

src/Engine/Rendering/Texture.cpp

@@ -12,18 +12,6 @@ Texture::Texture(std::string path)
         throw Resource::FailedLoadingException("Texture extension is not .png nor .dds");
     }
 
-    //PNG image(path);
-
-    //if (img->Width == 0 && img->Height == 0 || img->Format == Image::ImageFormat::Unknown) {
-    //    //image = PNG("Textures/Core/ErrorTexture.png");
-    //    //return; // Temporary fix to remove crash
-
-    //    if (img->Width == 0 && img->Height == 0 || img->Format == Image::ImageFormat::Unknown) {
-    //        LOG_ERROR("Couldn't even load the error texture. This is a dark day indeed.");
-    //        return;
-    //    }
-    //}
-
     this->Width = img->Width;
     this->Height = img->Height;
 
@@ -38,6 +26,7 @@ Texture::Texture(std::string path)
     }
 
     // Construct the OpenGL texture
+
     glGenTextures(1, &m_Texture);
     glBindTexture(GL_TEXTURE_2D, m_Texture);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);

src/Engine/Rendering/TextureSprite.cpp

@@ -0,0 +1,11 @@
+#include "Rendering/TextureSprite.h"
+
+TextureSprite::TextureSprite(std::string path)
+    :Texture(path)
+{
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST_MIPMAP_NEAREST);
+    GLERROR("Texture load");
+}

src/Engine/Rendering/Util/CommonFunctions.cpp

@@ -1,23 +1,5 @@
 #include "Rendering/Util/CommonFunctions.h"
 
-Texture* CommonFunctions::LoadTexture(std::string path, bool threaded)
-{
-    Texture* img;
-    try {
-        if(threaded) {
-            img = ResourceManager::Load<Texture, true>(path);
-        } else {
-            img = ResourceManager::Load<Texture, false>(path);
-        }
-    } catch (const Resource::StillLoadingException&) {
-        img = ResourceManager::Load<Texture>("Textures/Core/ErrorTexture.png");
-    } catch (const std::exception&) {
-        img = ResourceManager::Load<Texture>("Textures/Core/ErrorTexture.png");
-    }
-
-    return img;
-}
-
 void CommonFunctions::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type)
 {
 	glDeleteTextures(1, texture);

src/Engine/Rendering/Util/ScreenCoords.cpp

@@ -37,7 +37,7 @@ ScreenCoords::PixelData ScreenCoords::ToPixelData(float x, float y, FrameBuffer*
     glReadPixels(x, y, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pdata);
 	GLERROR("glReadPixels(pdata) Error");
     PickDataBuffer->Unbind();
-
+	GLERROR("Unbind Error");
     glBindFramebuffer(GL_FRAMEBUFFER, DepthBuffer); 
 	GLERROR("glBindFramebuffer(DepthBuffer) Error");
     float depthData;