mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: https://reactphysics3d.googlecode.com/svn/trunk@211 92aac97c-a6ce-11dd-a772-7fcde58d38e6

Browse Source
This commit is contained in:
chappuis.daniel 2009-11-20 13:51:47 +00:00
parent 09d03cdc70
commit ec7e94e300
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sources/reactphysics3d/collision/CollisionDetection.cpp
View File

@ -19,8 +19,8 @@
// Libraries // Libraries
#include "CollisionDetection.h" #include "CollisionDetection.h"
#include "SeparatingAxisAABB.h" #include "NoBroadPhaseAlgorithm.h"
#include "SeparatingAxisOBB.h" #include "NarrowPhaseSATAlgorithm.h"
#include "../body/OBB.h" #include "../body/OBB.h"
#include "../body/RigidBody.h" #include "../body/RigidBody.h"
#include <cassert> #include <cassert>
@ -32,10 +32,10 @@ using namespace reactphysics3d;
CollisionDetection::CollisionDetection() { CollisionDetection::CollisionDetection() {
// Construct the broad-phase algorithm that will be used (Separating axis with AABB) // 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) // Construct the narrow-phase algorithm that will be used (Separating axis with OBB)
narrowPhaseAlgorithm = new SeparatingAxisOBB(); narrowPhaseAlgorithm = new NarrowPhaseSATAlgorithm();
} }
// Destructor // Destructor
@ -65,7 +65,7 @@ bool CollisionDetection::computeCollisionDetection(CollisionWorld* collisionWorl
Contact* contact = 0; Contact* contact = 0;
// Use the narrow-phase algorithm to check if the two bodies really collide // 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); assert(contact != 0);
// Add the new collision contact into the collision world // Add the new collision contact into the collision world