From b25f6df7af349cfceb407ba20fe5d0d5efce29ab Mon Sep 17 00:00:00 2001
From: Seth Alves <seth@highfidelity.io>
Date: Tue, 11 Aug 2015 10:22:56 -0700
Subject: [PATCH] quiet compiler

---
 interface/src/avatar/AvatarManager.cpp        | 2 +-
 libraries/gpu/src/gpu/State.h                 | 2 +-
 libraries/physics/src/ObjectActionSpring.cpp  | 2 +-
 libraries/shared/src/PhysicsCollisionGroups.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index ee59a01e07..1644f22b09 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -279,7 +279,7 @@ void AvatarManager::handleCollisionEvents(CollisionEvents& collisionEvents) {
             const QString& collisionSoundURL = myAvatar->getCollisionSoundURL();
             if (!collisionSoundURL.isEmpty()) {
                 const float velocityChange = glm::length(collision.velocityChange);
-                const float MIN_AVATAR_COLLISION_ACCELERATION = 0.01;
+                const float MIN_AVATAR_COLLISION_ACCELERATION = 0.01f;
                 const bool isSound = (collision.type == CONTACT_EVENT_TYPE_START) && (velocityChange > MIN_AVATAR_COLLISION_ACCELERATION);
 
                 if (!isSound) {
diff --git a/libraries/gpu/src/gpu/State.h b/libraries/gpu/src/gpu/State.h
index 5e53284f36..1b4a02e301 100755
--- a/libraries/gpu/src/gpu/State.h
+++ b/libraries/gpu/src/gpu/State.h
@@ -125,7 +125,7 @@ public:
 
         bool isEnabled() const { return _enabled; }
         ComparisonFunction getFunction() const { return ComparisonFunction(_function); }
-        bool getWriteMask() const { return _writeMask; }
+        uint8 getWriteMask() const { return _writeMask; }
 
         int32 getRaw() const { return *(reinterpret_cast<const int32*>(this)); }
         DepthTest(int32 raw) { *(reinterpret_cast<int32*>(this)) = raw; }
diff --git a/libraries/physics/src/ObjectActionSpring.cpp b/libraries/physics/src/ObjectActionSpring.cpp
index 196cc8d3ea..313b089d1c 100644
--- a/libraries/physics/src/ObjectActionSpring.cpp
+++ b/libraries/physics/src/ObjectActionSpring.cpp
@@ -92,7 +92,7 @@ void ObjectActionSpring::updateActionWorker(btScalar deltaTimeStep) {
             //      dQ = Q1 * Q0^
             btQuaternion deltaQ = target * bodyRotation.inverse();
             float angle = deltaQ.getAngle();
-            const float MIN_ANGLE = 1.0e-4;
+            const float MIN_ANGLE = 1.0e-4f;
             if (angle > MIN_ANGLE) {
                 targetVelocity = (angle / _angularTimeScale) * deltaQ.getAxis();
             }
diff --git a/libraries/shared/src/PhysicsCollisionGroups.h b/libraries/shared/src/PhysicsCollisionGroups.h
index 08d83a29ca..42599a1b28 100644
--- a/libraries/shared/src/PhysicsCollisionGroups.h
+++ b/libraries/shared/src/PhysicsCollisionGroups.h
@@ -44,7 +44,7 @@ const int16_t COLLISION_GROUP_OTHER_AVATAR = 1 << 6;
 const int16_t COLLISION_GROUP_MY_ATTACHMENT = 1 << 7;
 const int16_t COLLISION_GROUP_OTHER_ATTACHMENT = 1 << 8;
 // ...
-const int16_t COLLISION_GROUP_COLLISIONLESS = 1 << 15;
+const int16_t COLLISION_GROUP_COLLISIONLESS = 1 << 14;
 
 
 /* Note: In order for objectA to collide with objectB at the filter stage