From 63939728740a7fea32d30f21695b87a3b8b1190b Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 14 Apr 2017 13:36:20 -0700
Subject: [PATCH] remove AvatarManager dependency from Avatar

---
 interface/src/avatar/Avatar.cpp      | 16 ++++++++++------
 interface/src/avatar/Avatar.h        |  3 ++-
 interface/src/avatar/AvatarManager.h |  6 +-----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index a639b6880b..84638f8008 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -28,7 +28,6 @@
 #include <VariantMapToScriptValue.h>
 #include <DebugDraw.h>
 
-#include "AvatarManager.h"
 #include "AvatarMotionState.h"
 #include "Camera.h"
 #include "Menu.h"
@@ -73,6 +72,12 @@ namespace render {
     }
 }
 
+// static
+bool showReceiveStats = false;
+void Avatar::setShowReceiveStats(bool receiveStats) {
+    showReceiveStats = receiveStats;
+}
+
 Avatar::Avatar(QThread* thread, RigPointer rig) :
     AvatarData(),
     _skeletonOffset(0.0f),
@@ -582,7 +587,6 @@ void Avatar::render(RenderArgs* renderArgs) {
         bool havePosition, haveRotation;
 
         if (_handState & LEFT_HAND_POINTING_FLAG) {
-
             if (_handState & IS_FINGER_POINTING_FLAG) {
                 int leftIndexTip = getJointIndex("LeftHandIndex4");
                 int leftIndexTipJoint = getJointIndex("LeftHandIndex3");
@@ -809,7 +813,7 @@ Transform Avatar::calculateDisplayNameTransform(const ViewFrustum& view, const g
 void Avatar::renderDisplayName(gpu::Batch& batch, const ViewFrustum& view, const glm::vec3& textPosition) const {
     PROFILE_RANGE_BATCH(batch, __FUNCTION__);
 
-    bool shouldShowReceiveStats = DependencyManager::get<AvatarManager>()->shouldShowReceiveStats() && !isMyAvatar();
+    bool shouldShowReceiveStats = showReceiveStats && !isMyAvatar();
 
     // If we have nothing to draw, or it's totally transparent, or it's too close or behind the camera, return
     static const float CLIP_DISTANCE = 0.2f;
@@ -1473,16 +1477,16 @@ QList<QVariant> Avatar::getSkeleton() {
 
 void Avatar::addToScene(AvatarSharedPointer myHandle, const render::ScenePointer& scene) {
     if (scene) {
-        render::Transaction transaction;
         auto nodelist = DependencyManager::get<NodeList>();
         if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderAvatars()
             && !nodelist->isIgnoringNode(getSessionUUID())
             && !nodelist->isRadiusIgnoringNode(getSessionUUID())) {
+            render::Transaction transaction;
             addToScene(myHandle, scene, transaction);
+            scene->enqueueTransaction(transaction);
         }
-        scene->enqueueTransaction(transaction);
     } else {
-        qCWarning(interfaceapp) << "AvatarManager::addAvatar() : Unexpected null scene, possibly during application shutdown";
+        qCWarning(interfaceapp) << "Avatar::addAvatar() : Unexpected null scene, possibly during application shutdown";
     }
 }
 
diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h
index 14d1da530a..9bb8010b0d 100644
--- a/interface/src/avatar/Avatar.h
+++ b/interface/src/avatar/Avatar.h
@@ -66,6 +66,8 @@ class Avatar : public AvatarData {
     Q_PROPERTY(glm::vec3 skeletonOffset READ getSkeletonOffset WRITE setSkeletonOffset)
 
 public:
+    static void setShowReceiveStats(bool receiveStats);
+
     explicit Avatar(QThread* thread, RigPointer rig = nullptr);
     ~Avatar();
 
@@ -251,7 +253,6 @@ public slots:
     void setModelURLFinished(bool success);
 
 protected:
-    friend class AvatarManager;
 
     const float SMOOTH_TIME_POSITION = 0.125f;
     const float SMOOTH_TIME_ORIENTATION = 0.075f;
diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h
index 074e0f4fba..1832bc7126 100644
--- a/interface/src/avatar/AvatarManager.h
+++ b/interface/src/avatar/AvatarManager.h
@@ -62,8 +62,6 @@ public:
     void clearOtherAvatars();
     void deleteAllAvatars();
 
-    bool shouldShowReceiveStats() const { return _shouldShowReceiveStats; }
-
     void getObjectsToRemoveFromPhysics(VectorOfMotionStates& motionStates);
     void getObjectsToAddToPhysics(VectorOfMotionStates& motionStates);
     void getObjectsToChange(VectorOfMotionStates& motionStates);
@@ -85,7 +83,7 @@ public:
     float getMyAvatarSendRate() const { return _myAvatarSendRate.rate(); }
 
 public slots:
-    void setShouldShowReceiveStats(bool shouldShowReceiveStats) { _shouldShowReceiveStats = shouldShowReceiveStats; }
+    void setShouldShowReceiveStats(bool shouldShowReceiveStats) const { Avatar::setShowReceiveStats(shouldShowReceiveStats); }
     void updateAvatarRenderStatus(bool shouldRenderAvatars);
 
 private:
@@ -106,8 +104,6 @@ private:
     std::shared_ptr<MyAvatar> _myAvatar;
     quint64 _lastSendAvatarDataTime = 0; // Controls MyAvatar send data rate.
 
-    bool _shouldShowReceiveStats = false;
-
     std::list<QPointer<AudioInjector>> _collisionInjectors;
 
     RateCounter<> _myAvatarSendRate;