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

assign proper index when removing a child shape from btCompoundShape

Browse Source 
Thanks to sparkprime for the report and fix in Issue 354
See http://code.google.com/p/bullet/issues/detail?id=354
Fix a few warnings
This commit is contained in:
erwin.coumans
2010-03-12 05:32:57 +00:00
parent f250fd21c5
commit 192a2b38e9
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
View File

@@ -114,6 +114,8 @@ public:
void ProcessChildShape(btCollisionShape* childShape,int index) void ProcessChildShape(btCollisionShape* childShape,int index)
{ {
btAssert(index>=0);
btAssert(index<compoundShape->getNumChildShapes());
btCompoundShape* compoundShape = static_cast<btCompoundShape*>(m_compoundColObj->getCollisionShape()); btCompoundShape* compoundShape = static_cast<btCompoundShape*>(m_compoundColObj->getCollisionShape());

2
src/BulletCollision/CollisionShapes/btCompoundShape.cpp
View File

@@ -110,6 +110,8 @@ void btCompoundShape::removeChildShapeByIndex(int childShapeIndex)
m_dynamicAabbTree->remove(m_children[childShapeIndex].m_node); m_dynamicAabbTree->remove(m_children[childShapeIndex].m_node);
} }
m_children.swap(childShapeIndex,m_children.size()-1); m_children.swap(childShapeIndex,m_children.size()-1);
if (m_dynamicAabbTree)
m_children[childShapeIndex].m_node->dataAsInt = childShapeIndex;
m_children.pop_back(); m_children.pop_back();
} }

6
src/BulletDynamics/Character/btKinematicCharacterController.cpp
View File

@@ -216,7 +216,7 @@ void btKinematicCharacterController::stepUp ( btCollisionWorld* world)
{ {
// phase 1: up // phase 1: up
btTransform start, end; btTransform start, end;
m_targetPosition = m_currentPosition + getUpAxisDirections()[m_upAxis] * (m_stepHeight + (m_verticalOffset > 0.0?m_verticalOffset:0.0)); m_targetPosition = m_currentPosition + getUpAxisDirections()[m_upAxis] * (m_stepHeight + (m_verticalOffset > btScalar(0.0)?m_verticalOffset:btScalar(0.0)));
start.setIdentity (); start.setIdentity ();
end.setIdentity (); end.setIdentity ();
@@ -381,9 +381,9 @@ void btKinematicCharacterController::stepDown ( btCollisionWorld* collisionWorld
btTransform start, end; btTransform start, end;
// phase 3: down // phase 3: down
btScalar additionalDownStep = (m_wasOnGround /*&& !onGround()*/) ? m_stepHeight : 0.0; btScalar additionalDownStep = (m_wasOnGround /*&& !onGround()*/) ? m_stepHeight : btScalar(0.0);
btVector3 step_drop = getUpAxisDirections()[m_upAxis] * (m_currentStepOffset + additionalDownStep); btVector3 step_drop = getUpAxisDirections()[m_upAxis] * (m_currentStepOffset + additionalDownStep);
btScalar downVelocity = (additionalDownStep == 0.0 && m_verticalVelocity<0.0?-m_verticalVelocity:0.0) * dt; btScalar downVelocity = (additionalDownStep == btScalar(0.0) && m_verticalVelocity<btScalar(0.0)?-m_verticalVelocity:btScalar(0.0)) * dt;
btVector3 gravity_drop = getUpAxisDirections()[m_upAxis] * downVelocity; btVector3 gravity_drop = getUpAxisDirections()[m_upAxis] * downVelocity;
m_targetPosition -= (step_drop + gravity_drop); m_targetPosition -= (step_drop + gravity_drop);