Fixed ui related files memory wastes

interface/src/VoxelSystem.cpp

@@ -51,8 +51,12 @@ GLubyte identityIndices[] = { 0,2,1,    0,3,2,    // Z-
                               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;
@@ -115,22 +119,25 @@ void VoxelSystem::clearFreeBufferIndexes() {
 }
 
 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);
 }
 
@@ -639,6 +646,7 @@ void VoxelSystem::init() {
 
         _perlinModulateProgramInitialized = true;
     }
+    _initialized = true;
 }
 
 void VoxelSystem::updateFullVBOs() {

interface/src/renderer/TextureCache.h

@@ -49,9 +49,9 @@ private:
     QOpenGLFramebufferObject* createFramebufferObject();
     
     GLuint _permutationNormalTextureID;
-    
+
-    QOpenGLFramebufferObject* _primaryFramebufferObject;
     GLuint _primaryDepthTextureID;
+    QOpenGLFramebufferObject* _primaryFramebufferObject;
     QOpenGLFramebufferObject* _secondaryFramebufferObject;
     QOpenGLFramebufferObject* _tertiaryFramebufferObject;
 };

interface/src/ui/BandwidthDialog.cpp

@@ -38,6 +38,12 @@ BandwidthDialog::BandwidthDialog(QWidget* parent, BandwidthMeter* model) :
     }
 }
 
+BandwidthDialog::~BandwidthDialog() {
+    for (int i = 0; i < BandwidthMeter::N_STREAMS; ++i) {
+        delete _labels[i];
+    }
+}
+
 void BandwidthDialog::paintEvent(QPaintEvent* event) {
 
     // Update labels

interface/src/ui/BandwidthDialog.h

@@ -18,9 +18,9 @@
 class BandwidthDialog : public QDialog {
     Q_OBJECT
 public:
-
     // Sets up the UI based on the configuration of the BandwidthMeter
     BandwidthDialog(QWidget* parent, BandwidthMeter* model);
+    ~BandwidthDialog();
 
 signals:
 

interface/src/ui/VoxelStatsDialog.cpp

@@ -53,6 +53,12 @@ VoxelStatsDialog::VoxelStatsDialog(QWidget* parent, VoxelSceneStats* model) :
     }
 }
 
+VoxelStatsDialog::~VoxelStatsDialog() {
+    for (int i = 0; i <(int)VoxelSceneStats::ITEM_COUNT; ++i) {
+        delete _labels[i];
+    }
+}
+
 void VoxelStatsDialog::paintEvent(QPaintEvent* event) {
 
     // Update labels

interface/src/ui/VoxelStatsDialog.h

@@ -19,6 +19,7 @@ class VoxelStatsDialog : public QDialog {
 public:
     // Sets up the UI
     VoxelStatsDialog(QWidget* parent, VoxelSceneStats* model);
+    ~VoxelStatsDialog();
 
 signals:
     void closed();