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

10
Demos/BasicDemo/main.cpp
View File

@@ -66,12 +66,12 @@ int main(int argc,char** argv)
map.remove(key2);
const OurValue* ourPtr = map.find(key1);
for (int i=0;i<map.size();i++)
{
OurValue* tmp = map.getAtIndex(i);
// const OurValue* ourPtr = map.find(key1);
// for (int i=0;i<map.size();i++)
// {
// OurValue* tmp = map.getAtIndex(i);
//printf("tmp value=%f,%f,%f\n",tmp->m_position.getX(),tmp->m_position.getY(),tmp->m_position.getZ());
}
// }
BasicDemo ccdDemo;
ccdDemo.initPhysics();

9
Demos/Benchmarks/BenchmarkDemo.cpp
View File

@@ -223,7 +223,7 @@ void BenchmarkDemo::clientMoveAndDisplay()
#endif //USE_GRAPHICAL_BENCHMARK
//simple dynamics world doesn't handle fixed-time-stepping
float ms = getDeltaTimeMicroseconds();
//float ms = getDeltaTimeMicroseconds();
///step the simulation
if (m_dynamicsWorld)
@@ -427,7 +427,8 @@ void BenchmarkDemo::createTest1()
pos[0] = offset + (float)i * (cubeSize * 2.0f + spacing);
trans.setOrigin(pos);
btRigidBody* cmbody = localCreateRigidBody(mass,trans,blockShape);
btRigidBody* cmbody;
cmbody= localCreateRigidBody(mass,trans,blockShape);
}
}
offset -= 0.05f * spacing * (size-1);
@@ -449,7 +450,7 @@ void BenchmarkDemo::createWall(const btVector3& offsetPosition,int stackSize,con
btVector3 localInertia(0,0,0);
blockShape->calculateLocalInertia(mass,localInertia);
float diffX = boxSize[0] * 1.0f;
// float diffX = boxSize[0] * 1.0f;
float diffY = boxSize[1] * 1.0f;
float diffZ = boxSize[2] * 1.0f;
@@ -863,7 +864,7 @@ void BenchmarkDemo::createTest3()
float sizeX = 1.f;
float sizeY = 1.f;
int rc=0;
//int rc=0;
btScalar scale(3.5);
btVector3 pos(0.0f, sizeY, 0.0f);

139
Demos/Benchmarks/Taru.mdl
View File

@@ -47,142 +47,3 @@ static float TaruVtx[] = {
1.08664f,1.99237f,0.0f,
};
static float TaruNml[] = {
0.938103f,-0.346356f,0.0f,
0.663339f,-0.346356f,-0.663339f,
0.707107f,0.0f,-0.707107f,
1.0f,0.0f,0.0f,
0.0f,-0.346356f,-0.938103f,
0.0f,0.0f,-1.0f,
0.0f,-0.346356f,-0.938103f,
-0.663339f,-0.346356f,-0.663339f,
-0.707107f,0.0f,-0.707107f,
0.0f,0.0f,-1.0f,
-0.938103f,-0.346356f,0.0f,
-1.0f,0.0f,0.0f,
-0.663339f,-0.346356f,0.663339f,
-0.707107f,0.0f,0.707107f,
0.0f,-0.346356f,0.938103f,
1.21445e-007f,0.0f,1.0f,
0.663339f,-0.346356f,0.663339f,
0.707107f,0.0f,0.707107f,
0.663339f,0.346356f,-0.663339f,
0.938103f,0.346356f,0.0f,
0.0f,0.346356f,-0.938103f,
-0.663339f,0.346356f,-0.663339f,
0.0f,0.346356f,-0.938103f,
-0.938103f,0.346356f,0.0f,
-0.663339f,0.346356f,0.663339f,
1.2508e-007f,0.346356f,0.938103f,
0.663339f,0.346356f,0.663339f,
0.0f,-1.0f,0.0f,
0.0f,-1.0f,0.0f,
0.0f,-1.0f,0.0f,
0.0f,-1.0f,0.0f,
0.0f,-1.0f,0.0f,
0.0f,-1.0f,0.0f,
0.0f,-1.0f,0.0f,
0.0f,-1.0f,0.0f,
0.0f,1.0f,0.0f,
0.0f,1.0f,0.0f,
0.0f,1.0f,0.0f,
0.0f,1.0f,0.0f,
0.0f,1.0f,0.0f,
0.0f,1.0f,0.0f,
0.0f,1.0f,0.0f,
0.0f,1.0f,0.0f,
};
static float TaruTex[] = {
0.75f,0.0f,
0.875f,0.0f,
0.875f,0.5f,
0.75f,0.5f,
1.0f,0.0f,
1.0f,0.5f,
0.0f,0.0f,
0.125f,0.0f,
0.125f,0.5f,
0.0f,0.5f,
0.25f,0.0f,
0.25f,0.5f,
0.375f,0.0f,
0.375f,0.5f,
0.5f,0.0f,
0.5f,0.5f,
0.625f,0.0f,
0.625f,0.5f,
0.875f,1.0f,
0.75f,1.0f,
1.0f,1.0f,
0.125f,1.0f,
0.0f,1.0f,
0.25f,1.0f,
0.375f,1.0f,
0.5f,1.0f,
0.625f,1.0f,
1.0f,0.5f,
0.853553f,0.146447f,
0.5f,0.0f,
0.146447f,0.146447f,
0.0f,0.5f,
0.146447f,0.853553f,
0.5f,1.0f,
0.853553f,0.853553f,
0.146447f,0.853553f,
0.0f,0.5f,
0.146447f,0.146447f,
0.5f,0.0f,
0.853553f,0.146447f,
1.0f,0.5f,
0.853553f,0.853553f,
0.5f,1.0f,
};
static unsigned short TaruIdx[] = {
0,1,2,
2,3,0,
1,4,5,
5,2,1,
6,7,8,
8,9,6,
7,10,11,
11,8,7,
10,12,13,
13,11,10,
12,14,15,
15,13,12,
14,16,17,
17,15,14,
16,0,3,
3,17,16,
3,2,18,
18,19,3,
2,5,20,
20,18,2,
9,8,21,
21,22,9,
8,11,23,
23,21,8,
11,13,24,
24,23,11,
13,15,25,
25,24,13,
15,17,26,
26,25,15,
17,3,19,
19,26,17,
27,28,29,
29,30,31,
31,32,33,
29,31,33,
27,29,33,
34,27,33,
35,36,37,
37,38,39,
39,40,41,
37,39,41,
35,37,41,
42,35,41,
};

2
Demos/Benchmarks/main.cpp
View File

@@ -44,7 +44,7 @@ int main(int argc,char** argv)
BenchmarkDemo7 benchmarkDemo7;
BenchmarkDemo* demoArray[NUM_DEMOS] = {&benchmarkDemo1,&benchmarkDemo2,&benchmarkDemo3,&benchmarkDemo4,&benchmarkDemo5,&benchmarkDemo6,&benchmarkDemo7};
char* demoNames[NUM_DEMOS] = {"3000 fall", "1000 stack", "136 ragdolls","1000 convex", "prim-trimesh", "convex-trimesh","raytests"};
const char* demoNames[NUM_DEMOS] = {"3000 fall", "1000 stack", "136 ragdolls","1000 convex", "prim-trimesh", "convex-trimesh","raytests"};
float totalTime[NUM_DEMOS] = {0.f,0.f,0.f,0.f,0.f,0.f,0.f};
#ifdef USE_GRAPHICAL_BENCHMARK

8
Demos/Box2dDemo/Box2dDemo.cpp
View File

@@ -114,7 +114,7 @@ void Box2dDemo::initPhysics()
toggle = m_dialogDynamicsWorld->createToggle(settings,"Toggle 2");
toggle ->m_active = true;
toggle = m_dialogDynamicsWorld->createToggle(settings,"Toggle 3");
GL_SliderControl* slider = m_dialogDynamicsWorld->createSlider(settings,"Slider");
// GL_SliderControl* slider = m_dialogDynamicsWorld->createSlider(settings,"Slider");
GL_DialogWindow* dialog = m_dialogDynamicsWorld->createDialog(0,200,420,300,"Help");
GL_TextControl* txt = new GL_TextControl;
@@ -242,9 +242,9 @@ void Box2dDemo::initPhysics()
if (isDynamic)
colShape->calculateLocalInertia(mass,localInertia);
float start_x = START_POS_X - ARRAY_SIZE_X/2;
float start_y = START_POS_Y;
float start_z = START_POS_Z - ARRAY_SIZE_Z/2;
// float start_x = START_POS_X - ARRAY_SIZE_X/2;
// float start_y = START_POS_Y;
// float start_z = START_POS_Z - ARRAY_SIZE_Z/2;
btVector3 x(-ARRAY_SIZE_X, 8.0f,-20.f);
btVector3 y;

1
Demos/CMakeLists.txt
View File

@@ -11,6 +11,7 @@ InternalEdgeDemo
GimpactTestDemo
GenericJointDemo
SerializeDemo
SoftDemo
)

2
Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp
View File

@@ -186,7 +186,7 @@ void CollisionInterfaceDemo::displayCallback(void) {
{
btPersistentManifold* contactManifold = manifoldArray[i];
btCollisionObject* obA = static_cast<btCollisionObject*>(contactManifold->getBody0());
btCollisionObject* obB = static_cast<btCollisionObject*>(contactManifold->getBody1());
// btCollisionObject* obB = static_cast<btCollisionObject*>(contactManifold->getBody1());
glDisable(GL_DEPTH_TEST);
int numContacts = contactManifold->getNumContacts();

3
Demos/ConstraintDemo/ConstraintDemo.cpp
View File

@@ -109,7 +109,8 @@ void ConstraintDemo::initPhysics()
btTransform groundTransform;
groundTransform.setIdentity();
groundTransform.setOrigin(btVector3(0,-56,0));
btRigidBody* groundBody = localCreateRigidBody(0, groundTransform, groundShape);
btRigidBody* groundBody;
groundBody= localCreateRigidBody(0, groundTransform, groundShape);

5
Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
View File

@@ -287,7 +287,7 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
}
}
float mass = 1.f;
// float mass = 1.f;
//float collisionMargin = 0.01f;
//this is a tools issue: due to collision margin, convex objects overlap, compensate for it here:
@@ -463,7 +463,8 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
btConvexHullShape* convexShape = convexDecomposition.m_convexShapes[i];
compound->addChildShape(trans,convexShape);
btRigidBody* body = localCreateRigidBody( 1.0, trans,convexShape);
btRigidBody* body;
body = localCreateRigidBody( 1.0, trans,convexShape);
}
#if 1

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)
{
}

13
Demos/OpenGL/DemoApplication.cpp
View File

@@ -65,23 +65,24 @@ m_ele(20.f),
m_azi(0.f),
m_cameraPosition(0.f,0.f,0.f),
m_cameraTargetPosition(0.f,0.f,0.f),
m_mouseOldX(0),
m_mouseOldY(0),
m_mouseButtons(0),
m_modifierKeys(0),
m_scaleBottom(0.5f),
m_scaleFactor(2.f),
m_cameraUp(0,1,0),
m_forwardAxis(2),
m_glutScreenWidth(0),
m_glutScreenHeight(0),
m_ortho(0),
m_ShootBoxInitialSpeed(40.f),
m_stepping(true),
m_singleStep(false),
m_idle(false),
m_enableshadows(false),
m_sundirection(btVector3(1,-2,1)*1000),
m_ortho(0),
m_mouseOldX(0),
m_mouseOldY(0),
m_mouseButtons(0),
m_modifierKeys(0)
m_sundirection(btVector3(1,-2,1)*1000)
{
#ifndef BT_NO_PROFILE
m_profileIterator = CProfileManager::Get_Iterator();

11
Demos/OpenGL/GLDebugFont.cpp
View File

@@ -48,6 +48,8 @@ subject to the following restrictions:
#include <string.h> //for memset
extern unsigned char sFontData[];
static bool sTexturesInitialized = false;
static GLuint sTexture = -1;
static int sScreenWidth = -1;
static int sScreenHeight = -1;
@@ -62,8 +64,9 @@ void GLDebugResetFont(int screenWidth,int screenHeight)
sScreenWidth = screenWidth;
sScreenHeight = screenHeight;
if (sTexture==-1)
if (!sTexturesInitialized)
{
sTexturesInitialized = true;
glGenTextures(1, &sTexture);
glBindTexture(GL_TEXTURE_2D, sTexture);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
@@ -71,8 +74,6 @@ void GLDebugResetFont(int screenWidth,int screenHeight)
glTexImage2D(GL_TEXTURE_2D, 0, 3, 256 , 256 , 0, GL_RGB, GL_UNSIGNED_BYTE, &sFontData[0]);
}
int windowWidth=screenWidth;
int windowHeight = screenHeight;
printf("generating font at resolution %d,%d\n",screenWidth,screenHeight);
}
@@ -82,9 +83,7 @@ void GLDebugResetFont(int screenWidth,int screenHeight)
void GLDebugDrawStringInternal(int x,int y,const char* string, const btVector3& rgb)
{
const char* string2 = "test";
if (sTexture==-1)
if (!sTexturesInitialized)
{
GLDebugResetFont(sScreenWidth,sScreenHeight);
}

7
Demos/OpenGL/GL_DialogDynamicsWorld.cpp
View File

@@ -249,12 +249,13 @@ GL_SliderControl* GL_DialogDynamicsWorld::createSlider(GL_DialogWindow* dialog,
btTransform frameInB;
frameInB.setIdentity();
//frameInB.setOrigin(-offset/2);
bool useFrameA = false;
btScalar lowerLimit = 80.f;
btScalar upperLimit = 170.f;
#if 0
bool useFrameA = false;
btGeneric6DofConstraint* constraint = new btGeneric6DofConstraint(*dialogBody,*body,frameInA,frameInB,useFrameA);
m_dynamicsWorld->addConstraint(constraint,true);
constraint->setLimit(0,lowerLimit,upperLimit);
@@ -339,7 +340,7 @@ void GL_DialogDynamicsWorld::draw(btScalar timeStep)
static btRigidBody* pickedBody = 0;//for deactivation state
static btScalar mousePickClamping = 111130.f;
static int gPickingConstraintId = 0;
//static int gPickingConstraintId = 0;
static btVector3 gOldPickingPos;
static btVector3 gHitPos(-1,-1,-1);

7
Demos/OpenGL/GL_DialogWindow.cpp
View File

@@ -30,9 +30,10 @@ m_dialogWidth(dialogWidth),
m_dialogHeight(dialogHeight),
m_screenWidth(0),
m_screenHeight(0),
m_dialogTitle(dialogTitle),
m_MaxClipPlanes(-1),
m_collisionObject(collisionObject),
m_dialogTitle(dialogTitle)
m_collisionObject(collisionObject)
{
}
@@ -291,7 +292,7 @@ void GL_ToggleControl::draw(int& parentHorPos2,int& parentVertPos2,btScalar delt
if (m_active)
{
//unsigned int red = 0xff8f0000;
unsigned int white = 0xff8f0000;
// unsigned int white = 0xff8f0000;
unsigned int black = 0xff1f1f1f;
borderSize = 4;
drawRect(parentHorPos+borderSize, parentVertPos+borderSize, parentHorPos+16-borderSize, parentVertPos+16-borderSize, black,black,black,black);

4
Demos/OpenGL/GL_DialogWindow.h
View File

@@ -130,10 +130,10 @@ public:
GL_SliderControl(const char* sliderText,btCollisionObject* sliderBody, GL_DialogWindow* parentWindow, btScalar lowerLimit,btScalar upperLimit,btTypedConstraint* constaint)
:m_sliderBody(sliderBody),
m_parentWindow(parentWindow),
m_sliderText(sliderText),
m_lowerLimit(lowerLimit),
m_upperLimit(upperLimit),
m_constraint(constaint)
m_constraint(constaint),
m_sliderText(sliderText)
{
m_type = GL_SLIDER_CONTROL;
}

10
Demos/OpenGL/GL_ShapeDrawer.cpp
View File

@@ -532,7 +532,7 @@ void GL_ShapeDrawer::drawOpenGL(btScalar* m, const btCollisionShape* shape, cons
static const GLfloat planex[]={1,0,0,0};
static const GLfloat planey[]={0,1,0,0};
// static const GLfloat planey[]={0,1,0,0};
static const GLfloat planez[]={0,0,1,0};
glTexGenfv(GL_S,GL_OBJECT_PLANE,planex);
glTexGenfv(GL_T,GL_OBJECT_PLANE,planez);
@@ -839,10 +839,10 @@ void GL_ShapeDrawer::drawOpenGL(btScalar* m, const btCollisionShape* shape, cons
btVector3 normal;
btVector3 vtx;
polyshape->getPlane(normal,vtx,i);
btScalar d = vtx.dot(normal);
//btScalar d = vtx.dot(normal);
char buf[12];
sprintf(buf," plane %d",i);
//char buf[12];
//sprintf(buf," plane %d",i);
//btDrawString(BMF_GetFont(BMF_kHelvetica10),buf);
}
@@ -921,7 +921,7 @@ void GL_ShapeDrawer::drawShadow(btScalar* m,const btVector3& extrusion,const bt
}
else
{
bool useWireframeFallback = true;
// bool useWireframeFallback = true;
if (shape->isConvex())
{
ShapeCache* sc=cache((btConvexShape*)shape);

12
Demos/SerializeDemo/main.cpp
View File

@@ -66,12 +66,12 @@ int main(int argc,char** argv)
map.remove(key2);
const OurValue* ourPtr = map.find(key1);
for (int i=0;i<map.size();i++)
{
OurValue* tmp = map.getAtIndex(i);
//printf("tmp value=%f,%f,%f\n",tmp->m_position.getX(),tmp->m_position.getY(),tmp->m_position.getZ());
}
// const OurValue* ourPtr = map.find(key1);
// for (int i=0;i<map.size();i++)
// {
// OurValue* tmp = map.getAtIndex(i);
// //printf("tmp value=%f,%f,%f\n",tmp->m_position.getX(),tmp->m_position.getY(),tmp->m_position.getZ());
// }
SerializeDemo ccdDemo;
ccdDemo.initPhysics();

2
Demos/SoftDemo/SoftDemo.cpp
View File

@@ -1526,7 +1526,7 @@ void SoftDemo::renderme()
}
long ms=btMax<long>(m_clock.getTimeMilliseconds(),1);
long rayperseconds=(1000*(origins.size()*sbs.size()))/ms;
printf("%d ms (%d rays/s)\r\n",ms,rayperseconds);
printf("%d ms (%d rays/s)\r\n",int(ms),int(rayperseconds));
}
/* Draw rays */
const btVector3 c[]={ origins[0],