From 61cf17da731691c548ac5cf69290a85ebd24a98c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 15 Apr 2013 18:19:01 -0700
Subject: [PATCH] update agent-mixer to use new AvatarData class

---
 avatar-mixer/src/main.cpp            | 18 ++----------------
 libraries/avatars/src/AvatarData.cpp |  3 +--
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/avatar-mixer/src/main.cpp b/avatar-mixer/src/main.cpp
index 62c9cb07e7..439da691a0 100644
--- a/avatar-mixer/src/main.cpp
+++ b/avatar-mixer/src/main.cpp
@@ -40,22 +40,8 @@ unsigned char *addAgentToBroadcastPacket(unsigned char *currentPosition, Agent *
     currentPosition += packAgentId(currentPosition, agentToAdd->getAgentId());
 
     AvatarData *agentData = (AvatarData *)agentToAdd->getLinkedData();
+    currentPosition += agentData->getBroadcastData((char *) currentPosition);
     
-//    int bytesWritten = sprintf((char *)currentPosition,
-//                               PACKET_FORMAT,
-//                               agentData->getPitch(),
-//                               agentData->getYaw(),
-//                               agentData->getRoll(),
-//                               agentData->getHeadPositionX(),
-//                               agentData->getHeadPositionY(),
-//                               agentData->getHeadPositionZ(),
-//                               agentData->getLoudness(),
-//                               agentData->getAverageLoudness(),
-//                               agentData->getHandPositionX(),
-//                               agentData->getHandPositionY(),
-//                               agentData->getHandPositionZ());
-
-//    currentPosition += bytesWritten;
     return currentPosition;
 }
 
@@ -91,7 +77,7 @@ int main(int argc, char* argv[])
             switch (packetData[0]) {
                 case PACKET_HEADER_HEAD_DATA:
                     // this is positional data from an agent
-                    agentList->updateAgentWithData(agentAddress, (void *)packetData, receivedBytes);
+                    agentList->updateAgentWithData(agentAddress, (void *)(packetData + 1), receivedBytes);
                     
                     currentBufferPosition = broadcastPacket + 1;
                     agentIndex = 0;
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index d8f3862e27..40695766c3 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -45,7 +45,6 @@ AvatarData* AvatarData::clone() const {
 // called on me just prior to sending data to others (continuasly called)
 int AvatarData::getBroadcastData(char* destinationBuffer) {
     char* bufferPointer = destinationBuffer;
-    *(bufferPointer++) = PACKET_HEADER_HEAD_DATA;
 
     // TODO: DRY this up to a shared method
     // that can pack any type given the number of bytes
@@ -63,7 +62,7 @@ int AvatarData::getBroadcastData(char* destinationBuffer) {
 // called on the other agents - assigns it to my views of the others
 void AvatarData::parseData(void *sourceBuffer, int numBytes) {
     
-    char* bufferPointer = (char*) sourceBuffer + 1;
+    char* bufferPointer = (char*) sourceBuffer ;
     
     memcpy(&_bodyPosition, bufferPointer, sizeof(float) * 3);
     bufferPointer += sizeof(float) * 3;