diff --git a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp index d87887c33..fe41c8ba0 100644 --- a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp +++ b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp @@ -220,8 +220,8 @@ void ConcaveDemo::initPhysics() { for (int i=0;i<10;i++) { - //btCollisionShape* boxShape = new btBoxShape(btVector3(1,1,1)); - btCollisionShape* boxShape = new btSphereShape(1.f); + btCollisionShape* boxShape = new btBoxShape(btVector3(1,1,1)); + //btCollisionShape* boxShape = new btSphereShape(1.f); startTransform.setOrigin(btVector3(2*i,10,1)); localCreateRigidBody(1, startTransform,boxShape); } diff --git a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp index ae43a4064..9cdc6a5cc 100644 --- a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp +++ b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp @@ -57,8 +57,8 @@ struct CollisionTask_LocalStoreMemory static const int maxShapeSize = MAX_SHAPE_SIZE;//todo: make some compile-time assert that this is value is larger then sizeof(btCollisionShape) - ATTRIBUTE_ALIGNED16(char gCollisionShape0[maxShapeSize]); - ATTRIBUTE_ALIGNED16(char gCollisionShape1[maxShapeSize]); + ATTRIBUTE_ALIGNED16(char gCollisionShape0[MAX_SHAPE_SIZE+1]);//todo: check out why leaving out '+1' causes troubles + ATTRIBUTE_ALIGNED16(char gCollisionShape1[MAX_SHAPE_SIZE+1]); ATTRIBUTE_ALIGNED16(int spuIndices[16]);