From 6782a891d04c0ae887c68c09386b8d7a0b0d1282 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 7 Jul 2017 10:35:45 -0700
Subject: [PATCH] rename the joint-name caches in AvatarData and Avatar so it's
 more clear that they are different

---
 .../src/avatars-renderer/Avatar.cpp           | 24 +++++++++----------
 .../src/avatars-renderer/Avatar.h             |  6 ++---
 libraries/avatars/src/AvatarData.cpp          | 18 +++++++-------
 libraries/avatars/src/AvatarData.h            |  4 ++--
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 20a85331d9..7e1e51572f 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -1009,23 +1009,23 @@ glm::vec3 Avatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
 }
 
 void Avatar::invalidateJointIndicesCache() const {
-    QWriteLocker writeLock(&_jointIndicesCacheLock);
-    _jointsCached = false;
+    QWriteLocker writeLock(&_modelJointIndicesCacheLock);
+    _modelJointsCached = false;
 }
 
 void Avatar::withValidJointIndicesCache(std::function<void()> const& worker) const {
-    QReadLocker readLock(&_jointIndicesCacheLock);
-    if (_jointsCached) {
+    QReadLocker readLock(&_modelJointIndicesCacheLock);
+    if (_modelJointsCached) {
         worker();
     } else {
         readLock.unlock();
         {
-            QWriteLocker writeLock(&_jointIndicesCacheLock);
-            if (!_jointsCached) {
-                _jointIndicesCache.clear();
+            QWriteLocker writeLock(&_modelJointIndicesCacheLock);
+            if (!_modelJointsCached) {
+                _modelJointIndicesCache.clear();
                 if (_skeletonModel && _skeletonModel->isActive()) {
-                    _jointIndicesCache = _skeletonModel->getFBXGeometry().jointIndices;
-                    _jointsCached = true;
+                    _modelJointIndicesCache = _skeletonModel->getFBXGeometry().jointIndices;
+                    _modelJointsCached = true;
                 }
             }
             worker();
@@ -1040,8 +1040,8 @@ int Avatar::getJointIndex(const QString& name) const {
     }
 
     withValidJointIndicesCache([&]() {
-        if (_jointIndicesCache.contains(name)) {
-            result = _jointIndicesCache[name] - 1;
+        if (_modelJointIndicesCache.contains(name)) {
+            result = _modelJointIndicesCache[name] - 1;
         }
     });
     return result;
@@ -1050,7 +1050,7 @@ int Avatar::getJointIndex(const QString& name) const {
 QStringList Avatar::getJointNames() const {
     QStringList result;
     withValidJointIndicesCache([&]() {
-        result = _jointIndicesCache.keys();
+        result = _modelJointIndicesCache.keys();
     });
     return result;
 }
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
index ce7e53656e..89db519abc 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@@ -270,9 +270,9 @@ protected:
 
     void invalidateJointIndicesCache() const;
     void withValidJointIndicesCache(std::function<void()> const& worker) const;
-    mutable QHash<QString, int> _jointIndicesCache;
-    mutable QReadWriteLock _jointIndicesCacheLock;
-    mutable bool _jointsCached { false };
+    mutable QHash<QString, int> _modelJointIndicesCache;
+    mutable QReadWriteLock _modelJointIndicesCacheLock;
+    mutable bool _modelJointsCached { false };
 
     glm::vec3 _skeletonOffset;
     std::vector<std::shared_ptr<Model>> _attachmentModels;
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 6eed23fb5b..cc64d21f0f 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -1462,12 +1462,12 @@ int AvatarData::getJointIndex(const QString& name) const {
         return result;
     }
     QReadLocker readLock(&_jointDataLock);
-    return _jointIndices.value(name) - 1;
+    return _fstJointIndices.value(name) - 1;
 }
 
 QStringList AvatarData::getJointNames() const {
     QReadLocker readLock(&_jointDataLock);
-    return _jointNames;
+    return _fstJointNames;
 }
 
 glm::quat AvatarData::getOrientationOutbound() const {
@@ -1720,14 +1720,14 @@ void AvatarData::setJointMappingsFromNetworkReply() {
             bool ok;
             int jointIndex = line.mid(secondSeparatorIndex + 1).trimmed().toInt(&ok);
             if (ok) {
-                while (_jointNames.size() < jointIndex + 1) {
-                    _jointNames.append(QString());
+                while (_fstJointNames.size() < jointIndex + 1) {
+                    _fstJointNames.append(QString());
                 }
-                _jointNames[jointIndex] = jointName;
+                _fstJointNames[jointIndex] = jointName;
             }
         }
-        for (int i = 0; i < _jointNames.size(); i++) {
-            _jointIndices.insert(_jointNames.at(i), i + 1);
+        for (int i = 0; i < _fstJointNames.size(); i++) {
+            _fstJointIndices.insert(_fstJointNames.at(i), i + 1);
         }
     }
 
@@ -1781,8 +1781,8 @@ void AvatarData::sendIdentityPacket() {
 void AvatarData::updateJointMappings() {
     {
         QWriteLocker writeLock(&_jointDataLock);
-        _jointIndices.clear();
-        _jointNames.clear();
+        _fstJointIndices.clear();
+        _fstJointNames.clear();
         _jointData.clear();
     }
 
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index d6241c2c50..1f672328ba 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -704,8 +704,8 @@ protected:
     QString _displayName;
     QString _sessionDisplayName { };
 
-    QHash<QString, int> _jointIndices; ///< 1-based, since zero is returned for missing keys
-    QStringList _jointNames; ///< in order of depth-first traversal
+    QHash<QString, int> _fstJointIndices; ///< 1-based, since zero is returned for missing keys
+    QStringList _fstJointNames; ///< in order of depth-first traversal
 
     quint64 _errorLogExpiry; ///< time in future when to log an error