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

fix many warnings

Browse Source 
remove btMultiSapBroadphase.*
make collisionFilterGroup/collisionFilterMark int (instead of short int)
This commit is contained in:
Erwin Coumans
2017-01-15 22:26:11 -08:00
parent e3df00d5f1
commit c0c4c8ba3f
146 changed files with 830 additions and 1431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp
View File

@@ -602,7 +602,7 @@ void btMultiBodyConstraintSolver::setupMultiBodyTorsionalFrictionConstraint(btMu
relaxation = infoGlobal.m_sor;
btScalar invTimeStep = btScalar(1)/infoGlobal.m_timeStep;
// btScalar invTimeStep = btScalar(1)/infoGlobal.m_timeStep;
if (multiBodyA)
@@ -817,7 +817,6 @@ void btMultiBodyConstraintSolver::setupMultiBodyTorsionalFrictionConstraint(btMu
{
btScalar positionalError = 0.f;
btScalar velocityError = restitution - rel_vel;// * damping; //note for friction restitution is always set to 0 (check above) so it is acutally velocityError = -rel_vel for friction
if (penetration>0)