From db086a4d89fa8d8db9de7e688ebc52317218992e Mon Sep 17 00:00:00 2001 From: scrawl Date: Thu, 2 Oct 2014 17:21:46 +0200 Subject: [PATCH] Remove unused PairCachingGhostObject --- libs/openengine/bullet/physic.cpp | 6 ------ libs/openengine/bullet/physic.hpp | 16 ---------------- 2 files changed, 22 deletions(-) diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp index 97418fae0..b4d5e49a5 100644 --- a/libs/openengine/bullet/physic.cpp +++ b/libs/openengine/bullet/physic.cpp @@ -226,11 +226,6 @@ namespace Physic // The actual physics solver solver = new btSequentialImpulseConstraintSolver; - //btOverlappingPairCache* pairCache = new btSortedOverlappingPairCache(); - pairCache = new btSortedOverlappingPairCache(); - - //pairCache->setInternalGhostPairCallback( new btGhostPairCallback() ); - broadphase = new btDbvtBroadphase(); // The world. @@ -341,7 +336,6 @@ namespace Physic delete collisionConfiguration; delete dispatcher; delete broadphase; - delete pairCache; delete mShapeLoader; delete BulletShapeManager::getSingletonPtr(); diff --git a/libs/openengine/bullet/physic.hpp b/libs/openengine/bullet/physic.hpp index e330a7621..0d280c4fe 100644 --- a/libs/openengine/bullet/physic.hpp +++ b/libs/openengine/bullet/physic.hpp @@ -49,21 +49,6 @@ namespace Physic CollisionType_Raycasting = 1<<3 //Still used? }; - /** - *This is just used to be able to name objects. - */ - class PairCachingGhostObject : public btPairCachingGhostObject - { - public: - PairCachingGhostObject(std::string name) - :btPairCachingGhostObject(),mName(name) - { - } - virtual ~PairCachingGhostObject(){} - - std::string mName; - }; - /** *This class is just an extension of normal btRigidBody in order to add extra info. *When bullet give back a btRigidBody, you can just do a static_cast to RigidBody, @@ -317,7 +302,6 @@ namespace Physic btCollisionObject *object); //Bullet Stuff - btOverlappingPairCache* pairCache; btBroadphaseInterface* broadphase; btDefaultCollisionConfiguration* collisionConfiguration; btSequentialImpulseConstraintSolver* solver;