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
2016-03-17 16:12:48 -07:00
parent 7e4dfb7207 fe92de3e50
commit 643cf5ab1d
15 changed files with 1005 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/SharedMemory/BodyJointInfoUtility.h
View File

@@ -57,6 +57,8 @@ 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_jointFriction = mb->m_links[link].m_jointFriction;
if ((mb->m_links[link].m_jointType == eRevoluteType) ||
(mb->m_links[link].m_jointType == ePrismaticType)) {

2
examples/SharedMemory/SharedMemoryPublic.h
View File

@@ -85,6 +85,8 @@ struct b3JointInfo
int m_uIndex;
int m_jointIndex;
int m_flags;
double m_jointDamping;
double m_jointFriction;
};
struct b3JointSensorState