From a16d38ced65f39a1e74c3df8de53c0ea23867dd8 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Thu, 16 Jan 2014 15:07:09 -0800
Subject: [PATCH] Removed joints from avatar state messages.

---
 assignment-client/src/avatars/AvatarMixer.cpp |  3 +--
 libraries/avatars/src/AvatarData.cpp          | 17 -----------------
 libraries/avatars/src/AvatarData.h            | 11 -----------
 libraries/shared/src/PacketHeaders.cpp        |  5 +----
 libraries/shared/src/PacketHeaders.h          |  1 -
 5 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index 9c6d2f4714..e5e3ea2fcc 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -137,8 +137,7 @@ void AvatarMixer::processDatagram(const QByteArray& dataByteArray, const HifiSoc
             }
         }
         case PACKET_TYPE_KILL_NODE:
-        case PACKET_TYPE_AVATAR_URLS:
-        case PACKET_TYPE_AVATAR_FACE_VIDEO: {
+        case PACKET_TYPE_AVATAR_URLS: {
             QUuid nodeUUID = QUuid::fromRfc4122(dataByteArray.mid(numBytesForPacketHeader((unsigned char*) dataByteArray.data()),
                                                                   NUM_BYTES_RFC4122_UUID));
             // let everyone else know about the update
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index f20d35e4c8..8cd2f0dffc 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -146,13 +146,6 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
     
     // leap hand data
     destinationBuffer += _handData->encodeRemoteData(destinationBuffer);
-    
-    // skeleton joints
-    *destinationBuffer++ = (unsigned char)_joints.size();
-    for (vector<JointData>::iterator it = _joints.begin(); it != _joints.end(); it++) {
-        *destinationBuffer++ = (unsigned char)it->jointID;
-        destinationBuffer += packOrientationQuatToBytes(destinationBuffer, it->rotation);
-    }
 
     return destinationBuffer - bufferStart;
 }
@@ -273,16 +266,6 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
         // check passed, bytes match
         sourceBuffer += _handData->decodeRemoteData(sourceBuffer);
     }
-    
-    // skeleton joints
-    if (sourceBuffer - startPosition < numBytes) {
-        // check passed, bytes match
-        _joints.resize(*sourceBuffer++);
-        for (vector<JointData>::iterator it = _joints.begin(); it != _joints.end(); it++) {
-            it->jointID = *sourceBuffer++;
-            sourceBuffer += unpackOrientationQuatFromBytes(sourceBuffer, it->rotation); 
-        }
-    }
 
     return sourceBuffer - startPosition;
 }
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 923d5510b0..c3ca80737d 100755
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -60,8 +60,6 @@ enum KeyState
 
 const glm::vec3 vec3Zero(0.0f);
 
-class JointData;
-
 class AvatarData : public NodeData {
     Q_OBJECT
 
@@ -161,8 +159,6 @@ protected:
 
     bool _isChatCirclingEnabled;
 
-    std::vector<JointData> _joints;
-
     HeadData* _headData;
     HandData* _handData;
 
@@ -172,11 +168,4 @@ private:
     AvatarData& operator= (const AvatarData&);
 };
 
-class JointData {
-public:
-
-    int jointID;
-    glm::quat rotation;
-};
-
 #endif /* defined(__hifi__AvatarData__) */
diff --git a/libraries/shared/src/PacketHeaders.cpp b/libraries/shared/src/PacketHeaders.cpp
index 973738280f..0d468f0e1d 100644
--- a/libraries/shared/src/PacketHeaders.cpp
+++ b/libraries/shared/src/PacketHeaders.cpp
@@ -20,13 +20,10 @@ PACKET_VERSION versionForPacketType(PACKET_TYPE type) {
             return 2;
             
         case PACKET_TYPE_HEAD_DATA:
-            return 13;
+            return 14;
         
         case PACKET_TYPE_AVATAR_URLS:
             return 2;
-            
-        case PACKET_TYPE_AVATAR_FACE_VIDEO:
-            return 2;
 
         case PACKET_TYPE_OCTREE_STATS:
             return 2;
diff --git a/libraries/shared/src/PacketHeaders.h b/libraries/shared/src/PacketHeaders.h
index d1a2b501f6..f4fe5cd0a8 100644
--- a/libraries/shared/src/PacketHeaders.h
+++ b/libraries/shared/src/PacketHeaders.h
@@ -26,7 +26,6 @@ const PACKET_TYPE PACKET_TYPE_MICROPHONE_AUDIO_NO_ECHO = 'M';
 const PACKET_TYPE PACKET_TYPE_MICROPHONE_AUDIO_WITH_ECHO = 'm';
 const PACKET_TYPE PACKET_TYPE_BULK_AVATAR_DATA = 'X';
 const PACKET_TYPE PACKET_TYPE_AVATAR_URLS = 'U';
-const PACKET_TYPE PACKET_TYPE_AVATAR_FACE_VIDEO = 'F';
 const PACKET_TYPE PACKET_TYPE_TRANSMITTER_DATA_V2 = 'T';
 const PACKET_TYPE PACKET_TYPE_ENVIRONMENT_DATA = 'e';
 const PACKET_TYPE PACKET_TYPE_DOMAIN_LIST_REQUEST = 'L';