From 1c9d4de0d6ee7636e8024fb76cb53f58b19e2d95 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 26 Mar 2013 14:06:52 -0700 Subject: [PATCH] hook up VoxelAgentData to new MarkerNode class --- voxel/src/VoxelAgentData.cpp | 4 +++- voxel/src/VoxelAgentData.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/voxel/src/VoxelAgentData.cpp b/voxel/src/VoxelAgentData.cpp index 634b234b49..98311fdbac 100644 --- a/voxel/src/VoxelAgentData.cpp +++ b/voxel/src/VoxelAgentData.cpp @@ -12,15 +12,17 @@ VoxelAgentData::VoxelAgentData() { lastSentLevel = 0; + rootMarkerNode = new MarkerNode(); } VoxelAgentData::~VoxelAgentData() { - // nothing to explicitly destroy here + delete rootMarkerNode; } VoxelAgentData::VoxelAgentData(const VoxelAgentData &otherAgentData) { lastSentLevel = otherAgentData.lastSentLevel; memcpy(position, otherAgentData.position, sizeof(float) * 3); + rootMarkerNode = new MarkerNode(*otherAgentData.rootMarkerNode); } VoxelAgentData* VoxelAgentData::clone() const { diff --git a/voxel/src/VoxelAgentData.h b/voxel/src/VoxelAgentData.h index 6d66d06013..21b521126d 100644 --- a/voxel/src/VoxelAgentData.h +++ b/voxel/src/VoxelAgentData.h @@ -9,13 +9,15 @@ #ifndef __hifi__VoxelAgentData__ #define __hifi__VoxelAgentData__ -#include #include +#include +#include "MarkerNode.h" class VoxelAgentData : public AgentData { public: float position[3]; int lastSentLevel; + MarkerNode *rootMarkerNode; VoxelAgentData(); ~VoxelAgentData();