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

move the m_maxAppliedImpulse into base class, and use it for motor strength/point to point constraint strength

Browse Source
This commit is contained in:
erwin.coumans
2013-10-22 21:49:52 +00:00
parent f22ceecb82
commit 0024c87316
8 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp
View File

@@ -23,9 +23,9 @@ subject to the following restrictions:
btMultiBodyJointMotor::btMultiBodyJointMotor(btMultiBody* body, int link, btScalar desiredVelocity, btScalar maxMotorImpulse)
:btMultiBodyConstraint(body,body,link,link,1,true),
m_desiredVelocity(desiredVelocity),
m_maxMotorImpulse(maxMotorImpulse)
m_desiredVelocity(desiredVelocity)
{
m_maxAppliedImpulse = maxMotorImpulse;
// the data.m_jacobians never change, so may as well
// initialize them here
@@ -82,7 +82,7 @@ void btMultiBodyJointMotor::createConstraintRows(btMultiBodyConstraintArray& con
btMultiBodySolverConstraint& constraintRow = constraintRows.expandNonInitializing();
btScalar penetration = 0;
fillConstraintRowMultiBodyMultiBody(constraintRow,data,jacobianA(row),jacobianB(row),infoGlobal,m_desiredVelocity,-m_maxMotorImpulse,m_maxMotorImpulse);
fillConstraintRowMultiBodyMultiBody(constraintRow,data,jacobianA(row),jacobianB(row),infoGlobal,m_desiredVelocity,-m_maxAppliedImpulse,m_maxAppliedImpulse);
}
}