From 4280f54ccf9eab154c4bdff43b7f9985cf2934d3 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Tue, 19 Jan 2010 06:10:27 +0000 Subject: [PATCH] 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 --- .../btBroadphaseInterface.h | 2 +- .../BroadphaseCollision/btDbvt.h | 1 + .../btOverlappingPairCache.h | 1 + .../CollisionDispatch/btCollisionDispatcher.h | 1 + src/BulletCollision/Gimpact/btGImpactShape.h | 22 +++++++++++++++++++ .../ConstraintSolver/btSolverBody.h | 1 + .../ConstraintSolver/btTypedConstraint.h | 4 ++++ src/BulletDynamics/Vehicle/btRaycastVehicle.h | 1 + src/LinearMath/btIDebugDraw.h | 3 +++ 9 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h b/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h index b7bbaf512..1f036bd44 100644 --- a/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h +++ b/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h @@ -65,7 +65,7 @@ public: virtual void getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const =0; ///reset broadphase internal structures, to ensure determinism/reproducability - virtual void resetPool(btDispatcher* dispatcher) {}; + virtual void resetPool(btDispatcher* dispatcher) { (void) dispatcher; }; virtual void printStats() = 0; diff --git a/src/BulletCollision/BroadphaseCollision/btDbvt.h b/src/BulletCollision/BroadphaseCollision/btDbvt.h index 061b5030f..fb47a4e73 100644 --- a/src/BulletCollision/BroadphaseCollision/btDbvt.h +++ b/src/BulletCollision/BroadphaseCollision/btDbvt.h @@ -947,6 +947,7 @@ inline void btDbvt::rayTestInternal( const btDbvtNode* root, const btVector3& aabbMax, DBVT_IPOLICY) const { + (void) rayTo; DBVT_CHECKTYPE if(root) { diff --git a/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h b/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h index eda45c47b..3945afb8d 100644 --- a/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h +++ b/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h @@ -457,6 +457,7 @@ public: virtual void sortOverlappingPairs(btDispatcher* dispatcher) { + (void) dispatcher; } diff --git a/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h b/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h index 8fdbd7d21..09ed1d67e 100644 --- a/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h +++ b/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h @@ -74,6 +74,7 @@ public: void setDispatcherFlags(int flags) { + (void) flags; m_dispatcherFlags = 0; } diff --git a/src/BulletCollision/Gimpact/btGImpactShape.h b/src/BulletCollision/Gimpact/btGImpactShape.h index 598dc6d5f..d9bac9f81 100644 --- a/src/BulletCollision/Gimpact/btGImpactShape.h +++ b/src/BulletCollision/Gimpact/btGImpactShape.h @@ -276,6 +276,7 @@ public: //! virtual method for ray collision virtual void rayTest(const btVector3& rayFrom, const btVector3& rayTo, btCollisionWorld::RayResultCallback& resultCallback) const { + (void) rayFrom; (void) rayTo; (void) resultCallback; } //! Function for retrieve triangles. @@ -284,6 +285,7 @@ public: */ 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) + : btPrimitiveManagerBase() { m_compoundShape = compound.m_compoundShape; } @@ -349,6 +352,7 @@ public: virtual void get_primitive_triangle(int prim_index,btPrimitiveTriangle & triangle) const { btAssert(0); + (void) prim_index; (void) triangle; } }; @@ -365,6 +369,7 @@ public: btGImpactCompoundShape(bool children_has_transform = true) { + (void) children_has_transform; m_primitive_manager.m_compoundShape = this; m_box_set.setPrimitiveManager(&m_primitive_manager); } @@ -478,11 +483,13 @@ public: virtual void getBulletTriangle(int prim_index,btTriangleShapeEx & triangle) const { + (void) prim_index; (void) triangle; btAssert(0); } virtual void getBulletTetrahedron(int prim_index,btTetrahedronShapeEx & tetrahedron) const { + (void) prim_index; (void) tetrahedron; btAssert(0); } @@ -551,6 +558,7 @@ public: } TrimeshPrimitiveManager(const TrimeshPrimitiveManager & manager) + : btPrimitiveManagerBase() { m_meshInterface = manager.m_meshInterface; m_part = manager.m_part; @@ -748,6 +756,7 @@ public: //! Gets the children virtual btCollisionShape* getChildShape(int index) { + (void) index; btAssert(0); return NULL; } @@ -757,6 +766,7 @@ public: //! Gets the child virtual const btCollisionShape* getChildShape(int index) const { + (void) index; btAssert(0); return NULL; } @@ -764,6 +774,7 @@ public: //! Gets the children transform virtual btTransform getChildTransform(int index) const { + (void) index; btAssert(0); return btTransform(); } @@ -774,6 +785,8 @@ public: */ virtual void setChildTransform(int index, const btTransform & transform) { + (void) index; + (void) transform; btAssert(0); } @@ -827,6 +840,8 @@ public: virtual void getBulletTetrahedron(int prim_index,btTetrahedronShapeEx & tetrahedron) const { + (void) prim_index; + (void) tetrahedron; btAssert(0); } @@ -1038,11 +1053,13 @@ public: virtual void getBulletTriangle(int prim_index,btTriangleShapeEx & triangle) const { + (void) prim_index; (void) triangle; btAssert(0); } virtual void getBulletTetrahedron(int prim_index,btTetrahedronShapeEx & tetrahedron) const { + (void) prim_index; (void) tetrahedron; btAssert(0); } @@ -1065,12 +1082,14 @@ public: */ 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); } //! Gets the children virtual btCollisionShape* getChildShape(int index) { + (void) index; btAssert(0); return NULL; } @@ -1079,6 +1098,7 @@ public: //! Gets the child virtual const btCollisionShape* getChildShape(int index) const { + (void) index; btAssert(0); return NULL; } @@ -1086,6 +1106,7 @@ public: //! Gets the children transform virtual btTransform getChildTransform(int index) const { + (void) index; btAssert(0); return btTransform(); } @@ -1096,6 +1117,7 @@ public: */ virtual void setChildTransform(int index, const btTransform & transform) { + (void) index; (void) transform; btAssert(0); } diff --git a/src/BulletDynamics/ConstraintSolver/btSolverBody.h b/src/BulletDynamics/ConstraintSolver/btSolverBody.h index 57a8fd31d..b3a8eee19 100644 --- a/src/BulletDynamics/ConstraintSolver/btSolverBody.h +++ b/src/BulletDynamics/ConstraintSolver/btSolverBody.h @@ -168,6 +168,7 @@ ATTRIBUTE_ALIGNED16 (struct) btSolverBody void writebackVelocity(btScalar timeStep) { + (void) timeStep; if (m_originalBody) { m_originalBody->setLinearVelocity(m_originalBody->getLinearVelocity()+ m_deltaLinearVelocity); diff --git a/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h b/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h index 583937f86..42779987b 100644 --- a/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h @@ -104,6 +104,10 @@ public: ///internal method used by the constraint solver, don't use them directly 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 diff --git a/src/BulletDynamics/Vehicle/btRaycastVehicle.h b/src/BulletDynamics/Vehicle/btRaycastVehicle.h index 6ff8a9051..d5ceaeea8 100644 --- a/src/BulletDynamics/Vehicle/btRaycastVehicle.h +++ b/src/BulletDynamics/Vehicle/btRaycastVehicle.h @@ -80,6 +80,7 @@ public: ///btActionInterface interface virtual void updateAction( btCollisionWorld* collisionWorld, btScalar step) { + (void) collisionWorld; updateVehicle(step); } diff --git a/src/LinearMath/btIDebugDraw.h b/src/LinearMath/btIDebugDraw.h index a0cbf1dfc..956bc47ce 100644 --- a/src/LinearMath/btIDebugDraw.h +++ b/src/LinearMath/btIDebugDraw.h @@ -52,15 +52,18 @@ class btIDebugDraw virtual void drawLine(const btVector3& from,const btVector3& to, const btVector3& fromColor, const btVector3& toColor) { + (void) fromColor; (void) toColor; drawLine (from, to, fromColor); } 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) { + (void) p; (void) radius; (void) color; (void) color; } virtual void drawLine(const btVector3& from,const btVector3& to,const btVector3& color)=0;