mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 14:45:33 +00:00
Code Issues Releases Wiki Activity

ContactTestResultCallback: do not rely on col1 being the object tested against

Browse source 
Unsure why, but in some cases col0 and col1 are swapped.
This commit is contained in:
scrawl 2015-11-18 20:41:49 +01:00
parent 3453353091
commit 9fce428929
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwphysics/physicssystem.cpp
View file

@ -936,6 +936,13 @@ namespace MWPhysics
class ContactTestResultCallback : public btCollisionWorld::ContactResultCallback
{
public:
ContactTestResultCallback(const btCollisionObject* testedAgainst)
: mTestedAgainst(testedAgainst)
{
}
const btCollisionObject* mTestedAgainst;
std::vector<MWWorld::Ptr> mResult;
#if BT_BULLET_VERSION >= 281
@ -944,11 +951,15 @@ namespace MWPhysics
const btCollisionObjectWrapper* col1Wrap,int partId1,int index1)
{
const btCollisionObject* collisionObject = col0Wrap->m_collisionObject;
if (collisionObject == mTestedAgainst)
collisionObject = col1Wrap->m_collisionObject;
#else
virtual btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObject* col0, int partId0, int index0,
const btCollisionObject* col1, int partId1, int index1)
{
const btCollisionObject* collisionObject = col0;
if (collisionObject == mTestedAgainst)
collisionObject = col1;
#endif
const PtrHolder* holder = static_cast<const PtrHolder*>(collisionObject->getUserPointer());
if (holder)
@ -967,7 +978,7 @@ namespace MWPhysics
else
return std::vector<MWWorld::Ptr>();
ContactTestResultCallback resultCallback;
ContactTestResultCallback resultCallback (me);
resultCallback.m_collisionFilterGroup = collisionGroup;
resultCallback.m_collisionFilterMask = collisionMask;
mCollisionWorld->contactTest(me, resultCallback);