From c99573ea64a812c417a1dc2a7a3d3f786eed653b Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Thu, 15 Oct 2015 15:35:35 +0200
Subject: [PATCH] Fixed support for calling setJointMumblers with joint name.
 Walk.js runs smooth now!

---
 examples/libraries/walkApi.js        | 10 +++++-----
 examples/walk.js                     |  2 +-
 libraries/avatars/src/AvatarData.cpp | 21 +++++++++++++++++++--
 libraries/avatars/src/AvatarData.h   |  2 ++
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/examples/libraries/walkApi.js b/examples/libraries/walkApi.js
index 5b42a8fb78..d1192deee7 100644
--- a/examples/libraries/walkApi.js
+++ b/examples/libraries/walkApi.js
@@ -82,7 +82,7 @@ Avatar = function() {
 
                 // only need to zero right leg IK chain and hips
                 if (IKChain === "RightLeg" || joint === "Hips" ) {
-                    MyAvatar.setJointRotation(MyAvatar.jointNames.indexOf(joint), Quat.fromPitchYawRollDegrees(0, 0, 0));
+                    MyAvatar.setJointRotation(joint, Quat.fromPitchYawRollDegrees(0, 0, 0));
                 }
             }
             this.calibration.hipsToFeet = MyAvatar.getJointPosition("Hips").y - MyAvatar.getJointPosition("RightToeBase").y;
@@ -112,16 +112,16 @@ Avatar = function() {
     this.poseFingers = function() {
         for (knuckle in walkAssets.animationReference.leftHand) {
             if (walkAssets.animationReference.leftHand[knuckle].IKChain === "LeftHandThumb") {
-                MyAvatar.setJointRotation(MyAvatar.jointNames.indexOf(knuckle), Quat.fromPitchYawRollDegrees(0, 0, -4));
+                MyAvatar.setJointRotation(knuckle, Quat.fromPitchYawRollDegrees(0, 0, -4));
             } else {
-                MyAvatar.setJointRotation(MyAvatar.jointNames.indexOf(knuckle), Quat.fromPitchYawRollDegrees(16, 0, 5));
+                MyAvatar.setJointRotation(knuckle, Quat.fromPitchYawRollDegrees(16, 0, 5));
             }
         }
         for (knuckle in walkAssets.animationReference.rightHand) {
             if (walkAssets.animationReference.rightHand[knuckle].IKChain === "RightHandThumb") {
-                MyAvatar.setJointRotation(MyAvatar.jointNames.indexOf(knuckle), Quat.fromPitchYawRollDegrees(0, 0, 4));
+                MyAvatar.setJointRotation(knuckle, Quat.fromPitchYawRollDegrees(0, 0, 4));
             } else {
-                MyAvatar.setJointRotation(MyAvatar.jointNames.indexOf(knuckle), Quat.fromPitchYawRollDegrees(16, 0, -5));
+                MyAvatar.setJointRotation(knuckle, Quat.fromPitchYawRollDegrees(16, 0, -5));
             }
         }
     };
diff --git a/examples/walk.js b/examples/walk.js
index 02bc23a2e2..0b5bcab65a 100644
--- a/examples/walk.js
+++ b/examples/walk.js
@@ -449,6 +449,6 @@ function renderMotion() {
         }
 
         // apply rotations
-        MyAvatar.setJointRotation(MyAvatar.jointNames.indexOf(jointName), Quat.fromVec3Degrees(jointRotations));
+        MyAvatar.setJointRotation(jointName, Quat.fromVec3Degrees(jointRotations));
     }
 }
\ No newline at end of file
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index a9ff9541ea..a698c6f374 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -1032,13 +1032,30 @@ glm::vec3 AvatarData::getJointTranslation(const QString& name) const {
 
 void AvatarData::setJointData(const QString& name, const glm::quat& rotation, const glm::vec3& translation) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "setJointData", Q_ARG(const QString&, name),
-            Q_ARG(const glm::quat&, rotation));
+        QMetaObject::invokeMethod(this, "setJointData", Q_ARG(const QString&, name), Q_ARG(const glm::quat&, rotation),
+            Q_ARG(const glm::vec3&, translation));
         return;
     }
     setJointData(getJointIndex(name), rotation, translation);
 }
 
+void AvatarData::setJointRotation(const QString& name, const glm::quat& rotation) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "setJointRotation", Q_ARG(const QString&, name), Q_ARG(const glm::quat&, rotation));
+        return;
+    }
+    setJointRotation(getJointIndex(name), rotation);
+}
+
+void AvatarData::setJointTranslation(const QString& name, const glm::vec3& translation) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(const QString&, name),
+            Q_ARG(const glm::vec3&, translation));
+        return;
+    }
+    setJointTranslation(getJointIndex(name), translation);
+}
+
 void AvatarData::setJointRotation(int index, const glm::quat& rotation) {
     if (index == -1) {
         return;
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index e4022fd474..3abd63bf63 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -251,6 +251,8 @@ public:
     Q_INVOKABLE virtual glm::vec3 getJointTranslation(int index) const;
 
     Q_INVOKABLE void setJointData(const QString& name, const glm::quat& rotation, const glm::vec3& translation);
+    Q_INVOKABLE void setJointRotation(const QString& name, const glm::quat& rotation);
+    Q_INVOKABLE void setJointTranslation(const QString& name, const glm::vec3& translation);
     Q_INVOKABLE void clearJointData(const QString& name);
     Q_INVOKABLE bool isJointDataValid(const QString& name) const;
     Q_INVOKABLE glm::quat getJointRotation(const QString& name) const;