Merge branch 'master' into Shadows

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/EntityWrapper.cpp

@@ -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/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/EditorSystem.cpp

@@ -19,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));

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 = LocalPlayer.ID;
+                    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 = LocalPlayer.ID;
+                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/Network/Client.cpp

@@ -49,16 +49,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);
@@ -177,8 +177,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)
@@ -476,7 +476,7 @@ bool Client::OnInputCommand(const Events::InputCommand & e)
     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_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;
@@ -613,7 +613,7 @@ void Client::sendLocalPlayerTransform()
         packet.WritePrimitive((int)cAssaultWeapon["Ammo"]);
     }
 
-    m_Unreliable.Send(packet);
+    m_Reliable.Send(packet);
 }
 
 void Client::identifyPacketLoss()

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

@@ -14,6 +14,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 +47,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);
@@ -161,7 +162,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);
     }
 }
 
@@ -171,7 +172,7 @@ void Server::sendSnapshot()
     Packet packet(MessageType::Snapshot);
     addInputCommandsToPacket(packet);
     addPlayersToPacket(packet, EntityID_Invalid);
-    unreliableBroadcast(packet);
+    reliableBroadcast(packet);
 }
 
 void Server::addInputCommandsToPacket(Packet& packet)
@@ -319,25 +320,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)
 {
@@ -351,7 +355,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;
     }
@@ -363,6 +367,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());
 
@@ -526,10 +535,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;
     }
@@ -567,7 +586,7 @@ 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;
@@ -586,7 +605,7 @@ void Server::parseOnInputCommand(Packet& packet)
 
 void Server::parsePlayerTransform(Packet& packet)
 {
-    PlayerID playerID = GetPlayerIDFromEndpoint();
+    PlayerID playerID = getPlayerIDFromEndpoint();
     if (playerID == -1) {
         return;
     }
@@ -630,12 +649,17 @@ bool Server::shouldSendToClient(EntityWrapper childEntity)
             return true;
         }
     }
-    return childEntity.HasComponent("Player") || childEntity.FirstParentWithComponent("Player").Valid()
-        || childEntity.HasComponent("CapturePoint") || childEntity.HasComponent("HealthPickup")
-        || childEntity.HasComponent("AmmoPickup");
+    return childEntity.HasComponent("Player")
+        || childEntity.FirstParentWithComponent("Player").Valid()
+        || childEntity.HasComponent("CapturePoint")
+        || childEntity.HasComponent("HealthPickup")
+        || childEntity.HasComponent("AmmoPickup")
+        || childEntity.HasComponent("ScoreScreen")
+        || childEntity.FirstParentWithComponent("ScoreScreen").Valid()
+        || childEntity.FirstParentWithComponent("CapturePoint").Valid();
 }
 
-PlayerID Server::GetPlayerIDFromEndpoint()
+PlayerID Server::getPlayerIDFromEndpoint()
 {
     // check both tcp and udp connection
     for (auto& kv : m_ConnectedPlayers) {
@@ -647,4 +671,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

@@ -74,7 +74,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 +85,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

@@ -45,7 +45,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,222 @@
 #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);
+}
+
+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& autoBlendQueue : m_AutoBlendQueues) {
+
+        if(autoBlendQueue.second.HasActiveBlendJob()) {
+            AutoBlendQueue::AutoBlendJob& blendJob = autoBlendQueue.second.GetActiveBlendJob();
+
+            std::shared_ptr<BlendTree> blendTree = autoBlendQueue.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);
+            }
+
+        }
+
+    }
+}
+
+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 = 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;
+
+    EntityWrapper nodeEntity = subTreeRoot.FirstChildByName(e.NodeName); // more than one
+    if (nodeEntity.Valid()) {
+        if (nodeEntity.HasComponent("Animation")) {
+            const Skeleton::Animation* animation = skeleton->GetAnimation(nodeEntity["Animation"]["AnimationName"]);
+            (bool&)nodeEntity["Animation"]["Reverse"] = e.Reverse;
+
+            if (e.Restart) {
+                if (animation != nullptr) {
+                    if (e.Restart) {
+                        if (e.Reverse) {
+                            (double&)nodeEntity["Animation"]["Time"] = animation->Duration;
+                        } else {
+                            (double&)nodeEntity["Animation"]["Time"] = 0.0;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    m_AutoBlendQueues[subTreeRoot].Insert(abj);
+    return true;
+}

src/Engine/Rendering/AutoBlendQueue.cpp

@@ -0,0 +1,195 @@
+#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 ((bool)autoBlendJob.AnimationEntity["Animation"]["Reverse"]) {
+                AnimationDuration = (animation->Duration * animationSpeed) - (animation->Duration - animationTime);
+            } else {
+                AnimationDuration = (animation->Duration * animationSpeed) - animationTime;
+            }
+
+            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,499 @@
+#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) {
+                break;
+            }
+        }
+    } 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;
+            }
+        }
+
+    }
+
+    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;
+}
+
+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/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,29 @@ 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));
-        }
+        glm::vec3 angles = glm::vec3(-glm::pitch(rotation), -glm::yaw(rotation), -glm::roll(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  + (glm::vec3)entity["BoneAttachment"]["OrientationOffset"];
+        }
+        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

@@ -45,6 +45,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 +54,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/DrawFinalPass.cpp

@@ -358,27 +358,28 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
             case RawModel::MaterialType::Basic:
 			case RawModel::MaterialType::SingleTextures:
 				{
-					if (explosionEffectJob->Model->IsSkinned()) {
+                    if (explosionEffectJob->Model->IsSkinned()) {
 
-						m_ExplosionEffectSkinnedProgram->Bind();
-						GLERROR("Bind ExplosionEffectSkinned program");
-						//bind uniforms
-						BindExplosionUniforms(explosionSkinnedHandle, explosionEffectJob, scene);
-						//bind textures
-						BindExplosionTextures(explosionSkinnedHandle, explosionEffectJob);
-						glActiveTexture(GL_TEXTURE5);
-						glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
-						glUniform3fv(glGetUniformLocation(explosionSkinnedHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
+                        m_ExplosionEffectSkinnedProgram->Bind();
+                        GLERROR("Bind ExplosionEffectSkinned program");
+                        //bind uniforms
+                        BindExplosionUniforms(explosionSkinnedHandle, explosionEffectJob, scene);
+                        //bind textures
+                        BindExplosionTextures(explosionSkinnedHandle, explosionEffectJob);
+                        glActiveTexture(GL_TEXTURE5);
+                        glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
+                        glUniform3fv(glGetUniformLocation(explosionSkinnedHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
 
-						std::vector<glm::mat4> frameBones;
-						if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-							frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
-						}
-						else {
-							frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
-						}
-						glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
-					}
+                        std::vector<glm::mat4> frameBones;
+                        if (explosionEffectJob->BlendTree != nullptr) {
+                            frameBones = explosionEffectJob->BlendTree->GetFinalPose();
+                        } else {
+                            frameBones = explosionEffectJob->Skeleton->GetTPose();
+                        }
+                        glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
+
+                    }
 					else {
 						m_ExplosionEffectProgram->Bind();
 						GLERROR("Bind ExplosionEffect program");
@@ -394,23 +395,23 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 			}
 			case RawModel::MaterialType::SplatMapping:
 				{
-					if (explosionEffectJob->Model->IsSkinned()) {
-						m_ExplosionEffectSplatMapSkinnedProgram->Bind();
-						GLERROR("Bind ExplosionEffectSplatMapSkinned program");
-						//bind uniforms
-						BindExplosionUniforms(explosionSplatMapSkinnedHandle, explosionEffectJob, scene);
-						//bind textures
-						BindExplosionTextures(explosionSplatMapSkinnedHandle, explosionEffectJob);
-						GLERROR("asdasd");
-						std::vector<glm::mat4> frameBones;
-						if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-							frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
-						}
-						else {
-							frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
-						}
-						glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
-					}
+                    if (explosionEffectJob->Model->IsSkinned()) {
+                        m_ExplosionEffectSplatMapSkinnedProgram->Bind();
+                        GLERROR("Bind ExplosionEffectSplatMapSkinned program");
+                        //bind uniforms
+                        BindExplosionUniforms(explosionSplatMapSkinnedHandle, explosionEffectJob, scene);
+                        //bind textures
+                        BindExplosionTextures(explosionSplatMapSkinnedHandle, explosionEffectJob);
+                        GLERROR("asdasd");
+                        std::vector<glm::mat4> frameBones;
+                        if (explosionEffectJob->BlendTree != nullptr) {
+                            frameBones = explosionEffectJob->BlendTree->GetFinalPose();
+                        } else {
+                            frameBones = explosionEffectJob->Skeleton->GetTPose();
+                        }
+                        glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
+                    }
 					else {
 						m_ExplosionEffectSplatMapProgram->Bind();
 						GLERROR("Bind ExplosionEffectSplatMap program");
@@ -451,17 +452,15 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 						glActiveTexture(GL_TEXTURE5);
 						glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
 						glUniform3fv(glGetUniformLocation(forwardSkinnedHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
-
-						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(forwardSkinnedHandle, "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(forwardSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                    }
 					else {
 						m_ForwardPlusProgram->Bind();
 						GLERROR("Bind ForwardPlusProgram");
@@ -485,14 +484,13 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 						//bind textures
 						BindModelTextures(forwardSplatMapSkinnedHandle, modelJob);
 						GLERROR("asdasd");
-						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(forwardSplatMapSkinnedHandle, "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(forwardSplatMapSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
 					}
 					else {
@@ -569,14 +567,14 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 							glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
 							glUniform3fv(glGetUniformLocation(explosionSkinnedShieldCheckHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
 
-							std::vector<glm::mat4> frameBones;
-							if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
-							}
-							else {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
-							}
-							glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                            std::vector<glm::mat4> frameBones;
+                            if (explosionEffectJob->BlendTree != nullptr) {
+                                frameBones = explosionEffectJob->BlendTree->GetFinalPose();
+                            } else {
+                                frameBones = explosionEffectJob->Skeleton->GetTPose();
+                            }
+                            glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
 						}
 						else {
 							m_ExplosionEffectShieldCheckProgram->Bind();
@@ -602,14 +600,14 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 							//bind textures
 							BindExplosionTextures(explosionSplatMapSkinnedShieldCheckHandle, explosionEffectJob);
 							GLERROR("asdasd");
-							std::vector<glm::mat4> frameBones;
-							if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
-							}
-							else {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
-							}
-							glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
+                            std::vector<glm::mat4> frameBones;
+                            if (explosionEffectJob->BlendTree != nullptr) {
+                                frameBones = explosionEffectJob->BlendTree->GetFinalPose();
+                            } else {
+                                frameBones = explosionEffectJob->Skeleton->GetTPose();
+                            }
+                            glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
 						}
 						else {
@@ -642,15 +640,14 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 							glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
 							glUniform3fv(glGetUniformLocation(explosionSkinnedHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
 
-							std::vector<glm::mat4> frameBones;
-							if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
-							}
-							else {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
-							}
-							glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
-						}
+                            std::vector<glm::mat4> frameBones;
+                            if (explosionEffectJob->BlendTree != nullptr) {
+                                frameBones = explosionEffectJob->BlendTree->GetFinalPose();
+                            } else {
+                                frameBones = explosionEffectJob->Skeleton->GetTPose();
+                            }
+                            glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                        }
 						else {
 							m_ExplosionEffectProgram->Bind();
 							GLERROR("Bind ExplosionEffect program");
@@ -674,14 +671,14 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 							//bind textures
 							BindExplosionTextures(explosionSplatMapSkinnedHandle, explosionEffectJob);
 							GLERROR("asdasd");
-							std::vector<glm::mat4> frameBones;
-							if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
-							}
-							else {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
-							}
-							glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                            std::vector<glm::mat4> frameBones;
+                            if (explosionEffectJob->BlendTree != nullptr) {
+                                frameBones = explosionEffectJob->BlendTree->GetFinalPose();
+                            } else {
+                                frameBones = explosionEffectJob->Skeleton->GetTPose();
+                            }
+                            glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
 						}
 						else {
 							m_ExplosionEffectSplatMapProgram->Bind();
@@ -726,14 +723,13 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 								glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
 								glUniform3fv(glGetUniformLocation(forwardSkinnedShieldCheckHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
 
-								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(forwardSkinnedShieldCheckHandle, "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(forwardSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
 							}
 							else {
@@ -759,15 +755,14 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 								//bind textures
 								BindModelTextures(forwardSplatMapSkinnedShieldCheckHandle, modelJob);
 								GLERROR("asdasd");
-								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(forwardSplatMapSkinnedShieldCheckHandle, "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(forwardSplatMapSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 							}
 							else {
 								m_ForwardPlusSplatMapShieldCheckProgram->Bind();
@@ -797,14 +792,13 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 								glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
 								glUniform3fv(glGetUniformLocation(forwardSkinnedHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
 
-								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(forwardSkinnedHandle, "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(forwardSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
 							}
 							else {
@@ -830,15 +824,14 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 								//bind textures
 								BindModelTextures(forwardSplatMapSkinnedHandle, modelJob);
 								GLERROR("asdasd");
-								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(forwardSplatMapSkinnedHandle, "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(forwardSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 							}
 							else {
 								m_ForwardPlusSplatMapProgram->Bind();
@@ -897,10 +890,10 @@ void DrawFinalPass::DrawShieldedModelRenderQueue(std::list<std::shared_ptr<Rende
             }
 
             std::vector<glm::mat4> frameBones;
-            if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-                frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
+            if (explosionEffectJob->BlendTree != nullptr) {
+                frameBones = explosionEffectJob->BlendTree->GetFinalPose();
             } else {
-                frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
+                frameBones = explosionEffectJob->Skeleton->GetTPose();
             }
             glUniformMatrix4fv(glGetUniformLocation(explosionHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
@@ -936,11 +929,12 @@ void DrawFinalPass::DrawShieldedModelRenderQueue(std::list<std::shared_ptr<Rende
                 BindModelTextures(forwardHandle ,modelJob);
 
                 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(forwardHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
 
@@ -972,10 +966,10 @@ void DrawFinalPass::DrawToDepthStencilBuffer(std::list<std::shared_ptr<RenderJob
             glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
 
             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(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 

src/Engine/Rendering/PickingPass.cpp

@@ -104,16 +104,15 @@ 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) {
-
-                    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));
@@ -162,13 +161,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));
@@ -218,11 +215,12 @@ void PickingPass::Draw(RenderScene& scene)
                 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 {
@@ -322,16 +320,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/Renderer.cpp

@@ -17,7 +17,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);

src/Engine/Rendering/SSAOPass.cpp

@@ -56,6 +56,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 +65,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 +74,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 +83,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/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,41 @@ 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 &child : bone->Children) {
-		PrintSkeleton(child, depthCount);
-	}
+    for (auto &kv : Bones) {
+        delete kv.second;
+    }
 }
 
-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;
+    }
+}