Fixes after merge.

2016-03-14 01:00:58 +01:00
parent 562afac9d1
commit dea57b4872
2 changed files with 3 additions and 3 deletions
@@ -570,7 +570,7 @@ Output AABBvsTriangles(const AABB& box,
    bool resolveCollision)
 {
    if (!modelVertices) {
-        return false;
+        return Output::OutSeparated;
    }
    bool intersect = false;
    Output out = Output::OutContained;
@@ -38,8 +38,8 @@ void TriggerSystem::UpdateComponent(EntityWrapper& triggerEntity, ComponentWrapp
                ? Collision::Output::OutContained 
                : Collision::AABBvsTrianglesWContainment(
                colliderBox,
-                triggerModel->Vertices(),
-                triggerModel->m_Indices,
+                triggerModel->CollisionVertices(),
+                triggerModel->CollisionIndices(),
                triggerModelMat);

            if (colliderFitsInTrigger && Collision::AABBVsAABB(completelyInsideBox, colliderBox) && out == Collision::Output::OutContained) {