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

remove all warnings on Mac OSX Snow Leopard

Browse Source
This commit is contained in:
erwin.coumans
2010-01-30 22:31:56 +00:00
parent 77b773f470
commit 788f48643b
40 changed files with 136 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Demos/GimpactTestDemo/GimpactTestDemo.cpp
View File

@@ -482,12 +482,14 @@ void GimpactConcaveDemo::initPhysics()
startTransform.setOrigin(btVector3(0,height,-5));
startTransform.setRotation(btQuaternion(0,0,3.14159265*0.5));
btRigidBody* bodyA = localCreateRigidBody(massT, startTransform,m_trimeshShape);
btRigidBody* bodyA;
bodyA= localCreateRigidBody(massT, startTransform,m_trimeshShape);
height -= step;
startTransform.setOrigin(btVector3(0,height,-5));
startTransform.setRotation(btQuaternion(3.14159265*0.5,0,3.14159265*0.5));
btRigidBody* bodyB = localCreateRigidBody(massT, startTransform,m_trimeshShape);
btRigidBody* bodyB;
bodyB= localCreateRigidBody(massT, startTransform,m_trimeshShape);
}
#else
@@ -601,7 +603,7 @@ void GimpactConcaveDemo::clientMoveAndDisplay()
unsigned long int time = getDeltaTimeMicroseconds()/btScalar(1000);
printf("%i time %i ms \n",m_steps_done,time);
printf("%i time %i ms \n",m_steps_done,int(time));
//#ifdef BULLET_GIMPACT
// printf("%i time %.1f ms \n",m_steps_done,btGImpactCollisionAlgorithm::getAverageTreeCollisionTime());

22
Demos/GimpactTestDemo/GimpactTestDemo.h
View File

@@ -60,17 +60,23 @@ class GimpactConcaveDemo : public PlatformDemoApplication
public:
GimpactConcaveDemo()
: m_trimeshShape(NULL),
: m_steps_done(0),
m_trimeshShape(NULL),
m_trimeshShape2(NULL),
m_indexVertexArrays(NULL),
m_indexVertexArrays2(NULL),
m_collisionConfiguration(NULL),
m_dispatcher(NULL),
m_broadphase(NULL),
kinematicTorus(NULL),
m_constraintSolver(NULL),
m_gimpactCollisionCreateFunc(NULL),
m_steps_done(0)
kinematicTorus(NULL),
m_gimpactCollisionCreateFunc(NULL),
m_collisionConfiguration(NULL),
m_dispatcher(NULL),
m_broadphase(NULL),
m_constraintSolver(NULL)
{
}