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

fix posix memory release issues

Browse Source 
fix compile problems on Mac OSX
reduce shared memory size on Mac (>512*1024 fails to allocate)
This commit is contained in:
Erwin Coumans
2018-05-02 15:39:16 -07:00
parent 1f6afcda30
commit 4a8ad1a54e
9 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1032,6 +1032,11 @@ struct BulletMJCFImporterInternalData
//todo
break;
}
case URDF_GEOM_CDF:
{
//todo
break;
}
case URDF_GEOM_CYLINDER:
case URDF_GEOM_CAPSULE:
{
@@ -2541,6 +2546,11 @@ class btCompoundShape* BulletMJCFImporter::convertLinkCollisionShapes( int linkI
}
break;
}
case URDF_GEOM_CDF:
{
//todo
break;
}
case URDF_GEOM_UNKNOWN:
{
break;

3
examples/Importers/ImportObjDemo/Wavefront2GLInstanceGraphicsShape.cpp
View File

@@ -2,7 +2,8 @@
#include "../../OpenGLWindow/GLInstancingRenderer.h"
#include "../../OpenGLWindow/GLInstanceGraphicsShape.h"
#include "btBulletDynamicsCommon.h"
//#include "btBulletDynamicsCommon.h"
#include "LinearMath/btVector3.h"
#include "../../OpenGLWindow/SimpleOpenGL3App.h"
#include "Wavefront2GLInstanceGraphicsShape.h"
#include "../../OpenGLWindow/GLInstancingRenderer.h"