From ba30e016644a61c2d2a4a2b3697011303511bcf4 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 23 Nov 2015 14:12:49 -0800
Subject: [PATCH] include global position in avatar-mixer protocol so server
 knows where avatars are in world-space

---
 assignment-client/src/avatars/AvatarMixer.cpp              | 4 ++--
 interface/src/avatar/MyAvatar.cpp                          | 1 +
 libraries/avatars/src/AvatarData.cpp                       | 6 ++++++
 libraries/avatars/src/AvatarData.h                         | 7 +++++++
 .../entities-renderer/src/RenderableModelEntityItem.cpp    | 4 ++--
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index ae627caf00..174ba04311 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -157,7 +157,7 @@ void AvatarMixer::broadcastAvatarData() {
             ++_sumListeners;
 
             AvatarData& avatar = nodeData->getAvatar();
-            glm::vec3 myPosition = avatar.getLocalPosition(); // XXX should be world position
+            glm::vec3 myPosition = avatar.getClientGlobalPosition();
 
             // reset the internal state for correct random number distribution
             distribution.reset();
@@ -290,7 +290,7 @@ void AvatarMixer::broadcastAvatarData() {
 
                     //  The full rate distance is the distance at which EVERY update will be sent for this avatar
                     //  at twice the full rate distance, there will be a 50% chance of sending this avatar's update
-                    glm::vec3 otherPosition = otherAvatar.getLocalPosition(); // XXX should be world position
+                    glm::vec3 otherPosition = otherAvatar.getClientGlobalPosition();
                     float distanceToAvatar = glm::length(myPosition - otherPosition);
 
                     // potentially update the max full rate distance for this frame
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 254d1c068f..9d3981f4a0 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -193,6 +193,7 @@ MyAvatar::~MyAvatar() {
 
 QByteArray MyAvatar::toByteArray(bool cullSmallChanges, bool sendAll) {
     CameraMode mode = qApp->getCamera()->getMode();
+    _globalPosition = getPosition();
     if (mode == CAMERA_MODE_THIRD_PERSON || mode == CAMERA_MODE_INDEPENDENT) {
         // fake the avatar position that is sent up to the AvatarMixer
         glm::vec3 oldPosition = getPosition();
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index cc75404748..dfae86f132 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -210,6 +210,9 @@ QByteArray AvatarData::toByteArray(bool cullSmallChanges, bool sendAll) {
     memcpy(destinationBuffer, &position, sizeof(position));
     destinationBuffer += sizeof(position);
 
+    memcpy(destinationBuffer, &_globalPosition, sizeof(_globalPosition));
+    destinationBuffer += sizeof(_globalPosition);
+
     // Body rotation
     glm::vec3 bodyEulerAngles = glm::degrees(safeEulerAngles(getLocalOrientation()));
     destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, bodyEulerAngles.y);
@@ -492,6 +495,9 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
         memcpy(&position, sourceBuffer, sizeof(position));
         sourceBuffer += sizeof(position);
 
+        memcpy(&_globalPosition, sourceBuffer, sizeof(_globalPosition));
+        sourceBuffer += sizeof(_globalPosition);
+
         if (glm::isnan(position.x) || glm::isnan(position.y) || glm::isnan(position.z)) {
             if (shouldLogError(now)) {
                 qCDebug(avatars) << "Discard nan AvatarData::position; displayName = '" << _displayName << "'";
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 7c5a967c97..5465c764f9 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -338,6 +338,8 @@ public:
     TransformPointer getRecordingBasis() const;
     void setRecordingBasis(TransformPointer recordingBasis = TransformPointer());
 
+    glm::vec3 getClientGlobalPosition() { return _globalPosition; }
+
 public slots:
     void sendAvatarDataPacket();
     void sendIdentityPacket();
@@ -403,6 +405,11 @@ protected:
     // During playback, it holds the origin from which to play the relative positions in the clip
     TransformPointer _recordingBasis;
 
+    // _globalPosition is sent along with localPosition + parent because the avatar-mixer doesn't know
+    // where Entities are located.  This is currently only used by the mixer to decide how often to send
+    // updates about one avatar to another.
+    glm::vec3 _globalPosition;
+
 private:
     friend void avatarStateFromFrame(const QByteArray& frameData, AvatarData* _avatar);
     static QUrl _defaultFullAvatarModelUrl;
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index ce659acfa6..ddacc78fd0 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -563,7 +563,7 @@ bool RenderableModelEntityItem::contains(const glm::vec3& point) const {
     return false;
 }
 
-glm::quat getJointRotation(int index) const {
+glm::quat RenderableModelEntityItem::getJointRotation(int index) const {
     if (_model) {
         glm::quat result;
         if (_model->getJointRotation(index, result)) {
@@ -573,7 +573,7 @@ glm::quat getJointRotation(int index) const {
     return glm::quat();
 }
 
-glm::vec3 getJointTranslation(int index) const {
+glm::vec3 RenderableModelEntityItem::getJointTranslation(int index) const {
     if (_model) {
         glm::vec3 result;
         if (_model->getJointTranslation(index, result)) {