From 16346dd7176e469bf89ed43b0671617035d12253 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sun, 6 Sep 2015 16:20:46 -0700 Subject: [PATCH 1/2] Fix some build warnings --- libraries/avatars/src/AvatarData.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index af97180cbd..a6b88c1702 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -103,7 +103,7 @@ const char IS_FINGER_POINTING_FLAG = 4; static const float MAX_AVATAR_SCALE = 1000.0f; static const float MIN_AVATAR_SCALE = .005f; -const float MAX_AUDIO_LOUDNESS = 1000.0; // close enough for mouth animation +const float MAX_AUDIO_LOUDNESS = 1000.0f; // close enough for mouth animation const int AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS = 1000; const int AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS = 5000; @@ -112,7 +112,7 @@ const int AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS = 5000; const QString DEFAULT_FULL_AVATAR_MODEL_NAME = QString("Default"); // how often should we send a full report about joint rotations, even if they haven't changed? -const float AVATAR_SEND_FULL_UPDATE_RATIO = 0.02; +const float AVATAR_SEND_FULL_UPDATE_RATIO = 0.02f; // this controls how large a change in joint-rotation must be before the interface sends it to the avatar mixer const float AVATAR_MIN_ROTATION_DOT = 0.9999999f; From 6923e3ce709f83247d334c415ac2d045b481b8a3 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sun, 6 Sep 2015 16:28:55 -0700 Subject: [PATCH 2/2] Fix logging of intentionally crashing Interface --- interface/src/Application.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 928b4a0684..d229073c30 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5075,11 +5075,10 @@ void Application::emulateMouse(Hand* hand, float click, float shift, int index) } void Application::crashApplication() { + qCDebug(interfaceapp) << "Intentionally crashed Interface"; QObject* object = nullptr; bool value = object->isWindowType(); Q_UNUSED(value); - - qCDebug(interfaceapp) << "Intentionally crashed Interface"; } void Application::setActiveDisplayPlugin(const QString& pluginName) {