mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-21 09:11:33 +00:00
Code Issues Releases Wiki Activity

Fix old bullet versions

Browse source
This commit is contained in:
scrawl 2013-04-28 16:19:40 +02:00
parent 6ecd88af14
commit 2e1dda9010
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libs/openengine/bullet/physic.cpp
View file

@ -513,7 +513,11 @@ namespace Physic
{ {
public: public:
std::vector<std::string> mResult; std::vector<std::string> mResult;
virtual btScalar addSingleResult(btManifoldPoint& cp,
// added in bullet 2.81
// this is just a quick hack, as there does not seem to be a BULLET_VERSION macro?
#if defined(BT_COLLISION_OBJECT_WRAPPER_H)
virtual btScalar addSingleResult(btManifoldPoint& cp,
const btCollisionObjectWrapper* colObj0Wrap,int partId0,int index0, const btCollisionObjectWrapper* colObj0Wrap,int partId0,int index0,
const btCollisionObjectWrapper* colObj1Wrap,int partId1,int index1) const btCollisionObjectWrapper* colObj1Wrap,int partId1,int index1)
{ {
@ -522,8 +526,8 @@ namespace Physic
mResult.push_back(body->mName); mResult.push_back(body->mName);
return 0.f; return 0.f;
} }
#else
virtual btScalar addSingleResult(btManifoldPoint&, const btCollisionObject* col0, int partId0, int index0, virtual btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObject* col0, int partId0, int index0,
const btCollisionObject* col1, int partId1, int index1) const btCollisionObject* col1, int partId1, int index1)
{ {
const RigidBody* body = dynamic_cast<const RigidBody*>(col0); const RigidBody* body = dynamic_cast<const RigidBody*>(col0);
@ -531,6 +535,7 @@ namespace Physic
mResult.push_back(body->mName); mResult.push_back(body->mName);
return 0.f; return 0.f;
} }
#endif
}; };
std::vector<std::string> PhysicEngine::getCollisions(const std::string& name) std::vector<std::string> PhysicEngine::getCollisions(const std::string& name)