History

removed _voxelCleanupLock

ZappoMan committed 13 years ago

Commit 84da9761 parent cfbcc442 files · +0 −5Browse files

Showing the changes to interface/src/VoxelSystem.cpp (1 of 2 files). Show all

Unified · Split

interface/src/VoxelSystem.cpp+0−4
@@ -46,7 +46,6 @@ VoxelSystem::VoxelSystem() { · 45 unmodified lines
4646 _alwaysRenderFullVBO = true;
4747 _tree = new VoxelTree();
4848 pthread_mutex_init(&_bufferWriteLock, NULL);
49− pthread_mutex_init(&_voxelCleanupLock, NULL);
5049 }
5150
5251 VoxelSystem::~VoxelSystem() {
@@ -57,7 +56,6 @@ VoxelSystem::~VoxelSystem() { · 4 unmodified lines
5756 delete[] _voxelDirtyArray;
5857 delete _tree;
5958 pthread_mutex_destroy(&_bufferWriteLock);
60− pthread_mutex_destroy(&_voxelCleanupLock);
6159 }
6260
6361 void VoxelSystem::loadVoxelsFile(const char* fileName, bool wantColorRandomizer) {
@@ -616,8 +614,6 @@ bool VoxelSystem::hasViewChanged() { · 552 unmodified lines
616614
617615 void VoxelSystem::removeOutOfView() {
618616 PerformanceWarning warn(_renderWarningsOn, "removeOutOfView()"); // would like to include removedCount, _nodeCount, _removedVoxels.count()
619− pthread_mutex_lock(&_voxelCleanupLock);
620617 _nodeCount = 0;
621618 _tree->recurseTreeWithOperation(removeOutOfViewOperation,(void*)this);
622− pthread_mutex_unlock(&_voxelCleanupLock);
623619 }