AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2024-12-14 05:40:05 +00:00
Code Issues Releases Wiki Activity

Fixed constraint for btMultiBody and btRigidBody.

Browse Source
This commit is contained in:
yunfeibai 2016-08-15 13:19:00 -07:00
parent e982b2b5dd
commit 9c4cfde3d6
12 changed files with 708 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
examples/MultiBody/MultiDofDemo.cpp
View File

@ -10,6 +10,7 @@
#include "BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h" #include "BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h"
#include "BulletDynamics/Featherstone/btMultiBodyJointMotor.h" #include "BulletDynamics/Featherstone/btMultiBodyJointMotor.h"
#include "BulletDynamics/Featherstone/btMultiBodyPoint2Point.h" #include "BulletDynamics/Featherstone/btMultiBodyPoint2Point.h"
#include "BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h"
#include "../OpenGLWindow/GLInstancingRenderer.h" #include "../OpenGLWindow/GLInstancingRenderer.h"
#include "BulletCollision/CollisionShapes/btShapeHull.h" #include "BulletCollision/CollisionShapes/btShapeHull.h"
@ -134,7 +135,8 @@ void MultiDofDemo::initPhysics()
bool spherical = true; //set it ot false -to use 1DoF hinges instead of 3DoF sphericals bool spherical = true; //set it ot false -to use 1DoF hinges instead of 3DoF sphericals
bool multibodyOnly = false; bool multibodyOnly = false;
bool canSleep = true; bool canSleep = true;
bool selfCollide = false; bool selfCollide = false;
bool multibodyConstraint = true;
btVector3 linkHalfExtents(0.05, 0.37, 0.1); btVector3 linkHalfExtents(0.05, 0.37, 0.1);
btVector3 baseHalfExtents(0.05, 0.37, 0.1); btVector3 baseHalfExtents(0.05, 0.37, 0.1);
@ -236,7 +238,18 @@ void MultiDofDemo::initPhysics()
m_dynamicsWorld->addRigidBody(body);//,1,1+2); m_dynamicsWorld->addRigidBody(body);//,1,1+2);
if (multibodyConstraint) {
btVector3 pointInA = -linkHalfExtents;
btVector3 pointInB = halfExtents;
btMatrix3x3 frameInA;
btMatrix3x3 frameInB;
frameInA.setIdentity();
frameInB.setIdentity();
btMultiBodyFixedConstraint* p2p = new btMultiBodyFixedConstraint(mbC,numLinks-1,body,pointInA,pointInB,frameInA,frameInB);
//btMultiBodyFixedConstraint* p2p = new btMultiBodyFixedConstraint(mbC,numLinks-1,mbC,numLinks-4,pointInA,pointInA,frameInA,frameInB);
p2p->setMaxAppliedImpulse(2.0);
m_dynamicsWorld->addMultiBodyConstraint(p2p);
}
} }
m_guiHelper->autogenerateGraphicsObjects(m_dynamicsWorld); m_guiHelper->autogenerateGraphicsObjects(m_dynamicsWorld);

2
src/BulletDynamics/CMakeLists.txt
View File

@ -32,6 +32,7 @@ SET(BulletDynamics_SRCS
Featherstone/btMultiBodyJointLimitConstraint.cpp Featherstone/btMultiBodyJointLimitConstraint.cpp
Featherstone/btMultiBodyConstraint.cpp Featherstone/btMultiBodyConstraint.cpp
Featherstone/btMultiBodyPoint2Point.cpp Featherstone/btMultiBodyPoint2Point.cpp
Featherstone/btMultiBodyFixedConstraint.cpp
Featherstone/btMultiBodyJointMotor.cpp Featherstone/btMultiBodyJointMotor.cpp
MLCPSolvers/btDantzigLCP.cpp MLCPSolvers/btDantzigLCP.cpp
MLCPSolvers/btMLCPSolver.cpp MLCPSolvers/btMLCPSolver.cpp
@ -89,6 +90,7 @@ SET(Featherstone_HDRS
Featherstone/btMultiBodyJointLimitConstraint.h Featherstone/btMultiBodyJointLimitConstraint.h
Featherstone/btMultiBodyConstraint.h Featherstone/btMultiBodyConstraint.h
Featherstone/btMultiBodyPoint2Point.h Featherstone/btMultiBodyPoint2Point.h
Featherstone/btMultiBodyFixedConstraint.h
Featherstone/btMultiBodyJointMotor.h Featherstone/btMultiBodyJointMotor.h
) )

16
src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h
View File

@ -319,14 +319,6 @@ protected:
const btTransform& transA,const btTransform& transB,const btVector3& linVelA,const btVector3& linVelB,const btVector3& angVelA,const btVector3& angVelB, const btTransform& transA,const btTransform& transB,const btVector3& linVelA,const btVector3& linVelB,const btVector3& angVelA,const btVector3& angVelB,
btConstraintInfo2* info, int row, btVector3& ax1, int rotational, int rotAllowed = false); btConstraintInfo2* info, int row, btVector3& ax1, int rotational, int rotAllowed = false);
static btScalar btGetMatrixElem(const btMatrix3x3& mat, int index);
static bool matrixToEulerXYZ(const btMatrix3x3& mat,btVector3& xyz);
static bool matrixToEulerXZY(const btMatrix3x3& mat,btVector3& xyz);
static bool matrixToEulerYXZ(const btMatrix3x3& mat,btVector3& xyz);
static bool matrixToEulerYZX(const btMatrix3x3& mat,btVector3& xyz);
static bool matrixToEulerZXY(const btMatrix3x3& mat,btVector3& xyz);
static bool matrixToEulerZYX(const btMatrix3x3& mat,btVector3& xyz);
public: public:
BT_DECLARE_ALIGNED_ALLOCATOR(); BT_DECLARE_ALIGNED_ALLOCATOR();
@ -489,6 +481,14 @@ public:
//If no axis is provided, it uses the default axis for this constraint. //If no axis is provided, it uses the default axis for this constraint.
virtual void setParam(int num, btScalar value, int axis = -1); virtual void setParam(int num, btScalar value, int axis = -1);
virtual btScalar getParam(int num, int axis = -1) const; virtual btScalar getParam(int num, int axis = -1) const;
static btScalar btGetMatrixElem(const btMatrix3x3& mat, int index);
static bool matrixToEulerXYZ(const btMatrix3x3& mat,btVector3& xyz);
static bool matrixToEulerXZY(const btMatrix3x3& mat,btVector3& xyz);
static bool matrixToEulerYXZ(const btMatrix3x3& mat,btVector3& xyz);
static bool matrixToEulerYZX(const btMatrix3x3& mat,btVector3& xyz);
static bool matrixToEulerZXY(const btMatrix3x3& mat,btVector3& xyz);
static bool matrixToEulerZYX(const btMatrix3x3& mat,btVector3& xyz);
}; };

10
src/BulletDynamics/Featherstone/btMultiBody.cpp
View File

@ -466,6 +466,16 @@ btVector3 btMultiBody::worldDirToLocal(int i, const btVector3 &world_dir) const
} }
} }
btMatrix3x3 btMultiBody::localFrameToWorld(int i, const btMatrix3x3 &local_frame) const
{
btMatrix3x3 result = local_frame;
btVector3 frameInWorld0 = localDirToWorld(i, local_frame.getColumn(0));
btVector3 frameInWorld1 = localDirToWorld(i, local_frame.getColumn(1));
btVector3 frameInWorld2 = localDirToWorld(i, local_frame.getColumn(2));
result.setValue(frameInWorld0[0], frameInWorld1[0], frameInWorld2[0], frameInWorld0[1], frameInWorld1[1], frameInWorld2[1], frameInWorld0[2], frameInWorld1[2], frameInWorld2[2]);
return result;
}
void btMultiBody::compTreeLinkVelocities(btVector3 *omega, btVector3 *vel) const void btMultiBody::compTreeLinkVelocities(btVector3 *omega, btVector3 *vel) const
{ {
int num_links = getNumLinks(); int num_links = getNumLinks();

6
src/BulletDynamics/Featherstone/btMultiBody.h
View File

@ -272,7 +272,11 @@ public:
btVector3 localDirToWorld(int i, const btVector3 &vec) const; btVector3 localDirToWorld(int i, const btVector3 &vec) const;
btVector3 worldPosToLocal(int i, const btVector3 &vec) const; btVector3 worldPosToLocal(int i, const btVector3 &vec) const;
btVector3 worldDirToLocal(int i, const btVector3 &vec) const; btVector3 worldDirToLocal(int i, const btVector3 &vec) const;
//
// transform a frame in local coordinate to a frame in world coordinate
//
btMatrix3x3 localFrameToWorld(int i, const btMatrix3x3 &mat) const;
// //
// calculate kinetic energy and angular momentum // calculate kinetic energy and angular momentum

668
src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp
View File

@ -53,323 +53,359 @@ void btMultiBodyConstraint::applyDeltaVee(btMultiBodyJacobianData& data, btScala
} }
btScalar btMultiBodyConstraint::fillMultiBodyConstraint( btMultiBodySolverConstraint& solverConstraint, btScalar btMultiBodyConstraint::fillMultiBodyConstraint( btMultiBodySolverConstraint& solverConstraint,
btMultiBodyJacobianData& data, btMultiBodyJacobianData& data,
btScalar* jacOrgA, btScalar* jacOrgB, btScalar* jacOrgA, btScalar* jacOrgB,
const btVector3& contactNormalOnB, const btVector3& constraintNormalAng,
const btVector3& posAworld, const btVector3& posBworld, const btVector3& constraintNormalLin,
btScalar posError, const btVector3& posAworld, const btVector3& posBworld,
const btContactSolverInfo& infoGlobal, btScalar posError,
btScalar lowerLimit, btScalar upperLimit, const btContactSolverInfo& infoGlobal,
btScalar relaxation, btScalar lowerLimit, btScalar upperLimit,
bool isFriction, btScalar desiredVelocity, btScalar cfmSlip) bool angConstraint,
btScalar relaxation,
bool isFriction, btScalar desiredVelocity, btScalar cfmSlip)
{ {
solverConstraint.m_multiBodyA = m_bodyA;
solverConstraint.m_multiBodyB = m_bodyB;
solverConstraint.m_multiBodyA = m_bodyA; solverConstraint.m_linkA = m_linkA;
solverConstraint.m_multiBodyB = m_bodyB; solverConstraint.m_linkB = m_linkB;
solverConstraint.m_linkA = m_linkA;
solverConstraint.m_linkB = m_linkB; btMultiBody* multiBodyA = solverConstraint.m_multiBodyA;
btMultiBody* multiBodyB = solverConstraint.m_multiBodyB;
btMultiBody* multiBodyA = solverConstraint.m_multiBodyA;
btMultiBody* multiBodyB = solverConstraint.m_multiBodyB; btSolverBody* bodyA = multiBodyA ? 0 : &data.m_solverBodyPool->at(solverConstraint.m_solverBodyIdA);
btSolverBody* bodyB = multiBodyB ? 0 : &data.m_solverBodyPool->at(solverConstraint.m_solverBodyIdB);
btSolverBody* bodyA = multiBodyA ? 0 : &data.m_solverBodyPool->at(solverConstraint.m_solverBodyIdA);
btSolverBody* bodyB = multiBodyB ? 0 : &data.m_solverBodyPool->at(solverConstraint.m_solverBodyIdB); btRigidBody* rb0 = multiBodyA ? 0 : bodyA->m_originalBody;
btRigidBody* rb1 = multiBodyB ? 0 : bodyB->m_originalBody;
btRigidBody* rb0 = multiBodyA ? 0 : bodyA->m_originalBody;
btRigidBody* rb1 = multiBodyB ? 0 : bodyB->m_originalBody; btVector3 rel_pos1, rel_pos2; //these two used to be inited to posAworld and posBworld (respectively) but it does not seem necessary
if (bodyA)
btVector3 rel_pos1, rel_pos2; //these two used to be inited to posAworld and posBworld (respectively) but it does not seem necessary rel_pos1 = posAworld - bodyA->getWorldTransform().getOrigin();
if (bodyA) if (bodyB)
rel_pos1 = posAworld - bodyA->getWorldTransform().getOrigin(); rel_pos2 = posBworld - bodyB->getWorldTransform().getOrigin();
if (bodyB)
rel_pos2 = posBworld - bodyB->getWorldTransform().getOrigin(); if (multiBodyA)
{
if (multiBodyA) if (solverConstraint.m_linkA<0)
{ {
if (solverConstraint.m_linkA<0) rel_pos1 = posAworld - multiBodyA->getBasePos();
{ } else
rel_pos1 = posAworld - multiBodyA->getBasePos(); {
} else rel_pos1 = posAworld - multiBodyA->getLink(solverConstraint.m_linkA).m_cachedWorldTransform.getOrigin();
{ }
rel_pos1 = posAworld - multiBodyA->getLink(solverConstraint.m_linkA).m_cachedWorldTransform.getOrigin();
} const int ndofA = multiBodyA->getNumDofs() + 6;
const int ndofA = multiBodyA->getNumDofs() + 6; solverConstraint.m_deltaVelAindex = multiBodyA->getCompanionId();
solverConstraint.m_deltaVelAindex = multiBodyA->getCompanionId(); if (solverConstraint.m_deltaVelAindex <0)
{
if (solverConstraint.m_deltaVelAindex <0) solverConstraint.m_deltaVelAindex = data.m_deltaVelocities.size();
{ multiBodyA->setCompanionId(solverConstraint.m_deltaVelAindex);
solverConstraint.m_deltaVelAindex = data.m_deltaVelocities.size(); data.m_deltaVelocities.resize(data.m_deltaVelocities.size()+ndofA);
multiBodyA->setCompanionId(solverConstraint.m_deltaVelAindex); } else
data.m_deltaVelocities.resize(data.m_deltaVelocities.size()+ndofA); {
} else btAssert(data.m_deltaVelocities.size() >= solverConstraint.m_deltaVelAindex+ndofA);
{ }
btAssert(data.m_deltaVelocities.size() >= solverConstraint.m_deltaVelAindex+ndofA);
} //determine jacobian of this 1D constraint in terms of multibodyA's degrees of freedom
//resize..
//determine jacobian of this 1D constraint in terms of multibodyA's degrees of freedom solverConstraint.m_jacAindex = data.m_jacobians.size();
//resize.. data.m_jacobians.resize(data.m_jacobians.size()+ndofA);
solverConstraint.m_jacAindex = data.m_jacobians.size(); //copy/determine
data.m_jacobians.resize(data.m_jacobians.size()+ndofA); if(jacOrgA)
//copy/determine {
if(jacOrgA) for (int i=0;i<ndofA;i++)
{ data.m_jacobians[solverConstraint.m_jacAindex+i] = jacOrgA[i];
for (int i=0;i<ndofA;i++) }
data.m_jacobians[solverConstraint.m_jacAindex+i] = jacOrgA[i]; else
} {
else btScalar* jac1=&data.m_jacobians[solverConstraint.m_jacAindex];
{ //multiBodyA->fillContactJacobianMultiDof(solverConstraint.m_linkA, posAworld, constraintNormalLin, jac1, data.scratch_r, data.scratch_v, data.scratch_m);
btScalar* jac1=&data.m_jacobians[solverConstraint.m_jacAindex]; multiBodyA->fillConstraintJacobianMultiDof(solverConstraint.m_linkA, posAworld, constraintNormalAng, constraintNormalLin, jac1, data.scratch_r, data.scratch_v, data.scratch_m);
multiBodyA->fillContactJacobianMultiDof(solverConstraint.m_linkA, posAworld, contactNormalOnB, jac1, data.scratch_r, data.scratch_v, data.scratch_m); }
}
//determine the velocity response of multibodyA to reaction impulses of this constraint (i.e. A[i,i] for i=1,...n_con: multibody's inverse inertia with respect to this 1D constraint)
//determine the velocity response of multibodyA to reaction impulses of this constraint (i.e. A[i,i] for i=1,...n_con: multibody's inverse inertia with respect to this 1D constraint) //resize..
//resize.. data.m_deltaVelocitiesUnitImpulse.resize(data.m_deltaVelocitiesUnitImpulse.size()+ndofA); //=> each constraint row has the constrained tree dofs allocated in m_deltaVelocitiesUnitImpulse
data.m_deltaVelocitiesUnitImpulse.resize(data.m_deltaVelocitiesUnitImpulse.size()+ndofA); //=> each constraint row has the constrained tree dofs allocated in m_deltaVelocitiesUnitImpulse btAssert(data.m_jacobians.size() == data.m_deltaVelocitiesUnitImpulse.size());
btAssert(data.m_jacobians.size() == data.m_deltaVelocitiesUnitImpulse.size()); btScalar* delta = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex];
btScalar* delta = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex]; //determine..
//determine.. multiBodyA->calcAccelerationDeltasMultiDof(&data.m_jacobians[solverConstraint.m_jacAindex],delta,data.scratch_r, data.scratch_v);
multiBodyA->calcAccelerationDeltasMultiDof(&data.m_jacobians[solverConstraint.m_jacAindex],delta,data.scratch_r, data.scratch_v);
btVector3 torqueAxis0;
btVector3 torqueAxis0 = rel_pos1.cross(contactNormalOnB); if (angConstraint) {
solverConstraint.m_relpos1CrossNormal = torqueAxis0; torqueAxis0 = constraintNormalAng;
solverConstraint.m_contactNormal1 = contactNormalOnB; }
} else {
else //if(rb0) torqueAxis0 = rel_pos1.cross(constraintNormalLin);
{
btVector3 torqueAxis0 = rel_pos1.cross(contactNormalOnB); }
solverConstraint.m_angularComponentA = rb0 ? rb0->getInvInertiaTensorWorld()*torqueAxis0*rb0->getAngularFactor() : btVector3(0,0,0); solverConstraint.m_relpos1CrossNormal = torqueAxis0;
solverConstraint.m_relpos1CrossNormal = torqueAxis0; solverConstraint.m_contactNormal1 = constraintNormalLin;
solverConstraint.m_contactNormal1 = contactNormalOnB; }
} else //if(rb0)
{
if (multiBodyB) btVector3 torqueAxis0;
{ if (angConstraint) {
if (solverConstraint.m_linkB<0) torqueAxis0 = constraintNormalAng;
{ }
rel_pos2 = posBworld - multiBodyB->getBasePos(); else {
} else torqueAxis0 = rel_pos1.cross(constraintNormalLin);
{ }
rel_pos2 = posBworld - multiBodyB->getLink(solverConstraint.m_linkB).m_cachedWorldTransform.getOrigin(); solverConstraint.m_angularComponentA = rb0 ? rb0->getInvInertiaTensorWorld()*torqueAxis0*rb0->getAngularFactor() : btVector3(0,0,0);
} solverConstraint.m_relpos1CrossNormal = torqueAxis0;
solverConstraint.m_contactNormal1 = constraintNormalLin;
const int ndofB = multiBodyB->getNumDofs() + 6; }
solverConstraint.m_deltaVelBindex = multiBodyB->getCompanionId(); if (multiBodyB)
if (solverConstraint.m_deltaVelBindex <0) {
{ if (solverConstraint.m_linkB<0)
solverConstraint.m_deltaVelBindex = data.m_deltaVelocities.size(); {
multiBodyB->setCompanionId(solverConstraint.m_deltaVelBindex); rel_pos2 = posBworld - multiBodyB->getBasePos();
data.m_deltaVelocities.resize(data.m_deltaVelocities.size()+ndofB); } else
} {
rel_pos2 = posBworld - multiBodyB->getLink(solverConstraint.m_linkB).m_cachedWorldTransform.getOrigin();
//determine jacobian of this 1D constraint in terms of multibodyB's degrees of freedom }
//resize..
solverConstraint.m_jacBindex = data.m_jacobians.size(); const int ndofB = multiBodyB->getNumDofs() + 6;
data.m_jacobians.resize(data.m_jacobians.size()+ndofB);
//copy/determine.. solverConstraint.m_deltaVelBindex = multiBodyB->getCompanionId();
if(jacOrgB) if (solverConstraint.m_deltaVelBindex <0)
{ {
for (int i=0;i<ndofB;i++) solverConstraint.m_deltaVelBindex = data.m_deltaVelocities.size();
data.m_jacobians[solverConstraint.m_jacBindex+i] = jacOrgB[i]; multiBodyB->setCompanionId(solverConstraint.m_deltaVelBindex);
} data.m_deltaVelocities.resize(data.m_deltaVelocities.size()+ndofB);
else }
{
multiBodyB->fillContactJacobianMultiDof(solverConstraint.m_linkB, posBworld, -contactNormalOnB, &data.m_jacobians[solverConstraint.m_jacBindex], data.scratch_r, data.scratch_v, data.scratch_m); //determine jacobian of this 1D constraint in terms of multibodyB's degrees of freedom
} //resize..
solverConstraint.m_jacBindex = data.m_jacobians.size();
//determine velocity response of multibodyB to reaction impulses of this constraint (i.e. A[i,i] for i=1,...n_con: multibody's inverse inertia with respect to this 1D constraint) data.m_jacobians.resize(data.m_jacobians.size()+ndofB);
//resize.. //copy/determine..
data.m_deltaVelocitiesUnitImpulse.resize(data.m_deltaVelocitiesUnitImpulse.size()+ndofB); if(jacOrgB)
btAssert(data.m_jacobians.size() == data.m_deltaVelocitiesUnitImpulse.size()); {
btScalar* delta = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex]; for (int i=0;i<ndofB;i++)
//determine.. data.m_jacobians[solverConstraint.m_jacBindex+i] = jacOrgB[i];
multiBodyB->calcAccelerationDeltasMultiDof(&data.m_jacobians[solverConstraint.m_jacBindex],delta,data.scratch_r, data.scratch_v); }
else
btVector3 torqueAxis1 = rel_pos2.cross(contactNormalOnB); {
solverConstraint.m_relpos2CrossNormal = -torqueAxis1; //multiBodyB->fillContactJacobianMultiDof(solverConstraint.m_linkB, posBworld, -constraintNormalLin, &data.m_jacobians[solverConstraint.m_jacBindex], data.scratch_r, data.scratch_v, data.scratch_m);
solverConstraint.m_contactNormal2 = -contactNormalOnB; multiBodyB->fillConstraintJacobianMultiDof(solverConstraint.m_linkB, posBworld, -constraintNormalAng, -constraintNormalLin, &data.m_jacobians[solverConstraint.m_jacBindex], data.scratch_r, data.scratch_v, data.scratch_m);
}
}
else //if(rb1) //determine velocity response of multibodyB to reaction impulses of this constraint (i.e. A[i,i] for i=1,...n_con: multibody's inverse inertia with respect to this 1D constraint)
{ //resize..
btVector3 torqueAxis1 = rel_pos2.cross(contactNormalOnB); data.m_deltaVelocitiesUnitImpulse.resize(data.m_deltaVelocitiesUnitImpulse.size()+ndofB);
solverConstraint.m_angularComponentB = rb1 ? rb1->getInvInertiaTensorWorld()*-torqueAxis1*rb1->getAngularFactor() : btVector3(0,0,0); btAssert(data.m_jacobians.size() == data.m_deltaVelocitiesUnitImpulse.size());
solverConstraint.m_relpos2CrossNormal = -torqueAxis1; btScalar* delta = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex];
solverConstraint.m_contactNormal2 = -contactNormalOnB; //determine..
} multiBodyB->calcAccelerationDeltasMultiDof(&data.m_jacobians[solverConstraint.m_jacBindex],delta,data.scratch_r, data.scratch_v);
{
btVector3 torqueAxis1;
btVector3 vec; if (angConstraint) {
btScalar denom0 = 0.f; torqueAxis1 = constraintNormalAng;
btScalar denom1 = 0.f; }
btScalar* jacB = 0; else {
btScalar* jacA = 0; torqueAxis1 = rel_pos2.cross(constraintNormalLin);
btScalar* deltaVelA = 0; }
btScalar* deltaVelB = 0; solverConstraint.m_relpos2CrossNormal = -torqueAxis1;
int ndofA = 0; solverConstraint.m_contactNormal2 = -constraintNormalLin;
//determine the "effective mass" of the constrained multibodyA with respect to this 1D constraint (i.e. 1/A[i,i]) }
if (multiBodyA) else //if(rb1)
{ {
ndofA = multiBodyA->getNumDofs() + 6; btVector3 torqueAxis1;
jacA = &data.m_jacobians[solverConstraint.m_jacAindex]; if (angConstraint) {
deltaVelA = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex]; torqueAxis1 = constraintNormalAng;
for (int i = 0; i < ndofA; ++i) }
{ else {
btScalar j = jacA[i] ; torqueAxis1 = rel_pos2.cross(constraintNormalLin);
btScalar l = deltaVelA[i]; }
denom0 += j*l; solverConstraint.m_angularComponentB = rb1 ? rb1->getInvInertiaTensorWorld()*-torqueAxis1*rb1->getAngularFactor() : btVector3(0,0,0);
} solverConstraint.m_relpos2CrossNormal = -torqueAxis1;
} solverConstraint.m_contactNormal2 = -constraintNormalLin;
else if(rb0) }
{ {
vec = ( solverConstraint.m_angularComponentA).cross(rel_pos1);
denom0 = rb0->getInvMass() + contactNormalOnB.dot(vec); btVector3 vec;
} btScalar denom0 = 0.f;
// btScalar denom1 = 0.f;
if (multiBodyB) btScalar* jacB = 0;
{ btScalar* jacA = 0;
const int ndofB = multiBodyB->getNumDofs() + 6; btScalar* deltaVelA = 0;
jacB = &data.m_jacobians[solverConstraint.m_jacBindex]; btScalar* deltaVelB = 0;
deltaVelB = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex]; int ndofA = 0;
for (int i = 0; i < ndofB; ++i) //determine the "effective mass" of the constrained multibodyA with respect to this 1D constraint (i.e. 1/A[i,i])
{ if (multiBodyA)
btScalar j = jacB[i] ; {
btScalar l = deltaVelB[i]; ndofA = multiBodyA->getNumDofs() + 6;
denom1 += j*l; jacA = &data.m_jacobians[solverConstraint.m_jacAindex];
} deltaVelA = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex];
for (int i = 0; i < ndofA; ++i)
} {
else if(rb1) btScalar j = jacA[i] ;
{ btScalar l = deltaVelA[i];
vec = ( -solverConstraint.m_angularComponentB).cross(rel_pos2); denom0 += j*l;
denom1 = rb1->getInvMass() + contactNormalOnB.dot(vec); }
} }
else if(rb0)
// {
btScalar d = denom0+denom1; vec = ( solverConstraint.m_angularComponentA).cross(rel_pos1);
if (d>SIMD_EPSILON) if (angConstraint) {
{ denom0 = rb0->getInvMass() + constraintNormalAng.dot(vec);
solverConstraint.m_jacDiagABInv = relaxation/(d); }
} else {
else denom0 = rb0->getInvMass() + constraintNormalLin.dot(vec);
{ }
//disable the constraint row to handle singularity/redundant constraint }
solverConstraint.m_jacDiagABInv = 0.f; //
} if (multiBodyB)
} {
const int ndofB = multiBodyB->getNumDofs() + 6;
jacB = &data.m_jacobians[solverConstraint.m_jacBindex];
//compute rhs and remaining solverConstraint fields deltaVelB = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex];
btScalar penetration = isFriction? 0 : posError+infoGlobal.m_linearSlop; for (int i = 0; i < ndofB; ++i)
{
btScalar rel_vel = 0.f; btScalar j = jacB[i] ;
int ndofA = 0; btScalar l = deltaVelB[i];
int ndofB = 0; denom1 += j*l;
{ }
btVector3 vel1,vel2;
if (multiBodyA) }
{ else if(rb1)
ndofA = multiBodyA->getNumDofs() + 6; {
btScalar* jacA = &data.m_jacobians[solverConstraint.m_jacAindex]; vec = ( -solverConstraint.m_angularComponentB).cross(rel_pos2);
for (int i = 0; i < ndofA ; ++i) if (angConstraint) {
rel_vel += multiBodyA->getVelocityVector()[i] * jacA[i]; denom1 = rb1->getInvMass() + constraintNormalAng.dot(vec);
} }
else if(rb0) else {
{ denom1 = rb1->getInvMass() + constraintNormalLin.dot(vec);
rel_vel += rb0->getVelocityInLocalPoint(rel_pos1).dot(solverConstraint.m_contactNormal1); }
} }
if (multiBodyB)
{ //
ndofB = multiBodyB->getNumDofs() + 6; btScalar d = denom0+denom1;
btScalar* jacB = &data.m_jacobians[solverConstraint.m_jacBindex]; if (d>SIMD_EPSILON)
for (int i = 0; i < ndofB ; ++i) {
rel_vel += multiBodyB->getVelocityVector()[i] * jacB[i]; solverConstraint.m_jacDiagABInv = relaxation/(d);
}
} else
else if(rb1) {
{ //disable the constraint row to handle singularity/redundant constraint
rel_vel += rb1->getVelocityInLocalPoint(rel_pos2).dot(solverConstraint.m_contactNormal2); solverConstraint.m_jacDiagABInv = 0.f;
} }
}
solverConstraint.m_friction = 0.f;//cp.m_combinedFriction;
}
//compute rhs and remaining solverConstraint fields
btScalar penetration = isFriction? 0 : posError+infoGlobal.m_linearSlop;
///warm starting (or zero if disabled)
/* btScalar rel_vel = 0.f;
if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING) int ndofA = 0;
{ int ndofB = 0;
solverConstraint.m_appliedImpulse = isFriction ? 0 : cp.m_appliedImpulse * infoGlobal.m_warmstartingFactor; {
btVector3 vel1,vel2;
if (solverConstraint.m_appliedImpulse) if (multiBodyA)
{ {
if (multiBodyA) ndofA = multiBodyA->getNumDofs() + 6;
{ btScalar* jacA = &data.m_jacobians[solverConstraint.m_jacAindex];
btScalar impulse = solverConstraint.m_appliedImpulse; for (int i = 0; i < ndofA ; ++i)
btScalar* deltaV = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex]; rel_vel += multiBodyA->getVelocityVector()[i] * jacA[i];
multiBodyA->applyDeltaVee(deltaV,impulse); }
applyDeltaVee(data,deltaV,impulse,solverConstraint.m_deltaVelAindex,ndofA); else if(rb0)
} else {
{ rel_vel += rb0->getVelocityInLocalPoint(rel_pos1).dot(solverConstraint.m_contactNormal1);
if (rb0) }
if (multiBodyB)
{
ndofB = multiBodyB->getNumDofs() + 6;
btScalar* jacB = &data.m_jacobians[solverConstraint.m_jacBindex];
for (int i = 0; i < ndofB ; ++i)
rel_vel += multiBodyB->getVelocityVector()[i] * jacB[i];
}
else if(rb1)
{
rel_vel += rb1->getVelocityInLocalPoint(rel_pos2).dot(solverConstraint.m_contactNormal2);
}
solverConstraint.m_friction = 0.f;//cp.m_combinedFriction;
}
///warm starting (or zero if disabled)
/*
if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
{
solverConstraint.m_appliedImpulse = isFriction ? 0 : cp.m_appliedImpulse * infoGlobal.m_warmstartingFactor;
if (solverConstraint.m_appliedImpulse)
{
if (multiBodyA)
{
btScalar impulse = solverConstraint.m_appliedImpulse;
btScalar* deltaV = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex];
multiBodyA->applyDeltaVee(deltaV,impulse);
applyDeltaVee(data,deltaV,impulse,solverConstraint.m_deltaVelAindex,ndofA);
} else
{
if (rb0)
bodyA->internalApplyImpulse(solverConstraint.m_contactNormal1*bodyA->internalGetInvMass()*rb0->getLinearFactor(),solverConstraint.m_angularComponentA,solverConstraint.m_appliedImpulse); bodyA->internalApplyImpulse(solverConstraint.m_contactNormal1*bodyA->internalGetInvMass()*rb0->getLinearFactor(),solverConstraint.m_angularComponentA,solverConstraint.m_appliedImpulse);
} }
if (multiBodyB) if (multiBodyB)
{ {
btScalar impulse = solverConstraint.m_appliedImpulse; btScalar impulse = solverConstraint.m_appliedImpulse;
btScalar* deltaV = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex]; btScalar* deltaV = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex];
multiBodyB->applyDeltaVee(deltaV,impulse); multiBodyB->applyDeltaVee(deltaV,impulse);
applyDeltaVee(data,deltaV,impulse,solverConstraint.m_deltaVelBindex,ndofB); applyDeltaVee(data,deltaV,impulse,solverConstraint.m_deltaVelBindex,ndofB);
} else } else
{ {
if (rb1) if (rb1)
bodyB->internalApplyImpulse(-solverConstraint.m_contactNormal2*bodyB->internalGetInvMass()*rb1->getLinearFactor(),-solverConstraint.m_angularComponentB,-(btScalar)solverConstraint.m_appliedImpulse); bodyB->internalApplyImpulse(-solverConstraint.m_contactNormal2*bodyB->internalGetInvMass()*rb1->getLinearFactor(),-solverConstraint.m_angularComponentB,-(btScalar)solverConstraint.m_appliedImpulse);
} }
} }
} else } else
*/ */
solverConstraint.m_appliedImpulse = 0.f; solverConstraint.m_appliedImpulse = 0.f;
solverConstraint.m_appliedPushImpulse = 0.f; solverConstraint.m_appliedPushImpulse = 0.f;
{ {
btScalar positionalError = 0.f; btScalar positionalError = 0.f;
btScalar velocityError = desiredVelocity - rel_vel;// * damping; btScalar velocityError = desiredVelocity - rel_vel;// * damping;
btScalar erp = infoGlobal.m_erp2; btScalar erp = infoGlobal.m_erp2;
if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold)) if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold))
{ {
erp = infoGlobal.m_erp; erp = infoGlobal.m_erp;
} }
positionalError = -penetration * erp/infoGlobal.m_timeStep; positionalError = -penetration * erp/infoGlobal.m_timeStep;
btScalar penetrationImpulse = positionalError*solverConstraint.m_jacDiagABInv; btScalar penetrationImpulse = positionalError*solverConstraint.m_jacDiagABInv;
btScalar velocityImpulse = velocityError *solverConstraint.m_jacDiagABInv; btScalar velocityImpulse = velocityError *solverConstraint.m_jacDiagABInv;
if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold)) if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold))
{ {
//combine position and velocity into rhs //combine position and velocity into rhs
solverConstraint.m_rhs = penetrationImpulse+velocityImpulse; solverConstraint.m_rhs = penetrationImpulse+velocityImpulse;
solverConstraint.m_rhsPenetration = 0.f; solverConstraint.m_rhsPenetration = 0.f;
} else } else
{ {
//split position and velocity into rhs and m_rhsPenetration //split position and velocity into rhs and m_rhsPenetration
solverConstraint.m_rhs = velocityImpulse; solverConstraint.m_rhs = velocityImpulse;
solverConstraint.m_rhsPenetration = penetrationImpulse; solverConstraint.m_rhsPenetration = penetrationImpulse;
} }
solverConstraint.m_cfm = 0.f; solverConstraint.m_cfm = 0.f;
solverConstraint.m_lowerLimit = lowerLimit; solverConstraint.m_lowerLimit = lowerLimit;
solverConstraint.m_upperLimit = upperLimit; solverConstraint.m_upperLimit = upperLimit;
} }
return rel_vel; return rel_vel;
} }

12
src/BulletDynamics/Featherstone/btMultiBodyConstraint.h
View File

@ -66,15 +66,19 @@ protected:
btAlignedObjectArray<btScalar> m_data; btAlignedObjectArray<btScalar> m_data;
void applyDeltaVee(btMultiBodyJacobianData& data, btScalar* delta_vee, btScalar impulse, int velocityIndex, int ndof); void applyDeltaVee(btMultiBodyJacobianData& data, btScalar* delta_vee, btScalar impulse, int velocityIndex, int ndof);
btScalar fillMultiBodyConstraint(btMultiBodySolverConstraint& solverConstraint, btScalar fillMultiBodyConstraint(btMultiBodySolverConstraint& solverConstraint,
btMultiBodyJacobianData& data, btMultiBodyJacobianData& data,
btScalar* jacOrgA, btScalar* jacOrgB, btScalar* jacOrgA, btScalar* jacOrgB,
const btVector3& contactNormalOnB, const btVector3& constraintNormalAng,
const btVector3& constraintNormalLin,
const btVector3& posAworld, const btVector3& posBworld, const btVector3& posAworld, const btVector3& posBworld,
btScalar posError, btScalar posError,
const btContactSolverInfo& infoGlobal, const btContactSolverInfo& infoGlobal,
btScalar lowerLimit, btScalar upperLimit, btScalar lowerLimit, btScalar upperLimit,
bool angConstraint = false,
btScalar relaxation = 1.f, btScalar relaxation = 1.f,
bool isFriction = false, btScalar desiredVelocity=0, btScalar cfmSlip=0); bool isFriction = false, btScalar desiredVelocity=0, btScalar cfmSlip=0);

211
src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp Normal file
View File

@ -0,0 +1,211 @@
/*
Bullet Continuous Collision Detection and Physics Library
Copyright (c) 2013 Erwin Coumans http://bulletphysics.org
This software is provided 'as-is', without any express or implied warranty.
In no event will the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it freely,
subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
///This file was written by Erwin Coumans
#include "btMultiBodyFixedConstraint.h"
#include "btMultiBodyLinkCollider.h"
#include "BulletDynamics/Dynamics/btRigidBody.h"
#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h"
#include "LinearMath/btIDebugDraw.h"
#define BTMBFIXEDCONSTRAINT_DIM 6
btMultiBodyFixedConstraint::btMultiBodyFixedConstraint(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB)
:btMultiBodyConstraint(body,0,link,-1,BTMBFIXEDCONSTRAINT_DIM,false),
m_rigidBodyA(0),
m_rigidBodyB(bodyB),
m_pivotInA(pivotInA),
m_pivotInB(pivotInB),
m_frameInA(frameInA),
m_frameInB(frameInB)
{
m_data.resize(BTMBFIXEDCONSTRAINT_DIM);//at least store the applied impulses
}
btMultiBodyFixedConstraint::btMultiBodyFixedConstraint(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB)
:btMultiBodyConstraint(bodyA,bodyB,linkA,linkB,BTMBFIXEDCONSTRAINT_DIM,false),
m_rigidBodyA(0),
m_rigidBodyB(0),
m_pivotInA(pivotInA),
m_pivotInB(pivotInB),
m_frameInA(frameInA),
m_frameInB(frameInB)
{
m_data.resize(BTMBFIXEDCONSTRAINT_DIM);//at least store the applied impulses
}
void btMultiBodyFixedConstraint::finalizeMultiDof()
{
//not implemented yet
btAssert(0);
}
btMultiBodyFixedConstraint::~btMultiBodyFixedConstraint()
{
}
int btMultiBodyFixedConstraint::getIslandIdA() const
{
if (m_rigidBodyA)
return m_rigidBodyA->getIslandTag();
if (m_bodyA)
{
btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider();
if (col)
return col->getIslandTag();
for (int i=0;i<m_bodyA->getNumLinks();i++)
{
if (m_bodyA->getLink(i).m_collider)
return m_bodyA->getLink(i).m_collider->getIslandTag();
}
}
return -1;
}
int btMultiBodyFixedConstraint::getIslandIdB() const
{
if (m_rigidBodyB)
return m_rigidBodyB->getIslandTag();
if (m_bodyB)
{
btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider();
if (col)
return col->getIslandTag();
for (int i=0;i<m_bodyB->getNumLinks();i++)
{
col = m_bodyB->getLink(i).m_collider;
if (col)
return col->getIslandTag();
}
}
return -1;
}
void btMultiBodyFixedConstraint::createConstraintRows(btMultiBodyConstraintArray& constraintRows, btMultiBodyJacobianData& data, const btContactSolverInfo& infoGlobal)
{
int numDim = BTMBFIXEDCONSTRAINT_DIM;
for (int i=0;i<numDim;i++)
{
btMultiBodySolverConstraint& constraintRow = constraintRows.expandNonInitializing();
constraintRow.m_orgConstraint = this;
constraintRow.m_orgDofIndex = i;
constraintRow.m_relpos1CrossNormal.setValue(0,0,0);
constraintRow.m_contactNormal1.setValue(0,0,0);
constraintRow.m_relpos2CrossNormal.setValue(0,0,0);
constraintRow.m_contactNormal2.setValue(0,0,0);
constraintRow.m_angularComponentA.setValue(0,0,0);
constraintRow.m_angularComponentB.setValue(0,0,0);
constraintRow.m_solverBodyIdA = data.m_fixedBodyId;
constraintRow.m_solverBodyIdB = data.m_fixedBodyId;
// Convert local points back to world
btVector3 pivotAworld = m_pivotInA;
btMatrix3x3 frameAworld = m_frameInA;
if (m_rigidBodyA)
{
constraintRow.m_solverBodyIdA = m_rigidBodyA->getCompanionId();
pivotAworld = m_rigidBodyA->getCenterOfMassTransform()*m_pivotInA;
frameAworld = frameAworld.transpose()*btMatrix3x3(m_rigidBodyA->getOrientation());
} else
{
if (m_bodyA) {
pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA);
frameAworld = m_bodyA->localFrameToWorld(m_linkA, frameAworld);
}
}
btVector3 pivotBworld = m_pivotInB;
btMatrix3x3 frameBworld = m_frameInB;
if (m_rigidBodyB)
{
constraintRow.m_solverBodyIdB = m_rigidBodyB->getCompanionId();
pivotBworld = m_rigidBodyB->getCenterOfMassTransform()*m_pivotInB;
frameBworld = frameBworld.transpose()*btMatrix3x3(m_rigidBodyB->getOrientation());
} else
{
if (m_bodyB) {
pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB);
frameBworld = m_bodyB->localFrameToWorld(m_linkB, frameBworld);
}
}
btMatrix3x3 relRot = frameAworld.inverse()*frameBworld;
btVector3 angleDiff;
btGeneric6DofSpring2Constraint::matrixToEulerXYZ(relRot,angleDiff);
btVector3 constraintNormalLin(0,0,0);
btVector3 constraintNormalAng(0,0,0);
btScalar posError = 0.0;
if (i < 3) {
constraintNormalLin[i] = -1;
posError = (pivotAworld-pivotBworld).dot(constraintNormalLin);
fillMultiBodyConstraint(constraintRow, data, 0, 0, constraintNormalAng,
constraintNormalLin, pivotAworld, pivotBworld,
posError,
infoGlobal,
-m_maxAppliedImpulse, m_maxAppliedImpulse
);
}
else { //i>=3
constraintNormalAng = frameAworld.getColumn(i%3);
posError = angleDiff[i%3];
fillMultiBodyConstraint(constraintRow, data, 0, 0, constraintNormalAng,
constraintNormalLin, pivotAworld, pivotBworld,
posError,
infoGlobal,
-m_maxAppliedImpulse, m_maxAppliedImpulse, true
);
}
}
}
void btMultiBodyFixedConstraint::debugDraw(class btIDebugDraw* drawer)
{
btTransform tr;
tr.setIdentity();
if (m_rigidBodyA)
{
btVector3 pivot = m_rigidBodyA->getCenterOfMassTransform() * m_pivotInA;
tr.setOrigin(pivot);
drawer->drawTransform(tr, 0.1);
}
if (m_bodyA)
{
btVector3 pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA);
tr.setOrigin(pivotAworld);
drawer->drawTransform(tr, 0.1);
}
if (m_rigidBodyB)
{
// that ideally should draw the same frame
btVector3 pivot = m_rigidBodyB->getCenterOfMassTransform() * m_pivotInB;
tr.setOrigin(pivot);
drawer->drawTransform(tr, 0.1);
}
if (m_bodyB)
{
btVector3 pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB);
tr.setOrigin(pivotBworld);
drawer->drawTransform(tr, 0.1);
}
}

94
src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h Normal file
View File

@ -0,0 +1,94 @@
/*
Bullet Continuous Collision Detection and Physics Library
Copyright (c) 2013 Erwin Coumans http://bulletphysics.org
This software is provided 'as-is', without any express or implied warranty.
In no event will the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it freely,
subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
///This file was written by Erwin Coumans
#ifndef BT_MULTIBODY_FIXED_CONSTRAINT_H
#define BT_MULTIBODY_FIXED_CONSTRAINT_H
#include "btMultiBodyConstraint.h"
class btMultiBodyFixedConstraint : public btMultiBodyConstraint
{
protected:
btRigidBody* m_rigidBodyA;
btRigidBody* m_rigidBodyB;
btVector3 m_pivotInA;
btVector3 m_pivotInB;
btMatrix3x3 m_frameInA;
btMatrix3x3 m_frameInB;
public:
btMultiBodyFixedConstraint(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB);
btMultiBodyFixedConstraint(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB);
virtual ~btMultiBodyFixedConstraint();
virtual void finalizeMultiDof();
virtual int getIslandIdA() const;
virtual int getIslandIdB() const;
virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows,
btMultiBodyJacobianData& data,
const btContactSolverInfo& infoGlobal);
const btVector3& getPivotInA() const
{
return m_pivotInA;
}
void setPivotInA(const btVector3& pivotInA)
{
m_pivotInA = pivotInA;
}
const btVector3& getPivotInB() const
{
return m_pivotInB;
}
void setPivotInB(const btVector3& pivotInB)
{
m_pivotInB = pivotInB;
}
const btMatrix3x3& getFrameInA() const
{
return m_frameInA;
}
void setFrameInA(const btMatrix3x3& frameInA)
{
m_frameInA = frameInA;
}
const btMatrix3x3& getFrameInB() const
{
return m_frameInB;
}
void setFrameInB(const btMatrix3x3& frameInB)
{
m_frameInB = frameInB;
}
virtual void debugDraw(class btIDebugDraw* drawer);
};
#endif //BT_MULTIBODY_FIXED_CONSTRAINT_H

2
src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp
View File

@ -122,7 +122,7 @@ void btMultiBodyJointLimitConstraint::createConstraintRows(btMultiBodyConstraint
const btScalar posError = 0; //why assume it's zero? const btScalar posError = 0; //why assume it's zero?
const btVector3 dummy(0, 0, 0); const btVector3 dummy(0, 0, 0);
btScalar rel_vel = fillMultiBodyConstraint(constraintRow,data,jacobianA(row),jacobianB(row),dummy,dummy,dummy,posError,infoGlobal,0,m_maxAppliedImpulse); btScalar rel_vel = fillMultiBodyConstraint(constraintRow,data,jacobianA(row),jacobianB(row),dummy,dummy,dummy,dummy,posError,infoGlobal,0,m_maxAppliedImpulse);
{ {
//expect either prismatic or revolute joint type for now //expect either prismatic or revolute joint type for now

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

@ -128,7 +128,7 @@ void btMultiBodyJointMotor::createConstraintRows(btMultiBodyConstraintArray& con
btScalar rhs = m_kp * positionStabiliationTerm + currentVelocity+m_kd * velocityError; btScalar rhs = m_kp * positionStabiliationTerm + currentVelocity+m_kd * velocityError;
fillMultiBodyConstraint(constraintRow,data,jacobianA(row),jacobianB(row),dummy,dummy,dummy,posError,infoGlobal,-m_maxAppliedImpulse,m_maxAppliedImpulse,1,false,rhs); fillMultiBodyConstraint(constraintRow,data,jacobianA(row),jacobianB(row),dummy,dummy,dummy,dummy,posError,infoGlobal,-m_maxAppliedImpulse,m_maxAppliedImpulse,false,1,false,rhs);
constraintRow.m_orgConstraint = this; constraintRow.m_orgConstraint = this;
constraintRow.m_orgDofIndex = row; constraintRow.m_orgDofIndex = row;
{ {

2
src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp
View File

@ -159,7 +159,7 @@ int numDim = BTMBP2PCONSTRAINT_DIM;
#ifndef BTMBP2PCONSTRAINT_BLOCK_ANGULAR_MOTION_TEST #ifndef BTMBP2PCONSTRAINT_BLOCK_ANGULAR_MOTION_TEST
fillMultiBodyConstraint(constraintRow, data, 0, 0, fillMultiBodyConstraint(constraintRow, data, 0, 0, btVector3(0,0,0),
contactNormalOnB, pivotAworld, pivotBworld, //sucks but let it be this way "for the time being" contactNormalOnB, pivotAworld, pivotBworld, //sucks but let it be this way "for the time being"
posError, posError,
infoGlobal, infoGlobal,