Merge remote-tracking branch 'bp/master'

This commit is contained in:
Erwin Coumans
2021-03-26 11:53:37 -07:00
6 changed files with 45 additions and 7 deletions

View File

@@ -2065,7 +2065,8 @@ B3_SHARED_API int b3CreateMultiBodyLink(b3SharedMemoryCommandHandle commandHandl
const double linkInertialFrameOrientation[4],
int linkParentIndex,
int linkJointType,
const double linkJointAxis[3])
const double linkJointAxis[3],
const char* const linkName)
{
struct SharedMemoryCommand* command = (struct SharedMemoryCommand*)commandHandle;
b3Assert(command);
@@ -2110,6 +2111,7 @@ B3_SHARED_API int b3CreateMultiBodyLink(b3SharedMemoryCommandHandle commandHandl
command->m_createMultiBodyArgs.m_linkJointAxis[3 * linkIndex + 2] = linkJointAxis[2];
command->m_createMultiBodyArgs.m_linkMasses[linkIndex] = linkMass;
command->m_createMultiBodyArgs.m_linkNames[linkIndex] = linkName;
command->m_createMultiBodyArgs.m_numLinks++;
return numLinks;
}