remove all warnings on Mac OSX Snow Leopard
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user