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

# Conflicts: # include/Engine/Collision/Collision.h # include/Engine/Collision/CollisionSystem.h # include/Engine/Collision/TriggerSystem.h # resources/Schema/Components.xsd # resources/Schema/Entities/CollisionTestLevel.xml # resources/Schema/Types/Entity.xsd # src/Engine/Collision/Collision.cpp # src/Game/Game.cpp
2016-01-15 20:28:43 +01:00
parent bbabc84127 d28583ca9e
commit b2213dbe9a
64 changed files with 2719 additions and 365 deletions
@@ -265,11 +265,11 @@ bool attachAABBComponentFromModel(World* world, EntityID id)
        return false;
    }

-    glm::mat4 modelMatrix = modelRes->m_Matrix;
+    glm::mat4 modelMatrix = modelRes->Matrix();

    glm::vec3 mini = glm::vec3(INFINITY, INFINITY, INFINITY);
    glm::vec3 maxi = glm::vec3(-INFINITY, -INFINITY, -INFINITY);
-    for (const auto& v : modelRes->m_Vertices) {
+    for (const auto& v : modelRes->Vertices()) {
        const auto& wPos = modelMatrix * glm::vec4(v.Position.x, v.Position.y, v.Position.z, 1);
        maxi.x = std::max(wPos.x, maxi.x);
        maxi.y = std::max(wPos.y, maxi.y);