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

Merge pull request #6693 from ZappoMan/fixWarnings

Browse source 
fix warnings
This commit is contained in:
Brad Davis 2015-12-18 00:38:12 -08:00
commit 3446229bd8
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/Avatar.cpp
View file

@ -157,7 +157,7 @@ void Avatar::animateScaleChanges(float deltaTime) {
// snap to the end when we get close enough // snap to the end when we get close enough
const float MIN_RELATIVE_SCALE_ERROR = 0.03f; const float MIN_RELATIVE_SCALE_ERROR = 0.03f;
if (fabsf(_targetScale - currentScale) / _targetScale < 0.03f) { if (fabsf(_targetScale - currentScale) / _targetScale < MIN_RELATIVE_SCALE_ERROR) {
animatedScale = _targetScale; animatedScale = _targetScale;
} }

2
interface/src/avatar/AvatarActionHold.cpp
View file

@ -77,7 +77,7 @@ void AvatarActionHold::prepareForPhysicsSimulation() {
// getTarget would get the palm position of the previous location of the avatar (because // getTarget would get the palm position of the previous location of the avatar (because
// bullet has moved the av's rigid body but the rigid body's location has not yet been // bullet has moved the av's rigid body but the rigid body's location has not yet been
// copied out into the Avatar class. // copied out into the Avatar class.
glm::quat avatarRotationInverse = glm::inverse(avatarRigidBodyRotation); //glm::quat avatarRotationInverse = glm::inverse(avatarRigidBodyRotation);
// the offset should be in the frame of the avatar, but something about the order // the offset should be in the frame of the avatar, but something about the order
// things are updated makes this wrong: // things are updated makes this wrong:

1
interface/src/ui/ApplicationCompositor.cpp
View file

@ -34,7 +34,6 @@
static const quint64 MSECS_TO_USECS = 1000ULL; static const quint64 MSECS_TO_USECS = 1000ULL;
static const quint64 TOOLTIP_DELAY = 500 * MSECS_TO_USECS; static const quint64 TOOLTIP_DELAY = 500 * MSECS_TO_USECS;
static const float RETICLE_COLOR[] = { 0.0f, 198.0f / 255.0f, 244.0f / 255.0f };
static const float reticleSize = TWO_PI / 100.0f; static const float reticleSize = TWO_PI / 100.0f;
static const float CURSOR_PIXEL_SIZE = 32.0f; static const float CURSOR_PIXEL_SIZE = 32.0f;

2
libraries/networking/src/Assignment.cpp
View file

@ -91,7 +91,7 @@ Assignment::Assignment(ReceivedMessage& message) :
#endif #endif
Assignment::Assignment(const Assignment& otherAssignment) { Assignment::Assignment(const Assignment& otherAssignment) : QObject() {
_uuid = otherAssignment._uuid; _uuid = otherAssignment._uuid;
_command = otherAssignment._command; _command = otherAssignment._command;
_type = otherAssignment._type; _type = otherAssignment._type;