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

updated GimpactTestDemo into AllBulletDemos

Browse Source
This commit is contained in:
ejcoumans
2007-10-24 02:00:27 +00:00
parent d10eac87c6
commit 5e343b54b2
6 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Demos/ConcaveDemo/ConcavePhysicsDemo.cpp
View File

@@ -30,10 +30,10 @@ subject to the following restrictions:
btVector3* gVertices=0;
int* gIndices=0;
btBvhTriangleMeshShape* trimeshShape =0;
btRigidBody* staticBody = 0;
static btVector3* gVertices=0;
static int* gIndices=0;
static btBvhTriangleMeshShape* trimeshShape =0;
static btRigidBody* staticBody = 0;
static float waveheight = 5.f;
const float TRIANGLE_SIZE=8.f;
@@ -61,7 +61,7 @@ inline btScalar calculateCombinedRestitution(float restitution0,float restitutio
bool CustomMaterialCombinerCallback(btManifoldPoint& cp, const btCollisionObject* colObj0,int partId0,int index0,const btCollisionObject* colObj1,int partId1,int index1)
static bool CustomMaterialCombinerCallback(btManifoldPoint& cp, const btCollisionObject* colObj0,int partId0,int index0,const btCollisionObject* colObj1,int partId1,int index1)
{
float friction0 = colObj0->getFriction();