From 699ba8f5b2c2d15470f53ccc47ad0fb7549c240a Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Thu, 11 Jun 2009 14:32:41 +0000 Subject: [PATCH] forgot to update Demos/Gpu2dDemo for btMultiSphereShape change (removed 1st argument) --- Demos/Gpu2dDemo/BasicDemo.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Demos/Gpu2dDemo/BasicDemo.cpp b/Demos/Gpu2dDemo/BasicDemo.cpp index 9672ae814..5c5dca2f8 100644 --- a/Demos/Gpu2dDemo/BasicDemo.cpp +++ b/Demos/Gpu2dDemo/BasicDemo.cpp @@ -119,10 +119,8 @@ public: btDefaultMotionState* myMotionState= 0; - btVector3 inertiaHalfExtents; btVector3 aabbMin,aabbMax; compoundTmpShape->getAabb(btTransform::getIdentity(),aabbMin,aabbMax); - inertiaHalfExtents = (aabbMax-aabbMin)*0.5; int numSpheres = compoundTmpShape->getNumChildShapes(); btAssert(numSpheres>0); if (numSpheres>8) @@ -142,7 +140,7 @@ public: positions[i] = compoundTmpShape->getChildTransform(i).getOrigin(); } - btMultiSphereShape* multiSphere = new btMultiSphereShape(inertiaHalfExtents,positions,radii,numSpheres); + btMultiSphereShape* multiSphere = new btMultiSphereShape(positions,radii,numSpheres); m_demo->addCollisionShape(multiSphere); btVector3 localInertia(0,0,0); @@ -343,8 +341,8 @@ void BasicDemo::initPhysics() // sSphPos[0].setX(sSphPos[0].getX()-0.15); #undef SPR btMultiSphereShape* colShape[2]; - colShape[0] = new btMultiSphereShape(inertiaHalfExtents, sSphPos, sSphRad, 8); - colShape[1] = new btMultiSphereShape(inertiaHalfExtents, sSphPos, sSphRad, 2); + colShape[0] = new btMultiSphereShape( sSphPos, sSphRad, 8); + colShape[1] = new btMultiSphereShape( sSphPos, sSphRad, 2); //btCollisionShape* colShape = new btSphereShape(btScalar(1.)); m_collisionShapes.push_back(colShape[0]);