pack the UUID with the avatar data

interface/src/avatar/Avatar.cpp

@@ -102,7 +102,6 @@ Avatar::Avatar(Node* owningNode) :
     _leadingAvatar(NULL),
     _voxels(this),
     _moving(false),
-    _uuid(),
     _initialized(false),
     _handHoldingPosition(0.0f, 0.0f, 0.0f),
     _maxArmLength(0.0f),

interface/src/avatar/Avatar.h

@@ -155,9 +155,6 @@ public:
     glm::quat getOrientation() const;
     glm::quat getWorldAlignedOrientation() const;
     AvatarVoxelSystem* getVoxels() { return &_voxels; }
-    
-    QUuid& getUUID() { return _uuid; }
-    void setUUID(const QUuid& uuid) { _uuid = uuid; }
 
     // Get the position/rotation of a single body ball
     void getBodyBallTransform(AvatarJointID jointID, glm::vec3& position, glm::quat& rotation) const;
@@ -225,7 +222,6 @@ protected:
     AvatarVoxelSystem _voxels;
 
     bool _moving; ///< set when position is changing
-    QUuid _uuid;
 
     // protected methods...
     glm::vec3 getBodyRightDirection() const { return getOrientation() * IDENTITY_RIGHT; }

libraries/avatars/src/AvatarData.cpp

@@ -23,6 +23,7 @@ static const float fingerVectorRadix = 4; // bits of precision when converting f
 
 AvatarData::AvatarData(Node* owningNode) :
     NodeData(owningNode),
+    _uuid(),
     _handPosition(0,0,0),
     _bodyYaw(-90.0),
     _bodyPitch(0.0),
@@ -116,6 +117,11 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
         _handData = new HandData(this);
     }
     
+    // UUID
+    QByteArray uuidByteArray = _uuid.toRfc4122();
+    memcpy(destinationBuffer, &uuidByteArray, uuidByteArray.size());
+    destinationBuffer += uuidByteArray.size();
+    
     // Body world position
     memcpy(destinationBuffer, &_position, sizeof(float) * 3);
     destinationBuffer += sizeof(float) * 3;
@@ -249,6 +255,11 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
     // push past the node ID
     sourceBuffer += sizeof(uint16_t);
     
+    // UUID
+    const int NUM_BYTES_RFC4122_UUID = 16;
+    _uuid = QUuid::fromRfc4122(QByteArray((char*) sourceBuffer, NUM_BYTES_RFC4122_UUID));
+    sourceBuffer += NUM_BYTES_RFC4122_UUID;
+    
     // Body world position
     memcpy(&_position, sourceBuffer, sizeof(float) * 3);
     sourceBuffer += sizeof(float) * 3;

libraries/avatars/src/AvatarData.h

@@ -17,6 +17,7 @@
 #include <glm/gtc/quaternion.hpp>
 
 #include <QtCore/QObject>
+#include <QtCore/QUuid>
 #include <QtCore/QVariantMap>
 
 #include <NodeData.h>
@@ -72,6 +73,9 @@ public:
     int getBroadcastData(unsigned char* destinationBuffer);
     int parseData(unsigned char* sourceBuffer, int numBytes);
     
+    QUuid& getUUID() { return _uuid; }
+    void setUUID(const QUuid& uuid) { _uuid = uuid; }
+    
     //  Body Rotation
     float getBodyYaw() const { return _bodyYaw; }
     void setBodyYaw(float bodyYaw) { _bodyYaw = bodyYaw; }
@@ -79,7 +83,6 @@ public:
     void setBodyPitch(float bodyPitch) { _bodyPitch = bodyPitch; }
     float getBodyRoll() const { return _bodyRoll; }
     void setBodyRoll(float bodyRoll) { _bodyRoll = bodyRoll; }
-
     
     //  Hand State
     void setHandState(char s) { _handState = s; }
@@ -133,6 +136,8 @@ public slots:
     void setWantOcclusionCulling(bool wantOcclusionCulling) { _wantOcclusionCulling = wantOcclusionCulling; }
     
 protected:
+    QUuid _uuid;
+    
     glm::vec3 _position;
     glm::vec3 _handPosition;
     

libraries/shared/src/PacketHeaders.cpp

@@ -20,7 +20,7 @@ PACKET_VERSION versionForPacketType(PACKET_TYPE type) {
             return 1;
 
         case PACKET_TYPE_HEAD_DATA:
-            return 8;
+            return 9;
         
         case PACKET_TYPE_AVATAR_URLS:
             return 1;