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
46 _alwaysRenderFullVBO = true;46 _alwaysRenderFullVBO = true;
47 _tree = new VoxelTree();47 _tree = new VoxelTree();
48 pthread_mutex_init(&_bufferWriteLock, NULL);48 pthread_mutex_init(&_bufferWriteLock, NULL);
49 pthread_mutex_init(&_voxelCleanupLock, NULL);
50}49}
51 50
52VoxelSystem::~VoxelSystem() {51VoxelSystem::~VoxelSystem() {
@@ -57,7 +56,6 @@ VoxelSystem::~VoxelSystem() { · 4 unmodified lines
57 delete[] _voxelDirtyArray;56 delete[] _voxelDirtyArray;
58 delete _tree;57 delete _tree;
59 pthread_mutex_destroy(&_bufferWriteLock);58 pthread_mutex_destroy(&_bufferWriteLock);
60 pthread_mutex_destroy(&_voxelCleanupLock);
61}59}
62 60
63void VoxelSystem::loadVoxelsFile(const char* fileName, bool wantColorRandomizer) {61void VoxelSystem::loadVoxelsFile(const char* fileName, bool wantColorRandomizer) {
@@ -616,8 +614,6 @@ bool VoxelSystem::hasViewChanged() { · 552 unmodified lines
616 614
617void VoxelSystem::removeOutOfView() {615void VoxelSystem::removeOutOfView() {
618 PerformanceWarning warn(_renderWarningsOn, "removeOutOfView()"); // would like to include removedCount, _nodeCount, _removedVoxels.count()616 PerformanceWarning warn(_renderWarningsOn, "removeOutOfView()"); // would like to include removedCount, _nodeCount, _removedVoxels.count()
619 pthread_mutex_lock(&_voxelCleanupLock);
620 _nodeCount = 0;617 _nodeCount = 0;
621 _tree->recurseTreeWithOperation(removeOutOfViewOperation,(void*)this);618 _tree->recurseTreeWithOperation(removeOutOfViewOperation,(void*)this);
622 pthread_mutex_unlock(&_voxelCleanupLock);
623}619}