From ac751029c0d9a5248cb499ce509ebde1f4b1ac17 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Tue, 25 Apr 2017 15:34:59 -0700
Subject: [PATCH] remove identity cache code

---
 interface/src/avatar/Avatar.cpp        | 18 ------------------
 interface/src/avatar/Avatar.h          |  3 ---
 interface/src/avatar/AvatarManager.cpp | 11 -----------
 interface/src/avatar/AvatarManager.h   |  2 --
 4 files changed, 34 deletions(-)

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 4f8cc6655e..4efb68f847 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -445,24 +445,6 @@ float Avatar::getSimulationRate(const QString& rateName) const {
     return 0.0f;
 }
 
-void Avatar::getIdentity(Identity& identity) const {
-    identity.uuid = getSessionUUID();
-    identity.skeletonModelURL = _skeletonModelURL;
-    identity.attachmentData = _attachmentData;
-    identity.displayName = _displayName;
-    identity.sessionDisplayName = _sessionDisplayName;
-    identity.avatarEntityData = _avatarEntityData;
-}
-
-void Avatar::setIdentity(const Identity& identity) {
-    assert(identity.uuid == getSessionUUID());
-    setSkeletonModelURL(identity.skeletonModelURL);
-    _attachmentData = identity.attachmentData;
-    _displayName = identity.displayName;
-    _sessionDisplayName = identity.sessionDisplayName;
-    _avatarEntityData = identity.avatarEntityData;
-}
-
 bool Avatar::isLookingAtMe(AvatarSharedPointer avatar) const {
     const float HEAD_SPHERE_RADIUS = 0.1f;
     glm::vec3 theirLookAt = dynamic_pointer_cast<Avatar>(avatar)->getHead()->getLookAtPosition();
diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h
index 3b9bb7e0f2..8c055885fd 100644
--- a/interface/src/avatar/Avatar.h
+++ b/interface/src/avatar/Avatar.h
@@ -238,9 +238,6 @@ public:
         return (lerpValue*(4.0f - 2.0f * lerpValue) - 1.0f);
     }
 
-    void getIdentity(Identity& identity) const;
-    void setIdentity(const Identity& identity);
-
 public slots:
 
     // FIXME - these should be migrated to use Pose data instead
diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index e3293a7874..c0b001911f 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -326,16 +326,6 @@ AvatarSharedPointer AvatarManager::newSharedAvatar() {
     return std::make_shared<Avatar>(qApp->thread(), std::make_shared<Rig>());
 }
 
-AvatarSharedPointer AvatarManager::addAvatar(const QUuid& sessionUUID, const QWeakPointer<Node>& mixerWeakPointer) {
-    AvatarSharedPointer avatarData = AvatarHashMap::addAvatar(sessionUUID, mixerWeakPointer);
-    QMap<QUuid, AvatarData::Identity>::iterator itr =  _identityCache.find(sessionUUID);
-	if (itr != _identityCache.end()) {
-        auto avatar = std::static_pointer_cast<Avatar>(avatarData);
-        avatar->setIdentity(*itr);
-    }
-    return avatarData;
-}
-
 void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar, KillAvatarReason removalReason) {
     AvatarHashMap::handleRemovedAvatar(removedAvatar, removalReason);
 
@@ -347,7 +337,6 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
     // therefore whenever we remove an avatar we cache the identity in case we need it later
     AvatarData::Identity identity;
     avatar->getIdentity(identity);
-    _identityCache[avatar->getSessionUUID()] = identity;
 
     AvatarMotionState* motionState = avatar->getMotionState();
     if (motionState) {
diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h
index af372f7627..45f1a597eb 100644
--- a/interface/src/avatar/AvatarManager.h
+++ b/interface/src/avatar/AvatarManager.h
@@ -105,7 +105,6 @@ private:
     void simulateAvatarFades(float deltaTime);
 
     AvatarSharedPointer newSharedAvatar() override;
-    AvatarSharedPointer addAvatar(const QUuid& sessionUUID, const QWeakPointer<Node>& mixerWeakPointer) override;
     void handleRemovedAvatar(const AvatarSharedPointer& removedAvatar, KillAvatarReason removalReason = KillAvatarReason::NoReason) override;
 
     QVector<AvatarSharedPointer> _avatarsToFade;
@@ -118,7 +117,6 @@ private:
     quint64 _lastSendAvatarDataTime = 0; // Controls MyAvatar send data rate.
 
     QVector<AvatarManager::LocalLight> _localLights;
-    QMap<QUuid, AvatarData::Identity> _identityCache;
 
     bool _shouldShowReceiveStats = false;