From 893996675a3d958bd3b0cab35cf6b916b3210257 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Mon, 22 Apr 2013 14:15:47 -0700
Subject: [PATCH] Derive VoxelAgentData from AvatarData to get access to camera
 details - Changed base class for VoxelAgentData - changed parseData() method
 to call base class implementation - added avatars library to cmake scripts

---
 voxel-server/CMakeLists.txt         | 3 +++
 voxel-server/src/VoxelAgentData.cpp | 9 +++++----
 voxel-server/src/VoxelAgentData.h   | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/voxel-server/CMakeLists.txt b/voxel-server/CMakeLists.txt
index 99b72be9cb..e1ce2b6f98 100644
--- a/voxel-server/CMakeLists.txt
+++ b/voxel-server/CMakeLists.txt
@@ -24,5 +24,8 @@ link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
 # link in the hifi voxels library
 link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR})
 
+# link in the hifi avatars library
+link_hifi_library(avatars ${TARGET_NAME} ${ROOT_DIR})
+
 # find required libraries
 find_package(GLM REQUIRED)
diff --git a/voxel-server/src/VoxelAgentData.cpp b/voxel-server/src/VoxelAgentData.cpp
index 8f9b41e4ca..5860106e34 100644
--- a/voxel-server/src/VoxelAgentData.cpp
+++ b/voxel-server/src/VoxelAgentData.cpp
@@ -28,9 +28,10 @@ VoxelAgentData* VoxelAgentData::clone() const {
 }
 
 void VoxelAgentData::parseData(unsigned char* sourceBuffer, int numBytes) {
-    // push past the packet header
-    sourceBuffer++;
+    // call base class to parse the data
+    AvatarData::parseData(sourceBuffer,numBytes);
     
-    // pull the position from the interface agent data packet
-    memcpy(&position, sourceBuffer, sizeof(float) * 3);
+    // make sure our class knows it's position
+    memcpy(&position, &_bodyPosition, sizeof(_bodyPosition));
 }
+
diff --git a/voxel-server/src/VoxelAgentData.h b/voxel-server/src/VoxelAgentData.h
index 98ec7e9ed7..1a7293a5a1 100644
--- a/voxel-server/src/VoxelAgentData.h
+++ b/voxel-server/src/VoxelAgentData.h
@@ -11,9 +11,10 @@
 
 #include <iostream>
 #include <AgentData.h>
+#include <AvatarData.h>
 #include "MarkerNode.h"
 
-class VoxelAgentData : public AgentData {
+class VoxelAgentData : public AvatarData {
 public:
     float position[3];
     MarkerNode *rootMarkerNode;