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

example Collision: catch case where no collision world is created

Browse Source
This commit is contained in:
erwincoumans
2015-10-24 14:00:53 -07:00
parent 25fb92c4c9
commit 52edac4ef2
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/Collision/CollisionTutorialBullet2.cpp
View File

@@ -245,7 +245,10 @@ public:
numNearCallbacks = 0; numNearCallbacks = 0;
{ {
BT_PROFILE("plWorldCollide"); BT_PROFILE("plWorldCollide");
plWorldCollide(m_collisionSdkHandle,m_collisionWorldHandle,myNearCallback, myUserPtr); if (m_collisionSdkHandle && m_collisionWorldHandle)
{
plWorldCollide(m_collisionSdkHandle,m_collisionWorldHandle,myNearCallback, myUserPtr);
}
} }
#if 0 #if 0

3
examples/Collision/Internal/RealTimeBullet3CollisionSdk.cpp
View File

@@ -3,6 +3,7 @@
#include "Bullet3Common/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h" #include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h" #include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h"
#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
//convert the opaque pointer to int //convert the opaque pointer to int
struct RTB3_ColliderOpaque2Int struct RTB3_ColliderOpaque2Int
@@ -48,6 +49,8 @@ struct RTB3CollisionWorld
b3AlignedObjectArray<b3Collidable> m_collidables; b3AlignedObjectArray<b3Collidable> m_collidables;
b3AlignedObjectArray<b3GpuChildShape> m_childShapes; b3AlignedObjectArray<b3GpuChildShape> m_childShapes;
b3AlignedObjectArray<b3Aabb> m_localSpaceAabbs;
b3AlignedObjectArray<b3Aabb> m_worldSpaceAabbs;
b3AlignedObjectArray<b3GpuFace> m_planeFaces; b3AlignedObjectArray<b3GpuFace> m_planeFaces;
b3AlignedObjectArray<b3CompoundOverlappingPair> m_compoundOverlappingPairs; b3AlignedObjectArray<b3CompoundOverlappingPair> m_compoundOverlappingPairs;
int m_nextFreeShapeIndex; int m_nextFreeShapeIndex;