From fc0448a148b3f09deb6188ac4debe0b2d5c5e8ac Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 17 May 2013 12:32:42 -0700 Subject: [PATCH] disallow copying of VoxelSystem objects --- interface/src/VoxelSystem.cpp | 5 ----- interface/src/VoxelSystem.h | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index ac74d81c7f..a3796f68c1 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -417,11 +417,6 @@ int VoxelSystem::updateNodeInArraysAsPartialVBO(VoxelNode* node) { return 0; // not-updated } -VoxelSystem* VoxelSystem::clone() const { - // this still needs to be implemented, will need to be used if VoxelSystem is attached to agent - return NULL; -} - void VoxelSystem::init() { _renderWarningsOn = false; diff --git a/interface/src/VoxelSystem.h b/interface/src/VoxelSystem.h index a3560c1b31..2d6d9717f6 100644 --- a/interface/src/VoxelSystem.h +++ b/interface/src/VoxelSystem.h @@ -31,7 +31,6 @@ public: ~VoxelSystem(); int parseData(unsigned char* sourceBuffer, int numBytes); - VoxelSystem* clone() const; void setViewFrustum(ViewFrustum* viewFrustum) { _viewFrustum = viewFrustum; }; @@ -82,6 +81,10 @@ public: creationMode mode, bool destructive = false, bool debug = false); private: + // disallow copying of VoxelSystem objects + VoxelSystem(const VoxelSystem&); + VoxelSystem& operator= (const VoxelSystem&); + int _callsToTreesToArrays; VoxelNodeBag _removedVoxels;