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

remove some warnings, thanks to Zenja http://bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=4063

Browse Source
This commit is contained in:
erwin.coumans
2009-09-09 23:51:30 +00:00
parent cc5ba4608f
commit ed09140fb7
11 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
View File

@@ -365,9 +365,10 @@ void btConvexConvexAlgorithm ::processCollision (btCollisionObject* body0,btColl
btVector3 v0,v1;
btVector3 sepNormalWorldSpace;
btScalar sepDist = 0.f;
#ifdef USE_SEPDISTANCE_UTIL2
btScalar sepDist = 0.f;
if (dispatchInfo.m_useConvexConservativeDistanceUtil)
{
sepDist = gjkPairDetector.getCachedSeparatingDistance();

4
src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
View File

@@ -102,9 +102,9 @@ void btConvexPlaneCollisionAlgorithm::processCollision (btCollisionObject* body0
btConvexShape* convexShape = (btConvexShape*) convexObj->getCollisionShape();
btStaticPlaneShape* planeShape = (btStaticPlaneShape*) planeObj->getCollisionShape();
bool hasCollision = false;
const btVector3& planeNormal = planeShape->getPlaneNormal();
const btScalar& planeConstant = planeShape->getPlaneConstant();
//const btScalar& planeConstant = planeShape->getPlaneConstant();
//first perform a collision query with the non-perturbated collision objects
{

2
src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
View File

@@ -23,7 +23,7 @@ btMultiSphereShape::btMultiSphereShape (const btVector3* positions,const btScala
:btConvexInternalAabbCachingShape ()
{
m_shapeType = MULTI_SPHERE_SHAPE_PROXYTYPE;
btScalar startMargin = btScalar(BT_LARGE_FLOAT);
//btScalar startMargin = btScalar(BT_LARGE_FLOAT);
m_localPositionArray.resize(numSpheres);
m_radiArray.resize(numSpheres);

2
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
View File

@@ -870,7 +870,7 @@ void btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep)
gNumClampedCcdMotions++;
btClosestNotMeConvexResultCallback sweepResults(body,body->getWorldTransform().getOrigin(),predictedTrans.getOrigin(),getBroadphase()->getOverlappingPairCache(),getDispatcher());
btConvexShape* convexShape = static_cast<btConvexShape*>(body->getCollisionShape());
//btConvexShape* convexShape = static_cast<btConvexShape*>(body->getCollisionShape());
btSphereShape tmpSphere(body->getCcdSweptSphereRadius());//btConvexShape* convexShape = static_cast<btConvexShape*>(body->getCollisionShape());
sweepResults.m_collisionFilterGroup = body->getBroadphaseProxy()->m_collisionFilterGroup;

6
src/BulletMultiThreaded/SpuCollisionTaskProcess.cpp
View File

@@ -97,7 +97,7 @@ void SpuCollisionTaskProcess::initialize2(bool useEpa)
printf("SpuCollisionTaskProcess::initialize()\n");
#endif //DEBUG_SPU_TASK_SCHEDULING
for (int i = 0; i < m_maxNumOutstandingTasks; i++)
for (int i = 0; i < int (m_maxNumOutstandingTasks); i++)
{
m_taskBusy[i] = false;
}
@@ -153,7 +153,7 @@ void SpuCollisionTaskProcess::issueTask2()
unsigned int outputSize;
for (int i=0;i<m_maxNumOutstandingTasks;i++)
for (int i=0;i<int (m_maxNumOutstandingTasks);i++)
{
if (m_taskBusy[i])
{
@@ -287,7 +287,7 @@ SpuCollisionTaskProcess::flush2()
unsigned int taskId=-1;
unsigned int outputSize;
for (int i=0;i<m_maxNumOutstandingTasks;i++)
for (int i=0;i<int (m_maxNumOutstandingTasks);i++)
{
if (m_taskBusy[i])
{

2
src/BulletMultiThreaded/Win32ThreadSupport.cpp
View File

@@ -108,7 +108,7 @@ void Win32ThreadSupport::sendRequest(uint32_t uiCommand, ppu_address_t uiArgumen
btSpuStatus& spuStatus = m_activeSpuStatus[taskId];
btAssert(taskId>=0);
btAssert(taskId<m_activeSpuStatus.size());
btAssert(int(taskId)<m_activeSpuStatus.size());
spuStatus.m_commandId = uiCommand;
spuStatus.m_status = 1;

6
src/BulletSoftBody/btSoftBody.cpp
View File

@@ -2180,7 +2180,7 @@ void btSoftBody::updateClusters()
{
btSoftBody::Cluster& c=*m_clusters[i];
const int n=c.m_nodes.size();
const btScalar invn=1/(btScalar)n;
//const btScalar invn=1/(btScalar)n;
if(n)
{
/* Frame */
@@ -2326,7 +2326,7 @@ void btSoftBody::applyClusters(bool drift)
{
BT_PROFILE("ApplyClusters");
const btScalar f0=m_sst.sdt;
const btScalar f1=f0/2;
//const btScalar f1=f0/2;
btAlignedObjectArray<btVector3> deltas;
btAlignedObjectArray<btScalar> weights;
deltas.resize(m_nodes.size(),btVector3(0,0,0));
@@ -2780,7 +2780,7 @@ void btSoftBody::PSolve_Links(btSoftBody* psb,btScalar kst,btScalar ti)
const btVector3 del=b.m_x-a.m_x;
const btScalar len=del.length2();
const btScalar k=((l.m_c1-len)/(l.m_c0*(l.m_c1+len)))*kst;
const btScalar t=k*a.m_im;
//const btScalar t=k*a.m_im;
a.m_x-=del*(k*a.m_im);
b.m_x+=del*(k*b.m_im);
}

2
src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
View File

@@ -218,7 +218,7 @@ void btSoftBodyConcaveCollisionAlgorithm::processCollision (btCollisionObject* b
{
btCollisionObject* convexBody = m_isSwapped ? body1 : body0;
//btCollisionObject* convexBody = m_isSwapped ? body1 : body0;
btCollisionObject* triBody = m_isSwapped ? body0 : body1;
if (triBody->getCollisionShape()->isConcave())

2
src/BulletSoftBody/btSoftBodyHelpers.cpp
View File

@@ -371,7 +371,7 @@ void btSoftBodyHelpers::Draw( btSoftBody* psb,
break;
case btSoftBody::Joint::eType::Angular:
{
const btSoftBody::AJoint* pja=(const btSoftBody::AJoint*)pj;
//const btSoftBody::AJoint* pja=(const btSoftBody::AJoint*)pj;
const btVector3 o0=pj->m_bodies[0].xform().getOrigin();
const btVector3 o1=pj->m_bodies[1].xform().getOrigin();
const btVector3 a0=pj->m_bodies[0].xform().getBasis()*pj->m_refs[0];

2
src/LinearMath/btConvexHull.cpp
View File

@@ -1135,7 +1135,7 @@ void HullLibrary::BringOutYourDead(const btVector3* verts,unsigned int vcount, b
ocount = 0;
for (i=0; i<indexcount; i++)
for (i=0; i<int (indexcount); i++)
{
unsigned int v = indices[i]; // original array index