From 3ec3005c6dac00ddb261fa700c9f2a9e659d2240 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 1 May 2017 15:32:17 -0700
Subject: [PATCH] code review

---
 libraries/physics/src/ObjectActionSpring.cpp     | 4 ++--
 libraries/physics/src/ObjectConstraintHinge.cpp  | 2 --
 libraries/physics/src/ObjectConstraintSlider.cpp | 6 ------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/libraries/physics/src/ObjectActionSpring.cpp b/libraries/physics/src/ObjectActionSpring.cpp
index 3cd3926073..8c73f43d42 100644
--- a/libraries/physics/src/ObjectActionSpring.cpp
+++ b/libraries/physics/src/ObjectActionSpring.cpp
@@ -85,10 +85,10 @@ bool ObjectActionSpring::getTarget(float deltaTimeStep, glm::quat& rotation, glm
         linearTimeScale = _linearTimeScale;
         angularTimeScale = _angularTimeScale;
 
-        if (_otherID != QUuid()) {
+        if (!_otherID.isNull()) {
             if (other) {
                 rotation = _desiredRotationalTarget * other->getRotation();
-                position = _desiredPositionalTarget + other->getPosition();
+                position = other->getRotation() * _desiredPositionalTarget + other->getPosition();
             } else {
                 // we should have an "other" but can't find it, so disable the spring.
                 linearTimeScale = FLT_MAX;
diff --git a/libraries/physics/src/ObjectConstraintHinge.cpp b/libraries/physics/src/ObjectConstraintHinge.cpp
index 14a666f09e..dd82de924c 100644
--- a/libraries/physics/src/ObjectConstraintHinge.cpp
+++ b/libraries/physics/src/ObjectConstraintHinge.cpp
@@ -74,8 +74,6 @@ void ObjectConstraintHinge::updateHinge() {
         return;
     }
 
-    // auto bulletAxisInA = glmToBullet(axisInA);
-    // constraint->setAxis(bulletAxisInA);
     constraint->setLimit(low, high, softness, biasFactor, relaxationFactor);
 }
 
diff --git a/libraries/physics/src/ObjectConstraintSlider.cpp b/libraries/physics/src/ObjectConstraintSlider.cpp
index 6a59199356..d7d4df78af 100644
--- a/libraries/physics/src/ObjectConstraintSlider.cpp
+++ b/libraries/physics/src/ObjectConstraintSlider.cpp
@@ -24,15 +24,9 @@ ObjectConstraintSlider::ObjectConstraintSlider(const QUuid& id, EntityItemPointe
     _pointInA(glm::vec3(0.0f)),
     _axisInA(glm::vec3(0.0f))
 {
-    #if WANT_DEBUG
-    qCDebug(physics) << "ObjectConstraintSlider::ObjectConstraintSlider";
-    #endif
 }
 
 ObjectConstraintSlider::~ObjectConstraintSlider() {
-    #if WANT_DEBUG
-    qCDebug(physics) << "ObjectConstraintSlider::~ObjectConstraintSlider";
-    #endif
 }
 
 QList<btRigidBody*> ObjectConstraintSlider::getRigidBodies() {