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

Cleanup compilation warnings.

Browse Source
This commit is contained in:
sjbaker
2008-02-12 04:22:31 +00:00
parent 05877799af
commit 04d41b7a0a
15 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/BulletDinoDemo/BulletDino.c
View File

@@ -385,7 +385,7 @@ static GLfloat floorShadow[4][4];
static void
redraw(void)
{
int start, end;
int start = 0, end = 0 ;
if (reportSpeed) {
start = glutGet(GLUT_ELAPSED_TIME);

6
Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
View File

@@ -138,7 +138,7 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
std::vector<btVector3> vertices;
if ( 1 )
{
const unsigned int *src = result.mHullIndices;
//const unsigned int *src = result.mHullIndices;
for (unsigned int i=0; i<result.mHullVcount; i++)
{
btVector3 vertex(result.mHullVertices[i*3],result.mHullVertices[i*3+1],result.mHullVertices[i*3+2]);
@@ -152,7 +152,7 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
if ( 1 )
{
const unsigned int *src = result.mHullIndices;
//const unsigned int *src = result.mHullIndices;
for (unsigned int i=0; i<result.mHullVcount; i++)
{
btVector3 vertex(result.mHullVertices[i*3],result.mHullVertices[i*3+1],result.mHullVertices[i*3+2]);
@@ -197,7 +197,7 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
}
float mass = 1.f;
float collisionMargin = 0.01f;
//float collisionMargin = 0.01f;
//this is a tools issue: due to collision margin, convex objects overlap, compensate for it here:
//#define SHRINK_OBJECT_INWARDS 1

2
Demos/EPAPenDepthDemo/PenetrationTestBullet.cpp
View File

@@ -300,7 +300,7 @@ static bool TestEPA(const MyConvex& hull0, const MyConvex& hull1)
#endif
btConvexPenetrationDepthSolver* Solver;
btConvexPenetrationDepthSolver* Solver = NULL ;
if(gMethod==0)
Solver = &Solver0;
else if(gMethod==1)

14
Demos/OpenGL/DemoApplication.cpp
View File

@@ -431,7 +431,6 @@ void DemoApplication::shootBox(const btVector3& destination)
if (m_dynamicsWorld)
{
bool isDynamic = true;
float mass = 1.f;
btTransform startTransform;
startTransform.setIdentity();
@@ -851,14 +850,11 @@ void DemoApplication::renderme()
//bool useBulletLCP = !(getDebugMode() & btIDebugDraw::DBG_DisableBulletLCP);
bool useCCD = (getDebugMode() & btIDebugDraw::DBG_EnableCCD);
/* glRasterPos3f(xOffset,yStart,0);
sprintf(buf,"1 CCD mode (adhoc) = %i",useCCD);
BMF_DrawString(BMF_GetFont(BMF_kHelvetica10),buf);
yStart += yIncr;
*/
//bool useCCD = (getDebugMode() & btIDebugDraw::DBG_EnableCCD);
//glRasterPos3f(xOffset,yStart,0);
//sprintf(buf,"1 CCD mode (adhoc) = %i",useCCD);
//BMF_DrawString(BMF_GetFont(BMF_kHelvetica10),buf);
//yStart += yIncr;
glRasterPos3f(xOffset,yStart,0);

3
Demos/OpenGL/GLDebugDrawer.cpp
View File

@@ -93,4 +93,5 @@ void GLDebugDrawer::drawAabb(const btVector3& from,const btVector3& to,const btV
}
}
}