From 9224bca88b1150fe32f1573f453078342ba12abd Mon Sep 17 00:00:00 2001 From: atlante45 Date: Thu, 22 Aug 2013 13:52:24 -0700 Subject: [PATCH 1/3] Fixed glBuffers not deleted in VoxelSystem --- interface/src/VoxelSystem.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index b0cbcf02c3..9c31040ca5 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -115,6 +115,10 @@ void VoxelSystem::clearFreeBufferIndexes() { } VoxelSystem::~VoxelSystem() { + glDeleteBuffers(1, &_vboVerticesID); + glDeleteBuffers(1, &_vboNormalsID); + glDeleteBuffers(1, &_vboColorsID); + glDeleteBuffers(1, &_vboIndicesID); delete[] _readVerticesArray; delete[] _writeVerticesArray; delete[] _readColorsArray; From 0068b838b2821d90047695c7707dc859aaf9ab10 Mon Sep 17 00:00:00 2001 From: atlante45 Date: Fri, 30 Aug 2013 15:56:28 -0700 Subject: [PATCH 2/3] Fixed importer crashing on non ARGB32 png. --- libraries/voxels/src/VoxelTree.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/voxels/src/VoxelTree.cpp b/libraries/voxels/src/VoxelTree.cpp index b17200448b..c673755e82 100644 --- a/libraries/voxels/src/VoxelTree.cpp +++ b/libraries/voxels/src/VoxelTree.cpp @@ -1614,8 +1614,10 @@ bool VoxelTree::readFromSquareARGB32Pixels(const char* filename) { QImage pngImage = QImage(filename); - for (int x = 0; x < pngImage.width() * pngImage.height(); ++x) { - minAlpha = std::min(qAlpha(pngImage.color(x)) , minAlpha); + for (int i = 0; i < pngImage.width(); ++i) { + for (int j = 0; j < pngImage.height(); ++j) { + minAlpha = std::min(qAlpha(pngImage.pixel(i, j)) , minAlpha); + } } int maxSize = std::max(pngImage.width(), pngImage.height()); From 66425763b82682257cb700b700df1ebb808a3e3e Mon Sep 17 00:00:00 2001 From: atlante45 Date: Fri, 30 Aug 2013 16:01:18 -0700 Subject: [PATCH 3/3] Revert "Fixed glBuffers not deleted in VoxelSystem" This reverts commit 9224bca88b1150fe32f1573f453078342ba12abd. --- interface/src/VoxelSystem.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index 9c31040ca5..b0cbcf02c3 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -115,10 +115,6 @@ void VoxelSystem::clearFreeBufferIndexes() { } VoxelSystem::~VoxelSystem() { - glDeleteBuffers(1, &_vboVerticesID); - glDeleteBuffers(1, &_vboNormalsID); - glDeleteBuffers(1, &_vboColorsID); - glDeleteBuffers(1, &_vboIndicesID); delete[] _readVerticesArray; delete[] _writeVerticesArray; delete[] _readColorsArray;