From 41a8deb57538c71fd477d0bf5dd642c4422632c3 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Mon, 30 Jul 2018 14:51:04 -0700
Subject: [PATCH] Fix Linux build warnings

---
 interface/src/raypick/CollisionPick.cpp |  2 --
 interface/src/raypick/CollisionPick.h   |  2 +-
 libraries/physics/src/PhysicsEngine.cpp | 11 ++++-------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/interface/src/raypick/CollisionPick.cpp b/interface/src/raypick/CollisionPick.cpp
index ac3342110b..49c08a8f5c 100644
--- a/interface/src/raypick/CollisionPick.cpp
+++ b/interface/src/raypick/CollisionPick.cpp
@@ -135,7 +135,6 @@ void CollisionPick::computeShapeInfo(CollisionRegion& pick, ShapeInfo& shapeInfo
         const FBXGeometry& fbxGeometry = resource->getFBXGeometry();
         int numFbxMeshes = fbxGeometry.meshes.size();
         int totalNumVertices = 0;
-        glm::mat4 invRegistrationOffset = glm::translate(dimensions * (-ENTITY_ITEM_DEFAULT_REGISTRATION_POINT));
         for (int i = 0; i < numFbxMeshes; i++) {
             const FBXMesh& mesh = fbxGeometry.meshes.at(i);
             totalNumVertices += mesh.vertices.size();
@@ -191,7 +190,6 @@ void CollisionPick::computeShapeInfo(CollisionRegion& pick, ShapeInfo& shapeInfo
             points.reserve(sizeToReserve);
 
             // copy points
-            uint32_t meshIndexOffset = (uint32_t)points.size();
             const glm::vec3* vertexItr = vertices.cbegin();
             while (vertexItr != vertices.cend()) {
                 glm::vec3 point = *vertexItr;
diff --git a/interface/src/raypick/CollisionPick.h b/interface/src/raypick/CollisionPick.h
index d39e3be914..9a76d047bf 100644
--- a/interface/src/raypick/CollisionPick.h
+++ b/interface/src/raypick/CollisionPick.h
@@ -95,7 +95,7 @@ public:
     }
 
     CollisionRegion getMathematicalPick() const override;
-    PickResultPointer getDefaultResult(const QVariantMap& pickVariant) const { return std::make_shared<CollisionPickResult>(pickVariant); }
+    PickResultPointer getDefaultResult(const QVariantMap& pickVariant) const override { return std::make_shared<CollisionPickResult>(pickVariant); }
     PickResultPointer getEntityIntersection(const CollisionRegion& pick) override;
     PickResultPointer getOverlayIntersection(const CollisionRegion& pick) override;
     PickResultPointer getAvatarIntersection(const CollisionRegion& pick) override;
diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp
index 592272acd5..20f09f6adf 100644
--- a/libraries/physics/src/PhysicsEngine.cpp
+++ b/libraries/physics/src/PhysicsEngine.cpp
@@ -843,8 +843,9 @@ void PhysicsEngine::setShowBulletConstraintLimits(bool value) {
 struct AllContactsCallback : public btCollisionWorld::ContactResultCallback {
     AllContactsCallback(MotionStateType desiredObjectType, const ShapeInfo& shapeInfo, const Transform& transform) :
         desiredObjectType(desiredObjectType),
-        btCollisionWorld::ContactResultCallback(),
-        collisionObject() {
+        collisionObject(),
+        intersectingObjects(),
+        btCollisionWorld::ContactResultCallback() {
         const btCollisionShape* collisionShape = ObjectMotionState::getShapeManager()->getShape(shapeInfo);
 
         collisionObject.setCollisionShape(const_cast<btCollisionShape*>(collisionShape));
@@ -860,15 +861,11 @@ struct AllContactsCallback : public btCollisionWorld::ContactResultCallback {
         ObjectMotionState::getShapeManager()->releaseShape(collisionObject.getCollisionShape());
     }
 
-    AllContactsCallback(btCollisionObject& testCollisionObject) :
-        btCollisionWorld::ContactResultCallback(), collisionObject(testCollisionObject) {
-    }
-
     MotionStateType desiredObjectType;
     btCollisionObject collisionObject;
     std::vector<EntityIntersection> intersectingObjects;
 
-    virtual bool needsCollision(btBroadphaseProxy* proxy) const {
+    bool needsCollision(btBroadphaseProxy* proxy) const override {
         return true;
     }