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

fix compile issue/warning

Browse Source
This commit is contained in:
erwincoumans
2017-06-06 06:59:41 -07:00
parent fb6d623d24
commit 7b56db9f97
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/pybullet/pybullet.c
View File

@@ -4850,9 +4850,10 @@ static PyObject* pybullet_createMultiBody(PyObject* self, PyObject* args, PyObje
b3SharedMemoryCommandHandle commandHandle = b3CreateMultiBodyCommandInit(sm); b3SharedMemoryCommandHandle commandHandle = b3CreateMultiBodyCommandInit(sm);
double basePosition[3]={0,0,0}; double basePosition[3]={0,0,0};
double baseOrientation[4]={0,0,0,1}; double baseOrientation[4]={0,0,0,1};
int baseIndex;
pybullet_internalSetVectord(basePosObj,basePosition); pybullet_internalSetVectord(basePosObj,basePosition);
pybullet_internalSetVector4d(baseOrnObj,baseOrientation); pybullet_internalSetVector4d(baseOrnObj,baseOrientation);
int baseIndex = b3CreateMultiBodyBase(commandHandle,baseMass,baseCollisionShapeIndex,baseVisualShapeIndex,basePosition,baseOrientation); baseIndex = b3CreateMultiBodyBase(commandHandle,baseMass,baseCollisionShapeIndex,baseVisualShapeIndex,basePosition,baseOrientation);
if (useMaximalCoordinates>0) if (useMaximalCoordinates>0)
{ {
b3CreateMultiBodyUseMaximalCoordinates(commandHandle); b3CreateMultiBodyUseMaximalCoordinates(commandHandle);

2
src/LinearMath/btThreads.cpp
View File

@@ -450,7 +450,7 @@ void btParallelFor( int iBegin, int iEnd, int grainSize, const btIParallelForBod
btAssert( !"called btParallelFor in non-threadsafe build. enable BT_THREADSAFE" ); btAssert( !"called btParallelFor in non-threadsafe build. enable BT_THREADSAFE" );
body.forLoop( iBegin, iEnd ); body.forLoop( iBegin, iEnd );
#endif #else // #if BT_THREADSAFE #endif// #if BT_THREADSAFE
} }

2
src/LinearMath/btThreads.h
View File

@@ -151,4 +151,4 @@ btITaskScheduler* btGetPPLTaskScheduler();
void btParallelFor( int iBegin, int iEnd, int grainSize, const btIParallelForBody& body ); void btParallelFor( int iBegin, int iEnd, int grainSize, const btIParallelForBody& body );
#endif //BT_THREADS_H #endif