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

bugfix, also convert rigidbody into solverbodies for constraints (without contact manifolds), and do additional check for validity

Browse Source
This commit is contained in:
ejcoumans
2007-03-17 08:29:05 +00:00
parent 5e5046404f
commit b8ce13adb1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
View File

@@ -373,7 +373,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio
int sizeofSC = sizeof(btSolverConstraint); int sizeofSC = sizeof(btSolverConstraint);
if (numManifolds) if (1)
{ {
//if m_stackAlloc, try to pack bodies/constraints to speed up solving //if m_stackAlloc, try to pack bodies/constraints to speed up solving
// btBlock* sablock; // btBlock* sablock;
@@ -674,22 +674,22 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio
btTypedConstraint* constraint = constraints[j]; btTypedConstraint* constraint = constraints[j];
///todo: use solver bodies, so we don't need to copy from/to btRigidBody ///todo: use solver bodies, so we don't need to copy from/to btRigidBody
if (constraint->getRigidBodyA().getIslandTag() >= 0) if ((constraint->getRigidBodyA().getIslandTag() >= 0) && (constraint->getRigidBodyA().getCompanionId() >= 0))
{ {
tmpSolverBodyPool[constraint->getRigidBodyA().getCompanionId()].writebackVelocity(); tmpSolverBodyPool[constraint->getRigidBodyA().getCompanionId()].writebackVelocity();
} }
if (constraint->getRigidBodyB().getIslandTag() >= 0) if ((constraint->getRigidBodyB().getIslandTag() >= 0) && (constraint->getRigidBodyB().getCompanionId() >= 0))
{ {
tmpSolverBodyPool[constraint->getRigidBodyB().getCompanionId()].writebackVelocity(); tmpSolverBodyPool[constraint->getRigidBodyB().getCompanionId()].writebackVelocity();
} }
constraint->solveConstraint(info.m_timeStep); constraint->solveConstraint(info.m_timeStep);
if (constraint->getRigidBodyA().getIslandTag() >= 0) if ((constraint->getRigidBodyA().getIslandTag() >= 0) && (constraint->getRigidBodyA().getCompanionId() >= 0))
{ {
tmpSolverBodyPool[constraint->getRigidBodyA().getCompanionId()].readVelocity(); tmpSolverBodyPool[constraint->getRigidBodyA().getCompanionId()].readVelocity();
} }
if (constraint->getRigidBodyB().getIslandTag() >= 0) if ((constraint->getRigidBodyB().getIslandTag() >= 0) && (constraint->getRigidBodyB().getCompanionId() >= 0))
{ {
tmpSolverBodyPool[constraint->getRigidBodyB().getCompanionId()].readVelocity(); tmpSolverBodyPool[constraint->getRigidBodyB().getCompanionId()].readVelocity();
} }