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

move CommonRigidBodyMTBase out of interfaces, into MultiThreadedDemo.

Browse Source
This commit is contained in:
erwincoumans
2016-11-07 12:08:02 -08:00
parent c1f728ec86
commit 4235c61fcf
8 changed files with 489 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
examples/CommonInterfaces/CommonRigidBodyBase.h
View File

@@ -21,8 +21,6 @@ struct CommonRigidBodyBase : public CommonExampleInterface
btConstraintSolver* m_solver;
btDefaultCollisionConfiguration* m_collisionConfiguration;
btDiscreteDynamicsWorld* m_dynamicsWorld;
bool m_multithreadedWorld;
bool m_multithreadCapable;
//data for picking objects
class btRigidBody* m_pickedBody;
@@ -33,8 +31,20 @@ struct CommonRigidBodyBase : public CommonExampleInterface
btScalar m_oldPickingDist;
struct GUIHelperInterface* m_guiHelper;
CommonRigidBodyBase(struct GUIHelperInterface* helper);
virtual ~CommonRigidBodyBase();
CommonRigidBodyBase(struct GUIHelperInterface* helper)
:m_broadphase(0),
m_dispatcher(0),
m_solver(0),
m_collisionConfiguration(0),
m_dynamicsWorld(0),
m_pickedBody(0),
m_pickedConstraint(0),
m_guiHelper(helper)
{
}
virtual ~CommonRigidBodyBase()
{
}
btDiscreteDynamicsWorld* getDynamicsWorld()
@@ -42,8 +52,26 @@ struct CommonRigidBodyBase : public CommonExampleInterface
return m_dynamicsWorld;
}
virtual void createDefaultParameters();
virtual void createEmptyDynamicsWorld();
virtual void createEmptyDynamicsWorld()
{
///collision configuration contains default setup for memory, collision setup
m_collisionConfiguration = new btDefaultCollisionConfiguration();
//m_collisionConfiguration->setConvexConvexMultipointIterations();
///use the default collision dispatcher. For parallel processing you can use a diffent dispatcher (see Extras/BulletMultiThreaded)
m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration);
m_broadphase = new btDbvtBroadphase();
///the default constraint solver. For parallel processing you can use a different solver (see Extras/BulletMultiThreaded)
btSequentialImpulseConstraintSolver* sol = new btSequentialImpulseConstraintSolver;
m_solver = sol;
m_dynamicsWorld = new btDiscreteDynamicsWorld(m_dispatcher, m_broadphase, m_solver, m_collisionConfiguration);
m_dynamicsWorld->setGravity(btVector3(0, -10, 0));
}
virtual void stepSimulation(float deltaTime)
{
@@ -53,7 +81,14 @@ struct CommonRigidBodyBase : public CommonExampleInterface
}
}
virtual void physicsDebugDraw(int debugFlags);
virtual void physicsDebugDraw(int debugFlags)
{
if (m_dynamicsWorld && m_dynamicsWorld->getDebugDrawer())
{
m_dynamicsWorld->getDebugDrawer()->setDebugMode(debugFlags);
m_dynamicsWorld->debugDrawWorld();
}
}
virtual void exitPhysics()
{