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

Add single body constructor for btGeneric6DofSpringConstraint. See Issue 601, thanks to aj.dneg for the patch.

Browse Source
This commit is contained in:
erwin.coumans
2012-03-01 05:48:51 +00:00
parent 640d11e617
commit a5aa2a5ff7
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
View File

@@ -20,6 +20,19 @@ subject to the following restrictions:
btGeneric6DofSpringConstraint::btGeneric6DofSpringConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB ,bool useLinearReferenceFrameA) btGeneric6DofSpringConstraint::btGeneric6DofSpringConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB ,bool useLinearReferenceFrameA)
: btGeneric6DofConstraint(rbA, rbB, frameInA, frameInB, useLinearReferenceFrameA) : btGeneric6DofConstraint(rbA, rbB, frameInA, frameInB, useLinearReferenceFrameA)
{
init();
}
btGeneric6DofSpringConstraint::btGeneric6DofSpringConstraint(btRigidBody& rbB, const btTransform& frameInB, bool useLinearReferenceFrameB)
: btGeneric6DofConstraint(rbB, frameInB, useLinearReferenceFrameB)
{
init();
}
void btGeneric6DofSpringConstraint::init()
{ {
m_objectType = D6_SPRING_CONSTRAINT_TYPE; m_objectType = D6_SPRING_CONSTRAINT_TYPE;

2
src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
View File

@@ -39,9 +39,11 @@ protected:
btScalar m_equilibriumPoint[6]; btScalar m_equilibriumPoint[6];
btScalar m_springStiffness[6]; btScalar m_springStiffness[6];
btScalar m_springDamping[6]; // between 0 and 1 (1 == no damping) btScalar m_springDamping[6]; // between 0 and 1 (1 == no damping)
void init();
void internalUpdateSprings(btConstraintInfo2* info); void internalUpdateSprings(btConstraintInfo2* info);
public: public:
btGeneric6DofSpringConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB ,bool useLinearReferenceFrameA); btGeneric6DofSpringConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB ,bool useLinearReferenceFrameA);
btGeneric6DofSpringConstraint(btRigidBody& rbB, const btTransform& frameInB, bool useLinearReferenceFrameB);
void enableSpring(int index, bool onOff); void enableSpring(int index, bool onOff);
void setStiffness(int index, btScalar stiffness); void setStiffness(int index, btScalar stiffness);
void setDamping(int index, btScalar damping); void setDamping(int index, btScalar damping);