From f7a3b3a4116498bd0f8b011be8ed4c80ccadc3c6 Mon Sep 17 00:00:00 2001
From: Sam Gateau <sam@ad.highfidelity.io>
Date: Thu, 29 Jun 2017 15:55:47 +0200
Subject: [PATCH] Experimenting faster getters on Avatar for scripts

---
 libraries/animation/src/Rig.cpp               | 19 ++++++++++++++-----
 .../src/avatars-renderer/Avatar.cpp           | 16 ++++++++--------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 3d04b0b26f..3ea03bc5f9 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -404,8 +404,10 @@ void Rig::setJointRotation(int index, bool valid, const glm::quat& rotation, flo
 }
 
 bool Rig::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position, glm::vec3 translation, glm::quat rotation) const {
-    if (isIndexValid(jointIndex)) {
-        position = (rotation * _internalPoseSet._absolutePoses[jointIndex].trans()) + translation;
+  //  if (isIndexValid(jointIndex)) {
+    QReadLocker readLock(&_externalPoseSetLock);
+    if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._absolutePoses.size()) {
+        position = (rotation * _externalPoseSet._absolutePoses[jointIndex].trans()) + translation;
         return true;
     } else {
         return false;
@@ -413,17 +415,24 @@ bool Rig::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position, glm:
 }
 
 bool Rig::getJointPosition(int jointIndex, glm::vec3& position) const {
+/*
     if (isIndexValid(jointIndex)) {
         position = _internalPoseSet._absolutePoses[jointIndex].trans();
         return true;
     } else {
         return false;
-    }
+    }*/
+    return getAbsoluteJointTranslationInRigFrame(jointIndex, position);
 }
 
 bool Rig::getJointRotationInWorldFrame(int jointIndex, glm::quat& result, const glm::quat& rotation) const {
-    if (isIndexValid(jointIndex)) {
-        result = rotation * _internalPoseSet._absolutePoses[jointIndex].rot();
+   // if (isIndexValid(jointIndex)) {
+   //     result = rotation * _internalPoseSet._absolutePoses[jointIndex].rot();
+   //     return true;
+
+    QReadLocker readLock(&_externalPoseSetLock);
+    if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._absolutePoses.size()) {
+        result = rotation * _externalPoseSet._absolutePoses[jointIndex].rot();
         return true;
     } else {
         return false;
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index a0a348388e..fbf2254248 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -1008,12 +1008,12 @@ glm::vec3 Avatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
 }
 
 int Avatar::getJointIndex(const QString& name) const {
-    if (QThread::currentThread() != thread()) {
+ /*   if (QThread::currentThread() != thread()) {
         int result;
         QMetaObject::invokeMethod(const_cast<Avatar*>(this), "getJointIndex", Qt::BlockingQueuedConnection,
             Q_RETURN_ARG(int, result), Q_ARG(const QString&, name));
         return result;
-    }
+    } */
     int result = getFauxJointIndex(name);
     if (result != -1) {
         return result;
@@ -1022,34 +1022,34 @@ int Avatar::getJointIndex(const QString& name) const {
 }
 
 QStringList Avatar::getJointNames() const {
-    if (QThread::currentThread() != thread()) {
+/*    if (QThread::currentThread() != thread()) {
         QStringList result;
         QMetaObject::invokeMethod(const_cast<Avatar*>(this), "getJointNames", Qt::BlockingQueuedConnection,
             Q_RETURN_ARG(QStringList, result));
         return result;
-    }
+    }*/
     return _skeletonModel->isActive() ? _skeletonModel->getFBXGeometry().getJointNames() : QStringList();
 }
 
 glm::vec3 Avatar::getJointPosition(int index) const {
-    if (QThread::currentThread() != thread()) {
+/*    if (QThread::currentThread() != thread()) {
         glm::vec3 position;
         QMetaObject::invokeMethod(const_cast<Avatar*>(this), "getJointPosition", Qt::BlockingQueuedConnection,
                                   Q_RETURN_ARG(glm::vec3, position), Q_ARG(const int, index));
         return position;
-    }
+    }*/
     glm::vec3 position;
     _skeletonModel->getJointPositionInWorldFrame(index, position);
     return position;
 }
 
 glm::vec3 Avatar::getJointPosition(const QString& name) const {
-    if (QThread::currentThread() != thread()) {
+/*    if (QThread::currentThread() != thread()) {
         glm::vec3 position;
         QMetaObject::invokeMethod(const_cast<Avatar*>(this), "getJointPosition", Qt::BlockingQueuedConnection,
                                   Q_RETURN_ARG(glm::vec3, position), Q_ARG(const QString&, name));
         return position;
-    }
+    }*/
     glm::vec3 position;
     _skeletonModel->getJointPositionInWorldFrame(getJointIndex(name), position);
     return position;