fixed disappearing voxel bug

ZappoMan committed 13 years ago

Commit edfd5cd1 parent b998d6b2 files · +24 −6Browse files

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

Unified · Split

     }
 }
+// returns an available index, starts by reusing a previously freed index, but if there isn't one available
+// it will use the end of the VBO array and grow our accounting of that array.
+// and makes the index available for some other node to use
+glBufferIndex VoxelSystem::getNextBufferIndex() {
+    glBufferIndex output = GLBUFFER_INDEX_UNKNOWN;
+    // if there's a free index, use it...
+    if (_freeIndexes.size() > 0) {
+        output = _freeIndexes.back();
+        _freeIndexes.pop_back();
+    } else {
+        output = _voxelsInWriteArrays;
+        _voxelsInWriteArrays++;
+    }
+    return output;
+}
+// Doesn't actually clean up the VBOs for the index, but does release responsibility of the index from the VoxelNode,
+// and makes the index available for some other node to use
 void VoxelSystem::freeBufferIndex(glBufferIndex index) {
     _freeIndexes.push_back(index);
 }
+// This will run through the list of _freeIndexes and reset their VBO array values to be "invisible".
 void VoxelSystem::clearFreeBufferIndexes() {
     for (int i = 0; i < _freeIndexes.size(); i++) {
         glBufferIndex nodeIndex = _freeIndexes[i];
         _callsToTreesToArrays++;
         if (_writeRenderFullVBO) {
             _voxelsInWriteArrays = 0; // reset our VBO
+            _freeIndexes.clear(); // reset our free indexes
         }
         _voxelsUpdated = newTreeToArrays(_tree->rootNode);
         _tree->clearDirtyBit(); // after we pull the trees into the array, we can consider the tree clean
         if (_writeRenderFullVBO) {
-            _abandonedVBOSlots = 0; // reset the count of our abandoned slots
+            _abandonedVBOSlots = 0; // reset the count of our abandoned slots, why is this here and not earlier????
         }
         // since we called treeToArrays, we can assume that our VBO is in sync, and so partial updates to the VBOs are
     if (node->getShouldRender()) {
         glm::vec3 startVertex = node->getCorner();
         float voxelScale = node->getScale();
-        glBufferIndex nodeIndex = _voxelsInWriteArrays;
+        glBufferIndex nodeIndex = getNextBufferIndex();
         // populate the array with points for the 8 vertices
         // and RGB color for each added vertex
         updateNodeInArrays(nodeIndex, startVertex, voxelScale, node->getColor());
         node->setBufferIndex(nodeIndex);
         node->setVoxelSystem(this);
-        _writeVoxelDirtyArray[nodeIndex] = true; // just in case we switch to Partial mode
-        _voxelsInWriteArrays++; // our know vertices in the arrays
         return 1; // rendered
     } else {
         node->setBufferIndex(GLBUFFER_INDEX_UNKNOWN);
         if (node->isKnownBufferIndex()) {
             nodeIndex = node->getBufferIndex();
         } else {
-            nodeIndex = _voxelsInWriteArrays;
+            nodeIndex = getNextBufferIndex();
             node->setBufferIndex(nodeIndex);
             node->setVoxelSystem(this);
-            _voxelsInWriteArrays++;
         }
         _writeVoxelDirtyArray[nodeIndex] = true;