Get rid of some warnings, mainly unused parameters/variables.

Thanks sparkprime for the patch, see http://code.google.com/p/bullet/issues/detail?id=330
This commit is contained in:
erwin.coumans
2010-01-19 06:10:27 +00:00
parent 086f80b206
commit 4280f54ccf
9 changed files with 35 additions and 1 deletions

View File

@@ -65,7 +65,7 @@ public:
virtual void getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const =0; virtual void getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const =0;
///reset broadphase internal structures, to ensure determinism/reproducability ///reset broadphase internal structures, to ensure determinism/reproducability
virtual void resetPool(btDispatcher* dispatcher) {}; virtual void resetPool(btDispatcher* dispatcher) { (void) dispatcher; };
virtual void printStats() = 0; virtual void printStats() = 0;

View File

@@ -947,6 +947,7 @@ inline void btDbvt::rayTestInternal( const btDbvtNode* root,
const btVector3& aabbMax, const btVector3& aabbMax,
DBVT_IPOLICY) const DBVT_IPOLICY) const
{ {
(void) rayTo;
DBVT_CHECKTYPE DBVT_CHECKTYPE
if(root) if(root)
{ {

View File

@@ -457,6 +457,7 @@ public:
virtual void sortOverlappingPairs(btDispatcher* dispatcher) virtual void sortOverlappingPairs(btDispatcher* dispatcher)
{ {
(void) dispatcher;
} }

View File

@@ -74,6 +74,7 @@ public:
void setDispatcherFlags(int flags) void setDispatcherFlags(int flags)
{ {
(void) flags;
m_dispatcherFlags = 0; m_dispatcherFlags = 0;
} }

View File

@@ -276,6 +276,7 @@ public:
//! virtual method for ray collision //! virtual method for ray collision
virtual void rayTest(const btVector3& rayFrom, const btVector3& rayTo, btCollisionWorld::RayResultCallback& resultCallback) const virtual void rayTest(const btVector3& rayFrom, const btVector3& rayTo, btCollisionWorld::RayResultCallback& resultCallback) const
{ {
(void) rayFrom; (void) rayTo; (void) resultCallback;
} }
//! Function for retrieve triangles. //! Function for retrieve triangles.
@@ -284,6 +285,7 @@ public:
*/ */
virtual void processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const virtual void processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const
{ {
(void) callback; (void) aabbMin; (void) aabbMax;
} }
//!@} //!@}
@@ -307,6 +309,7 @@ public:
CompoundPrimitiveManager(const CompoundPrimitiveManager& compound) CompoundPrimitiveManager(const CompoundPrimitiveManager& compound)
: btPrimitiveManagerBase()
{ {
m_compoundShape = compound.m_compoundShape; m_compoundShape = compound.m_compoundShape;
} }
@@ -349,6 +352,7 @@ public:
virtual void get_primitive_triangle(int prim_index,btPrimitiveTriangle & triangle) const virtual void get_primitive_triangle(int prim_index,btPrimitiveTriangle & triangle) const
{ {
btAssert(0); btAssert(0);
(void) prim_index; (void) triangle;
} }
}; };
@@ -365,6 +369,7 @@ public:
btGImpactCompoundShape(bool children_has_transform = true) btGImpactCompoundShape(bool children_has_transform = true)
{ {
(void) children_has_transform;
m_primitive_manager.m_compoundShape = this; m_primitive_manager.m_compoundShape = this;
m_box_set.setPrimitiveManager(&m_primitive_manager); m_box_set.setPrimitiveManager(&m_primitive_manager);
} }
@@ -478,11 +483,13 @@ public:
virtual void getBulletTriangle(int prim_index,btTriangleShapeEx & triangle) const virtual void getBulletTriangle(int prim_index,btTriangleShapeEx & triangle) const
{ {
(void) prim_index; (void) triangle;
btAssert(0); btAssert(0);
} }
virtual void getBulletTetrahedron(int prim_index,btTetrahedronShapeEx & tetrahedron) const virtual void getBulletTetrahedron(int prim_index,btTetrahedronShapeEx & tetrahedron) const
{ {
(void) prim_index; (void) tetrahedron;
btAssert(0); btAssert(0);
} }
@@ -551,6 +558,7 @@ public:
} }
TrimeshPrimitiveManager(const TrimeshPrimitiveManager & manager) TrimeshPrimitiveManager(const TrimeshPrimitiveManager & manager)
: btPrimitiveManagerBase()
{ {
m_meshInterface = manager.m_meshInterface; m_meshInterface = manager.m_meshInterface;
m_part = manager.m_part; m_part = manager.m_part;
@@ -748,6 +756,7 @@ public:
//! Gets the children //! Gets the children
virtual btCollisionShape* getChildShape(int index) virtual btCollisionShape* getChildShape(int index)
{ {
(void) index;
btAssert(0); btAssert(0);
return NULL; return NULL;
} }
@@ -757,6 +766,7 @@ public:
//! Gets the child //! Gets the child
virtual const btCollisionShape* getChildShape(int index) const virtual const btCollisionShape* getChildShape(int index) const
{ {
(void) index;
btAssert(0); btAssert(0);
return NULL; return NULL;
} }
@@ -764,6 +774,7 @@ public:
//! Gets the children transform //! Gets the children transform
virtual btTransform getChildTransform(int index) const virtual btTransform getChildTransform(int index) const
{ {
(void) index;
btAssert(0); btAssert(0);
return btTransform(); return btTransform();
} }
@@ -774,6 +785,8 @@ public:
*/ */
virtual void setChildTransform(int index, const btTransform & transform) virtual void setChildTransform(int index, const btTransform & transform)
{ {
(void) index;
(void) transform;
btAssert(0); btAssert(0);
} }
@@ -827,6 +840,8 @@ public:
virtual void getBulletTetrahedron(int prim_index,btTetrahedronShapeEx & tetrahedron) const virtual void getBulletTetrahedron(int prim_index,btTetrahedronShapeEx & tetrahedron) const
{ {
(void) prim_index;
(void) tetrahedron;
btAssert(0); btAssert(0);
} }
@@ -1038,11 +1053,13 @@ public:
virtual void getBulletTriangle(int prim_index,btTriangleShapeEx & triangle) const virtual void getBulletTriangle(int prim_index,btTriangleShapeEx & triangle) const
{ {
(void) prim_index; (void) triangle;
btAssert(0); btAssert(0);
} }
virtual void getBulletTetrahedron(int prim_index,btTetrahedronShapeEx & tetrahedron) const virtual void getBulletTetrahedron(int prim_index,btTetrahedronShapeEx & tetrahedron) const
{ {
(void) prim_index; (void) tetrahedron;
btAssert(0); btAssert(0);
} }
@@ -1065,12 +1082,14 @@ public:
*/ */
virtual void getChildAabb(int child_index,const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const virtual void getChildAabb(int child_index,const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
{ {
(void) child_index; (void) t; (void) aabbMin; (void) aabbMax;
btAssert(0); btAssert(0);
} }
//! Gets the children //! Gets the children
virtual btCollisionShape* getChildShape(int index) virtual btCollisionShape* getChildShape(int index)
{ {
(void) index;
btAssert(0); btAssert(0);
return NULL; return NULL;
} }
@@ -1079,6 +1098,7 @@ public:
//! Gets the child //! Gets the child
virtual const btCollisionShape* getChildShape(int index) const virtual const btCollisionShape* getChildShape(int index) const
{ {
(void) index;
btAssert(0); btAssert(0);
return NULL; return NULL;
} }
@@ -1086,6 +1106,7 @@ public:
//! Gets the children transform //! Gets the children transform
virtual btTransform getChildTransform(int index) const virtual btTransform getChildTransform(int index) const
{ {
(void) index;
btAssert(0); btAssert(0);
return btTransform(); return btTransform();
} }
@@ -1096,6 +1117,7 @@ public:
*/ */
virtual void setChildTransform(int index, const btTransform & transform) virtual void setChildTransform(int index, const btTransform & transform)
{ {
(void) index; (void) transform;
btAssert(0); btAssert(0);
} }

View File

@@ -168,6 +168,7 @@ ATTRIBUTE_ALIGNED16 (struct) btSolverBody
void writebackVelocity(btScalar timeStep) void writebackVelocity(btScalar timeStep)
{ {
(void) timeStep;
if (m_originalBody) if (m_originalBody)
{ {
m_originalBody->setLinearVelocity(m_originalBody->getLinearVelocity()+ m_deltaLinearVelocity); m_originalBody->setLinearVelocity(m_originalBody->getLinearVelocity()+ m_deltaLinearVelocity);

View File

@@ -104,6 +104,10 @@ public:
///internal method used by the constraint solver, don't use them directly ///internal method used by the constraint solver, don't use them directly
virtual void setupSolverConstraint(btConstraintArray& ca, int solverBodyA,int solverBodyB, btScalar timeStep) virtual void setupSolverConstraint(btConstraintArray& ca, int solverBodyA,int solverBodyB, btScalar timeStep)
{ {
(void)ca;
(void)solverBodyA;
(void)solverBodyB;
(void)timeStep;
} }
///internal method used by the constraint solver, don't use them directly ///internal method used by the constraint solver, don't use them directly

View File

@@ -80,6 +80,7 @@ public:
///btActionInterface interface ///btActionInterface interface
virtual void updateAction( btCollisionWorld* collisionWorld, btScalar step) virtual void updateAction( btCollisionWorld* collisionWorld, btScalar step)
{ {
(void) collisionWorld;
updateVehicle(step); updateVehicle(step);
} }

View File

@@ -52,15 +52,18 @@ class btIDebugDraw
virtual void drawLine(const btVector3& from,const btVector3& to, const btVector3& fromColor, const btVector3& toColor) virtual void drawLine(const btVector3& from,const btVector3& to, const btVector3& fromColor, const btVector3& toColor)
{ {
(void) fromColor; (void) toColor;
drawLine (from, to, fromColor); drawLine (from, to, fromColor);
} }
virtual void drawBox (const btVector3& boxMin, const btVector3& boxMax, const btVector3& color, btScalar alpha) virtual void drawBox (const btVector3& boxMin, const btVector3& boxMax, const btVector3& color, btScalar alpha)
{ {
(void) boxMin; (void) boxMax; (void) color; (void) alpha;
} }
virtual void drawSphere (const btVector3& p, btScalar radius, const btVector3& color) virtual void drawSphere (const btVector3& p, btScalar radius, const btVector3& color)
{ {
(void) p; (void) radius; (void) color; (void) color;
} }
virtual void drawLine(const btVector3& from,const btVector3& to,const btVector3& color)=0; virtual void drawLine(const btVector3& from,const btVector3& to,const btVector3& color)=0;