mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-14 13:50:04 +00:00
Merge pull request #1045 from erwincoumans/master
revert to m_jointFriction (from m_jointFriction1)
This commit is contained in:
commit
c1e42daa0f
@ -60,7 +60,7 @@ template <typename T, typename U> void addJointInfoFromMultiBodyData(const T* mb
|
||||
|
||||
info.m_jointType = mb->m_links[link].m_jointType;
|
||||
info.m_jointDamping = mb->m_links[link].m_jointDamping;
|
||||
info.m_jointFriction1 = mb->m_links[link].m_jointFriction;
|
||||
info.m_jointFriction = mb->m_links[link].m_jointFriction;
|
||||
info.m_jointLowerLimit = mb->m_links[link].m_jointLowerLimit;
|
||||
info.m_jointUpperLimit = mb->m_links[link].m_jointUpperLimit;
|
||||
info.m_jointMaxForce = mb->m_links[link].m_jointMaxForce;
|
||||
|
@ -174,7 +174,7 @@ struct b3JointInfo
|
||||
int m_jointIndex;
|
||||
int m_flags;
|
||||
double m_jointDamping;
|
||||
double m_jointFriction1;
|
||||
double m_jointFriction;
|
||||
double m_jointLowerLimit;
|
||||
double m_jointUpperLimit;
|
||||
double m_jointMaxForce;
|
||||
|
@ -2118,7 +2118,7 @@ static PyObject* pybullet_getJointInfo(PyObject* self, PyObject* args, PyObject*
|
||||
PyTuple_SetItem(pyListJointInfo, 6,
|
||||
PyFloat_FromDouble(info.m_jointDamping));
|
||||
PyTuple_SetItem(pyListJointInfo, 7,
|
||||
PyFloat_FromDouble(info.m_jointFriction1));
|
||||
PyFloat_FromDouble(info.m_jointFriction));
|
||||
PyTuple_SetItem(pyListJointInfo, 8,
|
||||
PyFloat_FromDouble(info.m_jointLowerLimit));
|
||||
PyTuple_SetItem(pyListJointInfo, 9,
|
||||
|
Loading…
Reference in New Issue
Block a user