Fixed ui related files memory wastes

atlante45 committed 13 years ago

Commit 06119991 parent 7688dc46 files · +38 −17Browse files

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

Unified · Split

                               10,11,15, 10,15,14, // Y+
                               4,5,6,    4,6,7 };  // Z+
-VoxelSystem::VoxelSystem(float treeScale, int maxVoxels) :
+VoxelSystem::VoxelSystem(float treeScale, int maxVoxels)
-        NodeData(NULL), _treeScale(treeScale), _maxVoxels(maxVoxels) {
+    : NodeData(NULL),
+      _treeScale(treeScale),
+      _maxVoxels(maxVoxels),
+      _initialized(false) {
     _voxelsInReadArrays = _voxelsInWriteArrays = _voxelsUpdated = 0;
     _writeRenderFullVBO = true;
     _readRenderFullVBO = true;
 }
 VoxelSystem::~VoxelSystem() {
-    delete[] _readVerticesArray;
+    if (_initialized) {
-    delete[] _writeVerticesArray;
+        // Destroy  glBuffers
-    delete[] _readColorsArray;
+        glDeleteBuffers(1, &_vboVerticesID);
-    delete[] _writeColorsArray;
+        glDeleteBuffers(1, &_vboNormalsID);
-    delete[] _writeVoxelDirtyArray;
+        glDeleteBuffers(1, &_vboColorsID);
-    delete[] _readVoxelDirtyArray;
+        glDeleteBuffers(1, &_vboIndicesID);
+        delete[] _readVerticesArray;
+        delete[] _writeVerticesArray;
+        delete[] _readColorsArray;
+        delete[] _writeColorsArray;
+        delete[] _writeVoxelDirtyArray;
+        delete[] _readVoxelDirtyArray;
+    }
     delete _tree;
     pthread_mutex_destroy(&_bufferWriteLock);
     pthread_mutex_destroy(&_treeLock);
-    // Destroy  glBuffers
-    glDeleteBuffers(1, &_vboVerticesID);
-    glDeleteBuffers(1, &_vboNormalsID);
-    glDeleteBuffers(1, &_vboColorsID);
-    glDeleteBuffers(1, &_vboIndicesID);
     VoxelNode::removeDeleteHook(this);
 }
         _perlinModulateProgramInitialized = true;
     }
+    _initialized = true;
 }
 void VoxelSystem::updateFullVBOs() {