AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2025-01-10 17:30:12 +00:00
Code Issues Releases Wiki Activity

Provide the index of the btCompoundShape child hit during a rayTest, available as "LocalShapeInfo.m_triangleIndex"

Browse Source 
Thanks sparkprime for the patch. See http://code.google.com/p/bullet/issues/detail?id=332 and
http://code.google.com/p/bullet/issues/detail?id=214
This commit is contained in:
erwin.coumans 2010-01-19 05:50:14 +00:00
parent ab91e6a8b5
commit 086f80b206
1 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,11 +432,33 @@ void btCollisionWorld::rayTestSingle(const btTransform& rayFromTrans,const btTra
// replace collision shape so that callback can determine the triangle
btCollisionShape* saveCollisionShape = collisionObject->getCollisionShape();
collisionObject->internalSetTemporaryCollisionShape((btCollisionShape*)childCollisionShape);
struct LocalInfoAdder2 : public RayResultCallback {
int m_i;
RayResultCallback* m_userCallback;
LocalInfoAdder2 (int i, RayResultCallback *user)
: m_i(i), m_userCallback(user)
{
}
virtual btScalar addSingleResult (btCollisionWorld::LocalRayResult &r, bool b)
{
btCollisionWorld::LocalShapeInfo shapeInfo;
shapeInfo.m_shapePart = -1;
shapeInfo.m_triangleIndex = m_i;
if (r.m_localShapeInfo == NULL)
r.m_localShapeInfo = &shapeInfo;
return m_userCallback->addSingleResult(r, b);
}
};
LocalInfoAdder2 my_cb(i, &resultCallback);
my_cb.m_closestHitFraction = resultCallback.m_closestHitFraction;
rayTestSingle(rayFromTrans,rayToTrans,
collisionObject,
childCollisionShape,
childWorldTrans,
resultCallback);
my_cb);
// restore
collisionObject->internalSetTemporaryCollisionShape(saveCollisionShape);
}
@ -632,11 +654,31 @@ void btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const bt
// replace collision shape so that callback can determine the triangle
btCollisionShape* saveCollisionShape = collisionObject->getCollisionShape();
collisionObject->internalSetTemporaryCollisionShape((btCollisionShape*)childCollisionShape);
struct LocalInfoAdder : public ConvexResultCallback {
ConvexResultCallback* m_userCallback;
int m_i;
LocalInfoAdder (int i, ConvexResultCallback *user)
: m_userCallback(user),m_i(i) { }
virtual btScalar addSingleResult (btCollisionWorld::LocalConvexResult& r, bool b)
{
btCollisionWorld::LocalShapeInfo shapeInfo;
shapeInfo.m_shapePart = -1;
shapeInfo.m_triangleIndex = m_i;
if (r.m_localShapeInfo == NULL)
r.m_localShapeInfo = &shapeInfo;
return m_userCallback->addSingleResult(r, b);
}
};
LocalInfoAdder my_cb(i, &resultCallback);
my_cb.m_closestHitFraction = resultCallback.m_closestHitFraction;
objectQuerySingle(castShape, convexFromTrans,convexToTrans,
collisionObject,
childCollisionShape,
childWorldTrans,
resultCallback, allowedPenetration);
my_cb, allowedPenetration);
// restore
collisionObject->internalSetTemporaryCollisionShape(saveCollisionShape);
}