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

Try to avoid crashes if memory allocations fail

Browse Source 
Deal with cases exceeding allocations of bodies/shapes above the limits set in b3Config
(work-in-progress )
This commit is contained in:
erwincoumans
2013-06-17 15:55:41 -07:00
parent e179d5882e
commit 561a44e5d8
8 changed files with 203 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Demos3/BasicGpuDemo/BasicGpuDemo.cpp
View File

@@ -163,6 +163,8 @@ void BasicGpuDemo::exitCL()
BasicGpuDemo::BasicGpuDemo()
{
m_np=0;
m_bp=0;
m_clData = new btInternalData;
setCameraDistance(btScalar(SCALING*60.));
this->setAzi(45);
@@ -207,15 +209,14 @@ void BasicGpuDemo::initPhysics()
}
b3Config config;
b3GpuNarrowPhase* np = new b3GpuNarrowPhase(m_clData->m_clContext,m_clData->m_clDevice,m_clData->m_clQueue,config);
b3GpuSapBroadphase* bp = new b3GpuSapBroadphase(m_clData->m_clContext,m_clData->m_clDevice,m_clData->m_clQueue);
//m_data->m_np = np;
//m_data->m_bp = bp;
m_np = new b3GpuNarrowPhase(m_clData->m_clContext,m_clData->m_clDevice,m_clData->m_clQueue,config);
m_bp = new b3GpuSapBroadphase(m_clData->m_clContext,m_clData->m_clDevice,m_clData->m_clQueue);
b3DynamicBvhBroadphase* broadphaseDbvt = new b3DynamicBvhBroadphase(config.m_maxConvexBodies);
b3GpuRigidBodyPipeline* rbp = new b3GpuRigidBodyPipeline(m_clData->m_clContext,m_clData->m_clDevice,m_clData->m_clQueue, np, bp,broadphaseDbvt,config);
m_rbp = new b3GpuRigidBodyPipeline(m_clData->m_clContext,m_clData->m_clDevice,m_clData->m_clQueue, m_np, m_bp,broadphaseDbvt,config);
m_dynamicsWorld = new b3GpuDynamicsWorld(bp,np,rbp);
m_dynamicsWorld = new b3GpuDynamicsWorld(m_bp,m_np,m_rbp);
m_dynamicsWorld->setDebugDrawer(&gDebugDraw);
@@ -333,9 +334,9 @@ void BasicGpuDemo::initPhysics()
np->writeAllBodiesToGpu();
bp->writeAabbsToGpu();
rbp->writeAllInstancesToGpu();
m_np->writeAllBodiesToGpu();
m_bp->writeAabbsToGpu();
m_rbp->writeAllInstancesToGpu();
}
void BasicGpuDemo::clientResetScene()
@@ -382,7 +383,11 @@ void BasicGpuDemo::exitPhysics()
delete m_collisionConfiguration;
delete m_np;
delete m_bp;
delete m_rbp;
}

6
Demos3/BasicGpuDemo/BasicGpuDemo.h
View File

@@ -48,6 +48,12 @@ class BasicGpuDemo : public PlatformDemoApplication
btDefaultCollisionConfiguration* m_collisionConfiguration;
class b3GpuNarrowPhase* m_np;
class b3GpuSapBroadphase* m_bp;
class b3GpuRigidBodyPipeline* m_rbp;
struct btInternalData* m_clData;
void initCL(int d, int p);