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

minor cleanup

Browse Source
This commit is contained in:
Andrew Meadows
2016-04-27 13:41:42 -07:00
parent 76d39d4439
commit 8d970e5c04
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -860,8 +860,7 @@ void btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape,
btCollisionObjectWrapper tmpObj(m_colObjWrap, childCollisionShape, m_colObjWrap->getCollisionObject(), childWorldTrans, -1, index); btCollisionObjectWrapper tmpObj(m_colObjWrap, childCollisionShape, m_colObjWrap->getCollisionObject(), childWorldTrans, -1, index);
objectQuerySingleInternal(m_castShape, m_convexFromTrans, m_convexToTrans, objectQuerySingleInternal(m_castShape, m_convexFromTrans, m_convexToTrans, &tmpObj, my_cb, m_allowedPenetration);
&tmpObj, my_cb, m_allowedPenetration);
} }
void Process(const btDbvtNode* leaf) void Process(const btDbvtNode* leaf)
@@ -869,7 +868,6 @@ void btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape,
// Processing leaf node // Processing leaf node
int index = leaf->dataAsInt; int index = leaf->dataAsInt;
//const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(m_compoundColObjWrap->getCollisionShape());
btTransform childTrans = m_compoundShape->getChildTransform(index); btTransform childTrans = m_compoundShape->getChildTransform(index);
const btCollisionShape* childCollisionShape = m_compoundShape->getChildShape(index); const btCollisionShape* childCollisionShape = m_compoundShape->getChildShape(index);
@@ -889,11 +887,10 @@ void btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape,
fromLocalAabbMin.setMin(toLocalAabbMin); fromLocalAabbMin.setMin(toLocalAabbMin);
fromLocalAabbMax.setMax(toLocalAabbMax); fromLocalAabbMax.setMax(toLocalAabbMax);
const btDbvt* tree = compoundShape->getDynamicAabbTree();
btCompoundLeafCallback callback(colObjWrap, castShape, convexFromTrans, convexToTrans, btCompoundLeafCallback callback(colObjWrap, castShape, convexFromTrans, convexToTrans,
allowedPenetration, compoundShape, colObjWorldTransform, resultCallback); allowedPenetration, compoundShape, colObjWorldTransform, resultCallback);
const btDbvt* tree = compoundShape->getDynamicAabbTree();
if (tree) { if (tree) {
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);