From f6fe503c515d636bf4ddc0f66b58c111576a6e03 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 22 Oct 2015 13:44:04 -0700
Subject: [PATCH] pass avatar parent information through avatar-mixer

---
 interface/src/avatar/AvatarManager.cpp   |  2 +-
 libraries/avatars/src/AvatarData.cpp     | 29 ++++++++++++++++--------
 libraries/avatars/src/AvatarData.h       |  4 ++--
 libraries/shared/src/SpatiallyNestable.h |  2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 16e136f9d1..3d13ef5d02 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -151,7 +151,7 @@ void AvatarManager::simulateAvatarFades(float deltaTime) {
     while (fadingIterator != _avatarFades.end()) {
         auto avatar = std::static_pointer_cast<Avatar>(*fadingIterator);
         avatar->withWriteLock([&] {
-            avatar->setTargetScale(avatar->getAvatarScale() * SHRINK_RATE, true);
+            avatar->setTargetScale(avatar->getAvatarScale() * SHRINK_RATE);
             if (avatar->getTargetScale() < MIN_FADE_SCALE) {
                 avatar->removeFromScene(*fadingIterator, scene, pendingChanges);
                 fadingIterator = _avatarFades.erase(fadingIterator);
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 9b2967cf5d..9a6c4b0180 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -135,15 +135,15 @@ float AvatarData::getTargetScale() const {
     return _targetScale;
 }
 
-void AvatarData::setTargetScale(float targetScale, bool overideReferential) {
+void AvatarData::setTargetScale(float targetScale) {
     _targetScale = targetScale;
 }
 
-void AvatarData::setClampedTargetScale(float targetScale, bool overideReferential) {
+void AvatarData::setClampedTargetScale(float targetScale) {
 
     targetScale =  glm::clamp(targetScale, MIN_AVATAR_SCALE, MAX_AVATAR_SCALE);
 
-    setTargetScale(targetScale, overideReferential);
+    setTargetScale(targetScale);
     qCDebug(avatars) << "Changed scale to " << _targetScale;
 }
 
@@ -214,14 +214,18 @@ QByteArray AvatarData::toByteArray(bool cullSmallChanges, bool sendAll) {
         setAtBit(bitItems, IS_EYE_TRACKER_CONNECTED);
     }
     // referential state
-    if (false) {
-        setAtBit(bitItems, HAS_REFERENTIAL); // XXX leaving this for later use
+    SpatiallyNestablePointer parent = getParentPointer();
+    if (parent) {
+        setAtBit(bitItems, HAS_REFERENTIAL);
     }
     *destinationBuffer++ = bitItems;
 
-    // XXX leaving this for later use
-    if (false) {
-        // destinationBuffer += _referential->packReferential(destinationBuffer);
+    if (parent) {
+        QByteArray referentialAsBytes = parent->getID().toRfc4122();
+        memcpy(destinationBuffer, referentialAsBytes.data(), referentialAsBytes.size());
+        destinationBuffer += referentialAsBytes.size();
+        memcpy(destinationBuffer, &_parentJointIndex, sizeof(_parentJointIndex));
+        destinationBuffer += sizeof(_parentJointIndex);
     }
 
     // If it is connected, pack up the data
@@ -541,8 +545,15 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
         _headData->_isEyeTrackerConnected = oneAtBit(bitItems, IS_EYE_TRACKER_CONNECTED);
         bool hasReferential = oneAtBit(bitItems, HAS_REFERENTIAL);
 
-        // XXX leaving this for later use Referential
         if (hasReferential) {
+            const int sizeOfPackedUuid = 16;
+            QByteArray referentialAsBytes((const char*)sourceBuffer, sizeOfPackedUuid);
+            _parentID = QUuid::fromRfc4122(referentialAsBytes);
+            sourceBuffer += sizeOfPackedUuid;
+            memcpy(&_parentJointIndex, sourceBuffer, sizeof(_parentJointIndex));
+            sourceBuffer += sizeof(_parentJointIndex);
+        } else {
+            _parentID = QUuid();
         }
 
         if (_headData->_isFaceTrackerConnected) {
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 9f8224caf8..4f826eafde 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -223,8 +223,8 @@ public:
 
     //  Scale
     float getTargetScale() const;
-    void setTargetScale(float targetScale, bool overideReferential = false);
-    void setClampedTargetScale(float targetScale, bool overideReferential = false);
+    void setTargetScale(float targetScale);
+    void setClampedTargetScale(float targetScale);
 
     //  Hand State
     Q_INVOKABLE void setHandState(char s) { _handState = s; }
diff --git a/libraries/shared/src/SpatiallyNestable.h b/libraries/shared/src/SpatiallyNestable.h
index c8bb7c2808..930b096450 100644
--- a/libraries/shared/src/SpatiallyNestable.h
+++ b/libraries/shared/src/SpatiallyNestable.h
@@ -70,13 +70,13 @@ protected:
     QUuid _id;
     QUuid _parentID; // what is this thing's transform relative to?
     quint16 _parentJointIndex; // which joint of the parent is this relative to?
+    SpatiallyNestablePointer getParentPointer() const;
 
     mutable SpatiallyNestableWeakPointer _parent;
     QVector<SpatiallyNestableWeakPointer> _children;
 
 private:
     Transform _transform; // this is to be combined with parent's world-transform to produce this' world-transform.
-    SpatiallyNestablePointer getParentPointer() const;
 
     // these are so we can return by reference
     mutable glm::vec3 _absolutePositionCache;