From 28b3eef7aa57f82f13c9682b1d9e281eb1bc2ae3 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Mon, 24 Apr 2017 19:22:02 -0400
Subject: [PATCH] add getJointTranslations() methods

---
 interface/src/avatar/Avatar.cpp            | 11 +++++++++++
 interface/src/avatar/Avatar.h              |  1 +
 libraries/avatars/src/AvatarData.cpp       | 16 ++++++++++++++++
 libraries/avatars/src/AvatarData.h         |  1 +
 libraries/avatars/src/ScriptAvatarData.cpp |  7 +++++++
 libraries/avatars/src/ScriptAvatarData.h   |  1 +
 6 files changed, 37 insertions(+)

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 5b996a3cdf..f29efb8c32 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -929,6 +929,17 @@ QVector<glm::quat> Avatar::getJointRotations() const {
     return jointRotations;
 }
 
+QVector<glm::vec3> Avatar::getJointTranslations() const {
+    if (QThread::currentThread() != thread()) {
+        return AvatarData::getJointTranslations();
+    }
+    QVector<glm::vec3> jointTranslations(_skeletonModel->getJointStateCount());
+    for (int i = 0; i < _skeletonModel->getJointStateCount(); ++i) {
+        _skeletonModel->getJointTranslation(i, jointTranslations[i]);
+    }
+    return jointTranslations;
+}
+
 glm::quat Avatar::getJointRotation(int index) const {
     glm::quat rotation;
     _skeletonModel->getJointRotation(index, rotation);
diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h
index 8c055885fd..14d1da530a 100644
--- a/interface/src/avatar/Avatar.h
+++ b/interface/src/avatar/Avatar.h
@@ -112,6 +112,7 @@ public:
 
     virtual QVector<glm::quat> getJointRotations() const override;
     virtual glm::quat getJointRotation(int index) const override;
+    virtual QVector<glm::vec3> getJointTranslations() const override;
     virtual glm::vec3 getJointTranslation(int index) const override;
     virtual int getJointIndex(const QString& name) const override;
     virtual QStringList getJointNames() const override;
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 9802630cf5..b805f68bed 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -1391,6 +1391,22 @@ void AvatarData::setJointRotations(QVector<glm::quat> jointRotations) {
     }
 }
 
+QVector<glm::vec3> AvatarData::getJointTranslations() const {
+    if (QThread::currentThread() != thread()) {
+        QVector<glm::vec3> result;
+        QMetaObject::invokeMethod(const_cast<AvatarData*>(this),
+                                  "getJointTranslations", Qt::BlockingQueuedConnection,
+                                  Q_RETURN_ARG(QVector<glm::vec3>, result));
+        return result;
+    }
+    QReadLocker readLock(&_jointDataLock);
+    QVector<glm::vec3> jointTranslations(_jointData.size());
+    for (int i = 0; i < _jointData.size(); ++i) {
+        jointTranslations[i] = _jointData[i].translation;
+    }
+    return jointTranslations;
+}
+
 void AvatarData::setJointTranslations(QVector<glm::vec3> jointTranslations) {
     if (QThread::currentThread() != thread()) {
         QVector<glm::quat> result;
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 8319eb5249..e05bdce162 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -497,6 +497,7 @@ public:
     Q_INVOKABLE glm::vec3 getJointTranslation(const QString& name) const;
 
     Q_INVOKABLE virtual QVector<glm::quat> getJointRotations() const;
+    Q_INVOKABLE virtual QVector<glm::vec3> getJointTranslations() const;
     Q_INVOKABLE virtual void setJointRotations(QVector<glm::quat> jointRotations);
     Q_INVOKABLE virtual void setJointTranslations(QVector<glm::vec3> jointTranslations);
 
diff --git a/libraries/avatars/src/ScriptAvatarData.cpp b/libraries/avatars/src/ScriptAvatarData.cpp
index f579eb9763..01d7f293d8 100644
--- a/libraries/avatars/src/ScriptAvatarData.cpp
+++ b/libraries/avatars/src/ScriptAvatarData.cpp
@@ -210,6 +210,13 @@ QVector<glm::quat> ScriptAvatarData::getJointRotations() const {
         return QVector<glm::quat>();
     }
 }
+QVector<glm::vec3> ScriptAvatarData::getJointTranslations() const {
+    if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
+        return sharedAvatarData->getJointTranslations();
+    } else {
+        return QVector<glm::vec3>();
+    }
+}
 bool ScriptAvatarData::isJointDataValid(const QString& name) const {
     if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
         return sharedAvatarData->isJointDataValid(name);
diff --git a/libraries/avatars/src/ScriptAvatarData.h b/libraries/avatars/src/ScriptAvatarData.h
index 683306e847..d763b6e97a 100644
--- a/libraries/avatars/src/ScriptAvatarData.h
+++ b/libraries/avatars/src/ScriptAvatarData.h
@@ -106,6 +106,7 @@ public:
     Q_INVOKABLE glm::quat getJointRotation(const QString& name) const;
     Q_INVOKABLE glm::vec3 getJointTranslation(const QString& name) const;
     Q_INVOKABLE QVector<glm::quat> getJointRotations() const;
+    Q_INVOKABLE QVector<glm::vec3> getJointTranslations() const;
     Q_INVOKABLE bool isJointDataValid(const QString& name) const;
     Q_INVOKABLE int getJointIndex(const QString& name) const;
     Q_INVOKABLE QStringList getJointNames() const;