Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove warnings

Browse source
This commit is contained in:
Andrew Meadows 2015-01-15 10:36:17 -08:00
parent ff171a5782
commit 9eb4d66327
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/physics/src/BulletUtil.h
View file

@ -32,4 +32,8 @@ inline btQuaternion glmToBullet(const glm::quat& g) {
return btQuaternion(g.x, g.y, g.z, g.w); return btQuaternion(g.x, g.y, g.z, g.w);
} }
inline bool avoidUnusedVariableWarningInBulletHeaders(float number) {
return number == BT_INFINITY;
}
#endif // hifi_BulletUtil_h #endif // hifi_BulletUtil_h

8
libraries/physics/src/ObjectMotionState.cpp
View file

@ -14,14 +14,6 @@
#include "BulletUtil.h" #include "BulletUtil.h"
#include "ObjectMotionState.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 DEFAULT_FRICTION = 0.5f;
const float MAX_FRICTION = 10.0f; const float MAX_FRICTION = 10.0f;

1
libraries/physics/src/PhysicsEngine.h
View file

@ -92,7 +92,6 @@ private:
EntityEditPacketSender* _entityPacketSender; EntityEditPacketSender* _entityPacketSender;
uint32_t _frameCount; uint32_t _frameCount;
btScalar _infinity = BT_INFINITY; // HACK: eliminates unused variable warning from Bullet headers
}; };
#endif // hifi_PhysicsEngine_h #endif // hifi_PhysicsEngine_h