BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes after merge.

Browse Source
This commit is contained in:
William Moberg
2016-03-14 01:00:58 +01:00
parent 562afac9d1
commit dea57b4872
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Collision/Collision.cpp
+1 -1
View File
@@ -570,7 +570,7 @@ Output AABBvsTriangles(const AABB& box,
bool resolveCollision) bool resolveCollision)
{ {
if (!modelVertices) { if (!modelVertices) {
return false; return Output::OutSeparated;
} }
bool intersect = false; bool intersect = false;
Output out = Output::OutContained; Output out = Output::OutContained;
src/Engine/Collision/TriggerSystem.cpp
+2 -2
View File
@@ -38,8 +38,8 @@ void TriggerSystem::UpdateComponent(EntityWrapper& triggerEntity, ComponentWrapp
? Collision::Output::OutContained ? Collision::Output::OutContained
: Collision::AABBvsTrianglesWContainment( : Collision::AABBvsTrianglesWContainment(
colliderBox, colliderBox,
triggerModel->Vertices(), triggerModel->CollisionVertices(),
triggerModel->m_Indices, triggerModel->CollisionIndices(),
triggerModelMat); triggerModelMat);
if (colliderFitsInTrigger && Collision::AABBVsAABB(completelyInsideBox, colliderBox) && out == Collision::Output::OutContained) { if (colliderFitsInTrigger && Collision::AABBVsAABB(completelyInsideBox, colliderBox) && out == Collision::Output::OutContained) {