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

Update tests of collision world according to changes in collision detection

Browse Source
This commit is contained in:
Daniel Chappuis 2017-01-09 21:34:31 +01:00
parent 4a97c2ca97
commit c7e977250d
2 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
test/tests/collision/TestCollisionWorld.h
View File

@ -28,6 +28,7 @@
// Libraries // Libraries
#include "reactphysics3d.h" #include "reactphysics3d.h"
#include "Test.h"
/// Reactphysics3D namespace /// Reactphysics3D namespace
namespace reactphysics3d { namespace reactphysics3d {
@ -70,28 +71,28 @@ class WorldCollisionCallback : public CollisionCallback
} }
// This method will be called for contact // This method will be called for contact
virtual void notifyContact(const ContactPointInfo& contactPointInfo) override { virtual void notifyContact(const CollisionCallbackInfo& collisionCallbackInfo) override {
if (isContactBetweenBodies(boxBody, sphere1Body, contactPointInfo)) { if (isContactBetweenBodies(boxBody, sphere1Body, collisionCallbackInfo)) {
boxCollideWithSphere1 = true; boxCollideWithSphere1 = true;
} }
else if (isContactBetweenBodies(boxBody, cylinderBody, contactPointInfo)) { else if (isContactBetweenBodies(boxBody, cylinderBody, collisionCallbackInfo)) {
boxCollideWithCylinder = true; boxCollideWithCylinder = true;
} }
else if (isContactBetweenBodies(sphere1Body, cylinderBody, contactPointInfo)) { else if (isContactBetweenBodies(sphere1Body, cylinderBody, collisionCallbackInfo)) {
sphere1CollideWithCylinder = true; sphere1CollideWithCylinder = true;
} }
else if (isContactBetweenBodies(sphere1Body, sphere2Body, contactPointInfo)) { else if (isContactBetweenBodies(sphere1Body, sphere2Body, collisionCallbackInfo)) {
sphere1CollideWithSphere2 = true; sphere1CollideWithSphere2 = true;
} }
} }
bool isContactBetweenBodies(const CollisionBody* body1, const CollisionBody* body2, bool isContactBetweenBodies(const CollisionBody* body1, const CollisionBody* body2,
const ContactPointInfo& contactPointInfo) { const CollisionCallbackInfo& collisionCallbackInfo) {
return (contactPointInfo.shape1->getBody()->getID() == body1->getID() && return (collisionCallbackInfo.body1->getID() == body1->getID() &&
contactPointInfo.shape2->getBody()->getID() == body2->getID()) || collisionCallbackInfo.body2->getID() == body2->getID()) ||
(contactPointInfo.shape2->getBody()->getID() == body1->getID() && (collisionCallbackInfo.body2->getID() == body1->getID() &&
contactPointInfo.shape1->getBody()->getID() == body2->getID()); collisionCallbackInfo.body1->getID() == body2->getID());
} }
}; };
@ -197,10 +198,10 @@ class TestCollisionWorld : public Test {
test(!mWorld->testAABBOverlap(mSphere1Body, mCylinderBody)); test(!mWorld->testAABBOverlap(mSphere1Body, mCylinderBody));
test(!mWorld->testAABBOverlap(mSphere1Body, mSphere2Body)); test(!mWorld->testAABBOverlap(mSphere1Body, mSphere2Body));
test(mWorld->testAABBOverlap(mBoxProxyShape, mSphere1ProxyShape)); test(mBoxProxyShape->testAABBOverlap(mSphere1ProxyShape->getWorldAABB()));
test(mWorld->testAABBOverlap(mBoxProxyShape, mCylinderProxyShape)); test(mBoxProxyShape->testAABBOverlap(mCylinderProxyShape->getWorldAABB()));
test(!mWorld->testAABBOverlap(mSphere1ProxyShape, mCylinderProxyShape)); test(!mSphere1ProxyShape->testAABBOverlap(mCylinderProxyShape->getWorldAABB()));
test(!mWorld->testAABBOverlap(mSphere1ProxyShape, mSphere2ProxyShape)); test(!mSphere1ProxyShape->testAABBOverlap(mSphere2ProxyShape->getWorldAABB()));
mCollisionCallback.reset(); mCollisionCallback.reset();
mWorld->testCollision(mCylinderBody, &mCollisionCallback); mWorld->testCollision(mCylinderBody, &mCollisionCallback);
@ -223,20 +224,6 @@ class TestCollisionWorld : public Test {
test(!mCollisionCallback.sphere1CollideWithCylinder); test(!mCollisionCallback.sphere1CollideWithCylinder);
test(!mCollisionCallback.sphere1CollideWithSphere2); test(!mCollisionCallback.sphere1CollideWithSphere2);
mCollisionCallback.reset();
mWorld->testCollision(mCylinderProxyShape, &mCollisionCallback);
test(!mCollisionCallback.boxCollideWithSphere1);
test(mCollisionCallback.boxCollideWithCylinder);
test(!mCollisionCallback.sphere1CollideWithCylinder);
test(!mCollisionCallback.sphere1CollideWithSphere2);
mCollisionCallback.reset();
mWorld->testCollision(mBoxProxyShape, mCylinderProxyShape, &mCollisionCallback);
test(!mCollisionCallback.boxCollideWithSphere1);
test(mCollisionCallback.boxCollideWithCylinder);
test(!mCollisionCallback.sphere1CollideWithCylinder);
test(!mCollisionCallback.sphere1CollideWithSphere2);
// Move sphere 1 to collide with sphere 2 // Move sphere 1 to collide with sphere 2
mSphere1Body->setTransform(Transform(Vector3(30, 15, 10), Quaternion::identity())); mSphere1Body->setTransform(Transform(Vector3(30, 15, 10), Quaternion::identity()));
@ -282,10 +269,10 @@ class TestCollisionWorld : public Test {
test(!mWorld->testAABBOverlap(mSphere1Body, mCylinderBody)); test(!mWorld->testAABBOverlap(mSphere1Body, mCylinderBody));
test(!mWorld->testAABBOverlap(mSphere1Body, mSphere2Body)); test(!mWorld->testAABBOverlap(mSphere1Body, mSphere2Body));
test(!mWorld->testAABBOverlap(mBoxProxyShape, mSphere1ProxyShape)); test(!mBoxProxyShape->testAABBOverlap(mSphere1ProxyShape->getWorldAABB()));
test(!mWorld->testAABBOverlap(mBoxProxyShape, mCylinderProxyShape)); test(!mBoxProxyShape->testAABBOverlap(mCylinderProxyShape->getWorldAABB()));
test(!mWorld->testAABBOverlap(mSphere1ProxyShape, mCylinderProxyShape)); test(!mSphere1ProxyShape->testAABBOverlap(mCylinderProxyShape->getWorldAABB()));
test(!mWorld->testAABBOverlap(mSphere1ProxyShape, mSphere2ProxyShape)); test(!mSphere1ProxyShape->testAABBOverlap(mSphere2ProxyShape->getWorldAABB()));
mBoxBody->setIsActive(true); mBoxBody->setIsActive(true);
mCylinderBody->setIsActive(true); mCylinderBody->setIsActive(true);

6
test/tests/collision/TestDynamicAABBTree.h
View File

@ -34,7 +34,7 @@
/// Reactphysics3D namespace /// Reactphysics3D namespace
namespace reactphysics3d { namespace reactphysics3d {
class OverlapCallback : public DynamicAABBTreeOverlapCallback { class TestOverlapCallback : public DynamicAABBTreeOverlapCallback {
public : public :
@ -86,11 +86,9 @@ class TestDynamicAABBTree : public Test {
// ---------- Atributes ---------- // // ---------- Atributes ---------- //
OverlapCallback mOverlapCallback; TestOverlapCallback mOverlapCallback;
DynamicTreeRaycastCallback mRaycastCallback; DynamicTreeRaycastCallback mRaycastCallback;
public : public :
// ---------- Methods ---------- // // ---------- Methods ---------- //