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

Merge remote-tracking branch 'bp/master'

Browse Source
This commit is contained in:
erwin coumans
2016-11-11 14:45:09 -08:00
parent 35fc8306fd 3b5d0f444b
commit b150edf76b
11 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/MultiThreadedDemo/CommonRigidBodyMTBase.cpp
View File

@@ -27,7 +27,7 @@ class btCollisionShape;
#include "LinearMath/btAlignedObjectArray.h"
#include "LinearMath/btPoolAllocator.h"
#include "btBulletCollisionCommon.h"
#include "BulletCollision/CollisionDispatch/btSimulationIslandManagerMt.h" // for setSplitIslands()
#include "BulletDynamics/Dynamics/btSimulationIslandManagerMt.h" // for setSplitIslands()
#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h"
#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"

3
examples/MultiThreadedDemo/MultiThreadedDemo.cpp
View File

@@ -199,7 +199,7 @@ void MultiThreadedDemo::createSceneObjects()
}
}
}
#if 0
if ( false )
{
// destroyer ball
@@ -211,6 +211,7 @@ void MultiThreadedDemo::createSceneObjects()
btRigidBody* ballBody = localCreateRigidBody( 10000.f, sphereTrans, ball );
ballBody->setLinearVelocity( btVector3( 0, 0, -10 ) );
}
#endif
m_guiHelper->autogenerateGraphicsObjects( m_dynamicsWorld );
}

2
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
View File

@@ -4083,6 +4083,7 @@ void PhysicsServerCommandProcessor::createDefaultRobotAssets()
}
//directly set the position of the links, only for debugging IK, don't use this method!
#if 0
if (0)
{
for (int i=0;i<mb->getNumLinks();i++)
@@ -4091,6 +4092,7 @@ void PhysicsServerCommandProcessor::createDefaultRobotAssets()
mb->setJointPosMultiDof(i,&desiredPosition);
}
} else
#endif
{
int numMotors = 0;
//find the joint motors and apply the desired velocity and maximum force/torque

6
examples/pybullet/pybullet.c
View File

@@ -2636,17 +2636,17 @@ static PyMethodDef SpamMethods[] = {
#endif
},
{"getContactPoints", pybullet_getContactPointData, METH_VARARGS | METH_KEYWORDS,
{"getContactPoints", (PyCFunction)pybullet_getContactPointData, METH_VARARGS | METH_KEYWORDS,
"Return existing contact points after the stepSimulation command. "
"Optional arguments one or two object unique "
"ids, that need to be involved in the contact."},
{"getClosestPoints", pybullet_getClosestPointData, METH_VARARGS | METH_KEYWORDS,
{"getClosestPoints", (PyCFunction)pybullet_getClosestPointData, METH_VARARGS | METH_KEYWORDS,
"Compute the closest points between two objects, if the distance is below a given threshold."
"Input is two objects unique ids and distance threshold."
},
{ "getOverlappingObjects", pybullet_getOverlappingObjects, METH_VARARGS | METH_KEYWORDS,
{ "getOverlappingObjects", (PyCFunction)pybullet_getOverlappingObjects, METH_VARARGS | METH_KEYWORDS,
"Return all the objects that have overlap with a given "
"axis-aligned bounding box volume (AABB)."
"Input are two vectors defining the AABB in world space [min_x,min_y,min_z],[max_x,max_y,max_z]."