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

forgot to update Demos/Gpu2dDemo for btMultiSphereShape change (removed 1st argument)

Browse Source
This commit is contained in:
erwin.coumans
2009-06-11 14:32:41 +00:00
parent f552a1dbbf
commit 699ba8f5b2
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Demos/Gpu2dDemo/BasicDemo.cpp
View File

@@ -119,10 +119,8 @@ public:
btDefaultMotionState* myMotionState= 0; btDefaultMotionState* myMotionState= 0;
btVector3 inertiaHalfExtents;
btVector3 aabbMin,aabbMax; btVector3 aabbMin,aabbMax;
compoundTmpShape->getAabb(btTransform::getIdentity(),aabbMin,aabbMax); compoundTmpShape->getAabb(btTransform::getIdentity(),aabbMin,aabbMax);
inertiaHalfExtents = (aabbMax-aabbMin)*0.5;
int numSpheres = compoundTmpShape->getNumChildShapes(); int numSpheres = compoundTmpShape->getNumChildShapes();
btAssert(numSpheres>0); btAssert(numSpheres>0);
if (numSpheres>8) if (numSpheres>8)
@@ -142,7 +140,7 @@ public:
positions[i] = compoundTmpShape->getChildTransform(i).getOrigin(); 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); m_demo->addCollisionShape(multiSphere);
btVector3 localInertia(0,0,0); btVector3 localInertia(0,0,0);
@@ -343,8 +341,8 @@ void BasicDemo::initPhysics()
// sSphPos[0].setX(sSphPos[0].getX()-0.15); // sSphPos[0].setX(sSphPos[0].getX()-0.15);
#undef SPR #undef SPR
btMultiSphereShape* colShape[2]; btMultiSphereShape* colShape[2];
colShape[0] = new btMultiSphereShape(inertiaHalfExtents, sSphPos, sSphRad, 8); colShape[0] = new btMultiSphereShape( sSphPos, sSphRad, 8);
colShape[1] = new btMultiSphereShape(inertiaHalfExtents, sSphPos, sSphRad, 2); colShape[1] = new btMultiSphereShape( sSphPos, sSphRad, 2);
//btCollisionShape* colShape = new btSphereShape(btScalar(1.)); //btCollisionShape* colShape = new btSphereShape(btScalar(1.));
m_collisionShapes.push_back(colShape[0]); m_collisionShapes.push_back(colShape[0]);