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

[MJCF import] add custom broadphase collision filter, for MJCF/MuJoCo compatibility

Browse Source 
[MJCF import] improve MuJoCo importer, support collision filters
fixed a few more warnings
This commit is contained in:
Erwin Coumans
2017-01-16 08:23:49 -08:00
parent c0c4c8ba3f
commit 8e9181f85c
8 changed files with 156 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp
View File

@@ -1137,7 +1137,7 @@ bool BulletMJCFImporter::getLinkColor(int linkIndex, btVector4& colorRGBA) const
int BulletMJCFImporter::getCollisionGroupAndMask(int linkIndex, int& colGroup, int& colMask) const
{
int flags = 0;
/*
const UrdfLink* link = m_data->getLink(m_data->m_activeModel,linkIndex);
if (link)
{
@@ -1151,7 +1151,7 @@ int BulletMJCFImporter::getCollisionGroupAndMask(int linkIndex, int& colGroup, i
}
}
*/
return flags;
}