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

re-enabled m_maxEdgeAngleThreshold and m_edgeDistanceThreshold

Browse Source
This commit is contained in:
erwin.coumans
2011-04-07 16:46:22 +00:00
parent d80805d40c
commit e6044a1086
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
View File

@@ -556,13 +556,13 @@ void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObject*
btVector3 upfix=tri_normal * btVector3(0.1f,0.1f,0.1f); btVector3 upfix=tri_normal * btVector3(0.1f,0.1f,0.1f);
btDebugDrawLine(tr * v0 + upfix, tr * v1 + upfix, red ); btDebugDrawLine(tr * v0 + upfix, tr * v1 + upfix, red );
#endif #endif
//if (btFabs(info->m_edgeV0V1Angle)< triangleInfoMapPtr->m_maxEdgeAngleThreshold) if (btFabs(info->m_edgeV0V1Angle)< triangleInfoMapPtr->m_maxEdgeAngleThreshold)
{ {
#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW #ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
btDebugDrawLine(tr*contact,tr*(contact+cp.m_normalWorldOnB*10),black); btDebugDrawLine(tr*contact,tr*(contact+cp.m_normalWorldOnB*10),black);
#endif #endif
btScalar len = (contact-nearest).length(); btScalar len = (contact-nearest).length();
//if(len<triangleInfoMapPtr->m_edgeDistanceThreshold) if(len<triangleInfoMapPtr->m_edgeDistanceThreshold)
if( bestedge==0 ) if( bestedge==0 )
{ {
btVector3 edge(v0-v1); btVector3 edge(v0-v1);
@@ -636,7 +636,7 @@ void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObject*
btDebugDrawLine(tr * v1 + upfix, tr * v2 + upfix , green ); btDebugDrawLine(tr * v1 + upfix, tr * v2 + upfix , green );
#endif #endif
//if (btFabs(info->m_edgeV1V2Angle)< triangleInfoMapPtr->m_maxEdgeAngleThreshold) if (btFabs(info->m_edgeV1V2Angle)< triangleInfoMapPtr->m_maxEdgeAngleThreshold)
{ {
#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW #ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
btDebugDrawLine(tr*contact,tr*(contact+cp.m_normalWorldOnB*10),black); btDebugDrawLine(tr*contact,tr*(contact+cp.m_normalWorldOnB*10),black);
@@ -645,7 +645,7 @@ void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObject*
btScalar len = (contact-nearest).length(); btScalar len = (contact-nearest).length();
//if(len<triangleInfoMapPtr->m_edgeDistanceThreshold) if(len<triangleInfoMapPtr->m_edgeDistanceThreshold)
if( bestedge==1 ) if( bestedge==1 )
{ {
isNearEdge = true; isNearEdge = true;
@@ -722,7 +722,7 @@ void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObject*
btDebugDrawLine(tr * v2 + upfix, tr * v0 + upfix , blue ); btDebugDrawLine(tr * v2 + upfix, tr * v0 + upfix , blue );
#endif #endif
//if (btFabs(info->m_edgeV2V0Angle)< triangleInfoMapPtr->m_maxEdgeAngleThreshold) if (btFabs(info->m_edgeV2V0Angle)< triangleInfoMapPtr->m_maxEdgeAngleThreshold)
{ {
#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW #ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
@@ -730,7 +730,7 @@ void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObject*
#endif //BT_INTERNAL_EDGE_DEBUG_DRAW #endif //BT_INTERNAL_EDGE_DEBUG_DRAW
btScalar len = (contact-nearest).length(); btScalar len = (contact-nearest).length();
//if(len<triangleInfoMapPtr->m_edgeDistanceThreshold) if(len<triangleInfoMapPtr->m_edgeDistanceThreshold)
if( bestedge==2 ) if( bestedge==2 )
{ {
isNearEdge = true; isNearEdge = true;