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

Use the more accurate, but slightly slower, gjk ray test by default, instead of the sub-simplex convex cast.

Browse Source 
Set the rayCallback.m_flag  btTriangleRaycastCallback::kF_UseSubSimplexConvexCastRaytest to enable the previous approximate/faster ray test.
This commit is contained in:
erwin.coumans@gmail.com
2013-10-19 16:42:17 +00:00
parent d998680a68
commit 5bd6decb2e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -294,10 +294,10 @@ void btCollisionWorld::rayTestSingleInternal(const btTransform& rayFromTrans,con
//btContinuousConvexCollision convexCaster(castShape,convexShape,&simplexSolver,0); //btContinuousConvexCollision convexCaster(castShape,convexShape,&simplexSolver,0);
bool condition = true; bool condition = true;
btConvexCast* convexCasterPtr = 0; btConvexCast* convexCasterPtr = 0;
if (resultCallback.m_flags & btTriangleRaycastCallback::kF_UseGjkConvexRaytest) if (resultCallback.m_flags & btTriangleRaycastCallback::kF_UseSubSimplexConvexCastRaytest)
convexCasterPtr = &gjkConvexCaster;
else
convexCasterPtr = &subSimplexConvexCaster; convexCasterPtr = &subSimplexConvexCaster;
else
convexCasterPtr = &gjkConvexCaster;
btConvexCast& convexCaster = *convexCasterPtr; btConvexCast& convexCaster = *convexCasterPtr;

2
src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
View File

@@ -35,7 +35,7 @@ public:
kF_None = 0, kF_None = 0,
kF_FilterBackfaces = 1 << 0, kF_FilterBackfaces = 1 << 0,
kF_KeepUnflippedNormal = 1 << 1, // Prevents returned face normal getting flipped when a ray hits a back-facing triangle kF_KeepUnflippedNormal = 1 << 1, // Prevents returned face normal getting flipped when a ray hits a back-facing triangle
kF_UseGjkConvexRaytest = 1 << 2, // Uses a more accurate but slightly slower ray versus convex algorithm kF_UseSubSimplexConvexCastRaytest = 1 << 2, // Uses an approximate but faster ray versus convex intersection algorithm
kF_Terminator = 0xFFFFFFFF kF_Terminator = 0xFFFFFFFF
}; };
unsigned int m_flags; unsigned int m_flags;