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

Merge branch 'master' of https://github.com/erwincoumans/bullet3

Browse Source
This commit is contained in:
Erwin Coumans
2017-03-27 17:25:40 -07:00
parent 4911916937 38ad1bfb89
commit fd2c0f58bc
3 changed files with 4 additions and 4 deletions
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_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;
@@ -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_flags;
double m_jointDamping;
double m_jointFriction1;
double m_jointFriction;
double m_jointLowerLimit;
double m_jointUpperLimit;
double m_jointMaxForce;