From 80e6edda0c28969705227b19c978440921943271 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 11 May 2017 10:13:15 -0700
Subject: [PATCH] code review

---
 libraries/entities/src/EntityTree.cpp            |  7 ++++---
 libraries/physics/src/ObjectActionMotor.cpp      |  2 ++
 libraries/physics/src/ObjectConstraintSlider.cpp |  6 +++---
 libraries/physics/src/ObjectDynamic.cpp          | 10 +++++++---
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 2285e6e4bd..04a8e89fef 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1611,13 +1611,14 @@ bool EntityTree::sendEntitiesOperation(OctreeElementPointer element, void* extra
         if (oldID.isNull()) {
             return EntityItemID();
         }
-        if (args->map->contains(oldID)) {
-            return EntityItemID(args->map->value(oldID));
-        } else {
+
+        QHash<EntityItemID, EntityItemID>::iterator iter = args->map->find(oldID);
+        if (iter == args->map->end()) {
             EntityItemID newID = QUuid::createUuid();
             args->map->insert(oldID, newID);
             return newID;
         }
+        return iter.value();
     };
 
     entityTreeElement->forEachEntity([&args, &getMapped, &element](EntityItemPointer item) {
diff --git a/libraries/physics/src/ObjectActionMotor.cpp b/libraries/physics/src/ObjectActionMotor.cpp
index eafb43c7a5..9a23c44569 100644
--- a/libraries/physics/src/ObjectActionMotor.cpp
+++ b/libraries/physics/src/ObjectActionMotor.cpp
@@ -27,6 +27,8 @@ ObjectActionMotor::ObjectActionMotor(const QUuid& id, EntityItemPointer ownerEnt
     #if WANT_DEBUG
     qCDebug(physics) << "ObjectActionMotor::ObjectActionMotor";
     #endif
+
+    qCWarning(physics) << "action type \"motor\" doesn't yet work.";
 }
 
 ObjectActionMotor::~ObjectActionMotor() {
diff --git a/libraries/physics/src/ObjectConstraintSlider.cpp b/libraries/physics/src/ObjectConstraintSlider.cpp
index d8f42a1cbe..d4e6b6b95b 100644
--- a/libraries/physics/src/ObjectConstraintSlider.cpp
+++ b/libraries/physics/src/ObjectConstraintSlider.cpp
@@ -108,8 +108,8 @@ btTypedConstraint* ObjectConstraintSlider::getConstraint() {
             axisInB = glm::normalize(axisInB);
         }
 
-        glm::quat rotA = glm::rotation(glm::vec3(1.0f, 0.0f, 0.0f), axisInA);
-        glm::quat rotB = glm::rotation(glm::vec3(1.0f, 0.0f, 0.0f), axisInB);
+        glm::quat rotA = glm::rotation(DEFAULT_SLIDER_AXIS, axisInA);
+        glm::quat rotB = glm::rotation(DEFAULT_SLIDER_AXIS, axisInB);
 
         btTransform frameInA(glmToBullet(rotA), glmToBullet(pointInA));
         btTransform frameInB(glmToBullet(rotB), glmToBullet(pointInB));
@@ -123,7 +123,7 @@ btTypedConstraint* ObjectConstraintSlider::getConstraint() {
     } else {
         // This slider is between an entity and the world-frame.
 
-        glm::quat rot = glm::rotation(glm::vec3(1.0f, 0.0f, 0.0f), axisInA);
+        glm::quat rot = glm::rotation(DEFAULT_SLIDER_AXIS, axisInA);
 
         btTransform frameInA(glmToBullet(rot), glmToBullet(pointInA));
 
diff --git a/libraries/physics/src/ObjectDynamic.cpp b/libraries/physics/src/ObjectDynamic.cpp
index f41db5c17a..16be10a8f0 100644
--- a/libraries/physics/src/ObjectDynamic.cpp
+++ b/libraries/physics/src/ObjectDynamic.cpp
@@ -32,10 +32,14 @@ void ObjectDynamic::remapIDs(QHash<EntityItemID, EntityItemID>& map) {
         }
 
         if (!_otherID.isNull()) {
-            if (!map.contains(_otherID)) {
-                map.insert(_otherID, QUuid::createUuid());
+            QHash<EntityItemID, EntityItemID>::iterator iter = map.find(_otherID);
+            if (iter == map.end()) {
+                // not found, add it
+                _otherID = QUuid::createUuid();
+                map.insert(_otherID, _otherID);
+            } else {
+                _otherID = iter.value();
             }
-            _otherID = map.value(_otherID);
         }
     });
 }