AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2025-01-18 21:10:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1045 from erwincoumans/master

Browse Source 
revert to m_jointFriction (from m_jointFriction1)
This commit is contained in:
erwincoumans 2017-03-27 10:17:44 -07:00 committed by GitHub
commit c1e42daa0f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/SharedMemory/BodyJointInfoUtility.h
View File

@ -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_jointType = mb->m_links[link].m_jointType;
info.m_jointDamping = mb->m_links[link].m_jointDamping; 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_jointLowerLimit = mb->m_links[link].m_jointLowerLimit;
info.m_jointUpperLimit = mb->m_links[link].m_jointUpperLimit; info.m_jointUpperLimit = mb->m_links[link].m_jointUpperLimit;
info.m_jointMaxForce = mb->m_links[link].m_jointMaxForce; info.m_jointMaxForce = mb->m_links[link].m_jointMaxForce;
@ -80,4 +80,4 @@ template <typename T, typename U> void addJointInfoFromMultiBodyData(const T* mb
#endif //BODY_JOINT_INFO_UTILITY_H #endif //BODY_JOINT_INFO_UTILITY_H

2
examples/SharedMemory/SharedMemoryPublic.h
View File

@ -174,7 +174,7 @@ struct b3JointInfo
int m_jointIndex; int m_jointIndex;
int m_flags; int m_flags;
double m_jointDamping; double m_jointDamping;
double m_jointFriction1; double m_jointFriction;
double m_jointLowerLimit; double m_jointLowerLimit;
double m_jointUpperLimit; double m_jointUpperLimit;
double m_jointMaxForce; double m_jointMaxForce;

2
examples/pybullet/pybullet.c
View File

@ -2118,7 +2118,7 @@ static PyObject* pybullet_getJointInfo(PyObject* self, PyObject* args, PyObject*
PyTuple_SetItem(pyListJointInfo, 6, PyTuple_SetItem(pyListJointInfo, 6,
PyFloat_FromDouble(info.m_jointDamping)); PyFloat_FromDouble(info.m_jointDamping));
PyTuple_SetItem(pyListJointInfo, 7, PyTuple_SetItem(pyListJointInfo, 7,
PyFloat_FromDouble(info.m_jointFriction1)); PyFloat_FromDouble(info.m_jointFriction));
PyTuple_SetItem(pyListJointInfo, 8, PyTuple_SetItem(pyListJointInfo, 8,
PyFloat_FromDouble(info.m_jointLowerLimit)); PyFloat_FromDouble(info.m_jointLowerLimit));
PyTuple_SetItem(pyListJointInfo, 9, PyTuple_SetItem(pyListJointInfo, 9,