diff --git a/libraries/physics/src/BulletUtil.h b/libraries/physics/src/BulletUtil.h index 52bf2c8b06..35b75a1040 100644 --- a/libraries/physics/src/BulletUtil.h +++ b/libraries/physics/src/BulletUtil.h @@ -32,4 +32,8 @@ inline btQuaternion glmToBullet(const glm::quat& g) { return btQuaternion(g.x, g.y, g.z, g.w); } +inline bool avoidUnusedVariableWarningInBulletHeaders(float number) { + return number == BT_INFINITY; +} + #endif // hifi_BulletUtil_h diff --git a/libraries/physics/src/ObjectMotionState.cpp b/libraries/physics/src/ObjectMotionState.cpp index 65a2557383..c424c11aa8 100644 --- a/libraries/physics/src/ObjectMotionState.cpp +++ b/libraries/physics/src/ObjectMotionState.cpp @@ -14,14 +14,6 @@ #include "BulletUtil.h" #include "ObjectMotionState.h" -const float MIN_DENSITY = 200.0f; -const float DEFAULT_DENSITY = 1000.0f; -const float MAX_DENSITY = 20000.0f; - -const float MIN_VOLUME = 0.001f; -const float DEFAULT_VOLUME = 1.0f; -const float MAX_VOLUME = 1000000.0f; - const float DEFAULT_FRICTION = 0.5f; const float MAX_FRICTION = 10.0f; diff --git a/libraries/physics/src/PhysicsEngine.h b/libraries/physics/src/PhysicsEngine.h index 589286588b..578fd1ece4 100644 --- a/libraries/physics/src/PhysicsEngine.h +++ b/libraries/physics/src/PhysicsEngine.h @@ -92,7 +92,6 @@ private: EntityEditPacketSender* _entityPacketSender; uint32_t _frameCount; - btScalar _infinity = BT_INFINITY; // HACK: eliminates unused variable warning from Bullet headers }; #endif // hifi_PhysicsEngine_h