Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix missing colObjWrap

Browse Source
This commit is contained in:
Ryan Huffman
2015-11-16 15:48:08 -08:00
committed by Andrew Meadows
parent af442778a6
commit 25ee137390
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
View File

@@ -796,14 +796,16 @@ void btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape,
struct btCompoundLeafCallback : btDbvt::ICollide struct btCompoundLeafCallback : btDbvt::ICollide
{ {
btCompoundLeafCallback( btCompoundLeafCallback(
const btConvexShape* castShape, const btCollisionObjectWrapper* colObjWrap,
const btTransform& convexFromTrans, const btConvexShape* castShape,
const btTransform& convexToTrans, const btTransform& convexFromTrans,
btScalar allowedPenetration, const btTransform& convexToTrans,
const btCompoundShape* compoundShape, btScalar allowedPenetration,
const btTransform& colObjWorldTransform, const btCompoundShape* compoundShape,
ConvexResultCallback& resultCallback) const btTransform& colObjWorldTransform,
: ConvexResultCallback& resultCallback)
:
m_colObjWrap(colObjWrap),
m_castShape(castShape), m_castShape(castShape),
m_convexFromTrans(convexFromTrans), m_convexFromTrans(convexFromTrans),
m_convexToTrans(convexToTrans), m_convexToTrans(convexToTrans),
@@ -813,6 +815,7 @@ void btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape,
m_resultCallback(resultCallback) { m_resultCallback(resultCallback) {
} }
const btCollisionObjectWrapper* m_colObjWrap;
const btConvexShape* m_castShape; const btConvexShape* m_castShape;
const btTransform& m_convexFromTrans; const btTransform& m_convexFromTrans;
const btTransform& m_convexToTrans; const btTransform& m_convexToTrans;
@@ -820,7 +823,6 @@ void btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape,
const btCompoundShape* m_compoundShape; const btCompoundShape* m_compoundShape;
const btTransform& m_colObjWorldTransform; const btTransform& m_colObjWorldTransform;
ConvexResultCallback& m_resultCallback; ConvexResultCallback& m_resultCallback;
const btCollisionObjectWrapper* m_colObjWrap;
public: public:
@@ -885,7 +887,7 @@ void btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape,
const btDbvt* tree = compoundShape->getDynamicAabbTree(); const btDbvt* tree = compoundShape->getDynamicAabbTree();
if (tree) { if (tree) {
btCompoundLeafCallback callback { castShape, convexFromTrans, convexToTrans, btCompoundLeafCallback callback { colObjWrap, castShape, convexFromTrans, convexToTrans,
allowedPenetration, compoundShape, colObjWorldTransform, resultCallback }; allowedPenetration, compoundShape, colObjWorldTransform, resultCallback };
const ATTRIBUTE_ALIGNED16(btDbvtVolume) bounds = btDbvtVolume::FromMM(fromLocalAabbMin, fromLocalAabbMax); const ATTRIBUTE_ALIGNED16(btDbvtVolume) bounds = btDbvtVolume::FromMM(fromLocalAabbMin, fromLocalAabbMax);
tree->collideTV(tree->m_root, bounds, callback); tree->collideTV(tree->m_root, bounds, callback);