From ec7e94e3005837e33593f28c00762263375e512d Mon Sep 17 00:00:00 2001 From: "chappuis.daniel" Date: Fri, 20 Nov 2009 13:51:47 +0000 Subject: [PATCH] git-svn-id: https://reactphysics3d.googlecode.com/svn/trunk@211 92aac97c-a6ce-11dd-a772-7fcde58d38e6 --- .../reactphysics3d/collision/CollisionDetection.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sources/reactphysics3d/collision/CollisionDetection.cpp b/sources/reactphysics3d/collision/CollisionDetection.cpp index 93301f2e..7db7603a 100644 --- a/sources/reactphysics3d/collision/CollisionDetection.cpp +++ b/sources/reactphysics3d/collision/CollisionDetection.cpp @@ -19,8 +19,8 @@ // Libraries #include "CollisionDetection.h" -#include "SeparatingAxisAABB.h" -#include "SeparatingAxisOBB.h" +#include "NoBroadPhaseAlgorithm.h" +#include "NarrowPhaseSATAlgorithm.h" #include "../body/OBB.h" #include "../body/RigidBody.h" #include @@ -32,10 +32,10 @@ using namespace reactphysics3d; CollisionDetection::CollisionDetection() { // Construct the broad-phase algorithm that will be used (Separating axis with AABB) - broadPhaseAlgorithm = new SeparatingAxisAABB(); + broadPhaseAlgorithm = new NoBroadPhaseAlgorithm(); // Construct the narrow-phase algorithm that will be used (Separating axis with OBB) - narrowPhaseAlgorithm = new SeparatingAxisOBB(); + narrowPhaseAlgorithm = new NarrowPhaseSATAlgorithm(); } // Destructor @@ -65,7 +65,7 @@ bool CollisionDetection::computeCollisionDetection(CollisionWorld* collisionWorl Contact* contact = 0; // Use the narrow-phase algorithm to check if the two bodies really collide - if(narrowPhaseAlgorithm->testCollision(&obb1, &obb2, &contact, velocity1, velocity2, timeMax)) { + if(narrowPhaseAlgorithm->testCollision(&obb1, &obb2, &contact)) { assert(contact != 0); // Add the new collision contact into the collision world