From 84da97638358b0a8ad31fecc27ac336a547cab87 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 6 May 2013 16:38:24 -0700 Subject: [PATCH] removed _voxelCleanupLock --- interface/src/VoxelSystem.cpp | 4 ---- interface/src/VoxelSystem.h | 1 - 2 files changed, 5 deletions(-) diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index 1679526b82..7ed31ec7cc 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -46,7 +46,6 @@ VoxelSystem::VoxelSystem() { _alwaysRenderFullVBO = true; _tree = new VoxelTree(); pthread_mutex_init(&_bufferWriteLock, NULL); - pthread_mutex_init(&_voxelCleanupLock, NULL); } VoxelSystem::~VoxelSystem() { @@ -57,7 +56,6 @@ VoxelSystem::~VoxelSystem() { delete[] _voxelDirtyArray; delete _tree; pthread_mutex_destroy(&_bufferWriteLock); - pthread_mutex_destroy(&_voxelCleanupLock); } void VoxelSystem::loadVoxelsFile(const char* fileName, bool wantColorRandomizer) { @@ -616,8 +614,6 @@ bool VoxelSystem::hasViewChanged() { void VoxelSystem::removeOutOfView() { PerformanceWarning warn(_renderWarningsOn, "removeOutOfView()"); // would like to include removedCount, _nodeCount, _removedVoxels.count() - pthread_mutex_lock(&_voxelCleanupLock); _nodeCount = 0; _tree->recurseTreeWithOperation(removeOutOfViewOperation,(void*)this); - pthread_mutex_unlock(&_voxelCleanupLock); } diff --git a/interface/src/VoxelSystem.h b/interface/src/VoxelSystem.h index 1cc7580efb..97d5fa1518 100644 --- a/interface/src/VoxelSystem.h +++ b/interface/src/VoxelSystem.h @@ -111,7 +111,6 @@ private: GLuint _vboColorsID; GLuint _vboIndicesID; pthread_mutex_t _bufferWriteLock; - pthread_mutex_t _voxelCleanupLock; ViewFrustum* _viewFrustum; ViewFrustum _lastKnowViewFrustum;