From 4b13fd969e0609e9abc5ac8e08daf92835f19e7e Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 10 May 2016 15:37:54 -0700
Subject: [PATCH] split code that sends edits via avatar-mixer out of
 queueEditEntityMessage

---
 interface/src/avatar/Avatar.cpp               |  1 -
 .../entities/src/EntityEditPacketSender.cpp   | 78 +++++++++++--------
 .../entities/src/EntityEditPacketSender.h     |  4 +
 3 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index d3664b9f20..80e7aaa8a7 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -183,7 +183,6 @@ void Avatar::updateAvatarEntities() {
     // - setAvatarEntityData saves the bytes and sets _avatarEntityDataChanged = true
     // - (My)Avatar::simulate notices _avatarEntityDataChanged and here we are...
 
-    const static quint64 refreshTime = 3 * USECS_PER_SECOND;
     if (!_avatarEntityDataChanged) {
         return;
     }
diff --git a/libraries/entities/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp
index ea86d3d542..416d3c971e 100644
--- a/libraries/entities/src/EntityEditPacketSender.cpp
+++ b/libraries/entities/src/EntityEditPacketSender.cpp
@@ -36,6 +36,51 @@ void EntityEditPacketSender::adjustEditPacketForClockSkew(PacketType type, QByte
     }
 }
 
+void EntityEditPacketSender::queueEditAvatarEntityMessage(PacketType type,
+                                                          EntityTreePointer entityTree,
+                                                          EntityItemID entityItemID,
+                                                          const EntityItemProperties& properties) {
+    if (!_shouldSend) {
+        return; // bail early
+    }
+
+    assert(properties.getClientOnly());
+
+    // this is an avatar-based entity.  update our avatar-data rather than sending to the entity-server
+    assert(_myAvatar);
+
+    if (!entityTree) {
+        qDebug() << "EntityEditPacketSender::queueEditEntityMessage null entityTree.";
+        return;
+    }
+    EntityItemPointer entity = entityTree->findEntityByEntityItemID(entityItemID);
+    if (!entity) {
+        qDebug() << "EntityEditPacketSender::queueEditEntityMessage can't find entity.";
+        return;
+    }
+
+    // the properties that get serialized into the avatar identity packet should be the entire set
+    // rather than just the ones being edited.
+    entity->setProperties(properties);
+    EntityItemProperties entityProperties = entity->getProperties();
+
+    QScriptValue scriptProperties = EntityItemNonDefaultPropertiesToScriptValue(&_scriptEngine, entityProperties);
+    QVariant variantProperties = scriptProperties.toVariant();
+    QJsonDocument jsonProperties = QJsonDocument::fromVariant(variantProperties);
+
+    // the ID of the parent/avatar changes from session to session.  use a special UUID to indicate the avatar
+    QJsonObject jsonObject = jsonProperties.object();
+    if (QUuid(jsonObject["parentID"].toString()) == _myAvatar->getID()) {
+        jsonObject["parentID"] = AVATAR_SELF_ID.toString();
+    }
+    jsonProperties = QJsonDocument(jsonObject);
+
+    QByteArray binaryProperties = jsonProperties.toBinaryData();
+    _myAvatar->updateAvatarEntity(entityItemID, binaryProperties);
+    return;
+}
+
+
 void EntityEditPacketSender::queueEditEntityMessage(PacketType type,
                                                     EntityTreePointer entityTree,
                                                     EntityItemID entityItemID,
@@ -43,38 +88,9 @@ void EntityEditPacketSender::queueEditEntityMessage(PacketType type,
     if (!_shouldSend) {
         return; // bail early
     }
+
     if (properties.getClientOnly()) {
-        // this is an avatar-based entity.  update our avatar-data rather than sending to the entity-server
-        assert(_myAvatar);
-
-        if (!entityTree) {
-            qDebug() << "EntityEditPacketSender::queueEditEntityMessage null entityTree.";
-            return;
-        }
-        EntityItemPointer entity = entityTree->findEntityByEntityItemID(entityItemID);
-        if (!entity) {
-            qDebug() << "EntityEditPacketSender::queueEditEntityMessage can't find entity.";
-            return;
-        }
-
-        // the properties that get serialized into the avatar identity packet should be the entire set
-        // rather than just the ones being edited.
-        entity->setProperties(properties);
-        EntityItemProperties entityProperties = entity->getProperties();
-
-        QScriptValue scriptProperties = EntityItemNonDefaultPropertiesToScriptValue(&_scriptEngine, entityProperties);
-        QVariant variantProperties = scriptProperties.toVariant();
-        QJsonDocument jsonProperties = QJsonDocument::fromVariant(variantProperties);
-
-        // the ID of the parent/avatar changes from session to session.  use a special UUID to indicate the avatar
-        QJsonObject jsonObject = jsonProperties.object();
-        if (QUuid(jsonObject["parentID"].toString()) == _myAvatar->getID()) {
-            jsonObject["parentID"] = AVATAR_SELF_ID.toString();
-        }
-        jsonProperties = QJsonDocument(jsonObject);
-
-        QByteArray binaryProperties = jsonProperties.toBinaryData();
-        _myAvatar->updateAvatarEntity(entityItemID, binaryProperties);
+        queueEditAvatarEntityMessage(type, entityTree, entityItemID, properties);
         return;
     }
 
diff --git a/libraries/entities/src/EntityEditPacketSender.h b/libraries/entities/src/EntityEditPacketSender.h
index 90c6cb988d..9366fc9329 100644
--- a/libraries/entities/src/EntityEditPacketSender.h
+++ b/libraries/entities/src/EntityEditPacketSender.h
@@ -27,6 +27,10 @@ public:
     AvatarData* getMyAvatar() { return _myAvatar; }
     void clearAvatarEntity(QUuid entityID) { assert(_myAvatar); _myAvatar->clearAvatarEntity(entityID); }
 
+    void queueEditAvatarEntityMessage(PacketType type, EntityTreePointer entityTree,
+                                      EntityItemID entityItemID, const EntityItemProperties& properties);
+
+
     /// Queues an array of several voxel edit messages. Will potentially send a pending multi-command packet. Determines
     /// which voxel-server node or nodes the packet should be sent to. Can be called even before voxel servers are known, in
     /// which case up to MaxPendingMessages will be buffered and processed when voxel servers are known.