Merged clearAllOcclusions into inspectOcclusions

matsukaze committed 12 years ago

Commit 75ecdbd1 parent 8aa645b2 files · +42 −69Browse files

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

Unified · Split

         if (_writeRenderFullVBO) {
             if (_usePrimitiveRenderer) {
                 _renderer->release();
+                clearAllNodesPrimitiveIndex();
             }
             clearFreeBufferIndexes();
         }
             node->setPrimitiveIndex(0);
             return 1;
         }
-    }
+    } else {
-    else {
         // if the node is not in the VBOs then we have nothing to do!
         if (node->isKnownBufferIndex()) {
             // If this node has not yet been written to the array, then add it to the end of the array.
     _tree->eraseAllOctreeElements();
     _tree->unlock();
     clearFreeBufferIndexes();
-    if (_renderer) {
+    if (_usePrimitiveRenderer) {
-        _renderer->release();
+        if (_renderer) {
+            _renderer->release();
+        }
+        clearAllNodesPrimitiveIndex();
     }
     _voxelsInReadArrays = 0; // do we need to do this?
     setupNewVoxelsForDrawing();
     _nodeCount++;
     VoxelTreeElement* voxel = (VoxelTreeElement*)element;
     voxel->setBufferIndex(GLBUFFER_INDEX_UNKNOWN);
-    voxel->setPrimitiveIndex(0);
     return true;
 }
     }
 }
+// only called on main thread
+bool VoxelSystem::clearAllNodesPrimitiveIndexOperation(OctreeElement* element, void* extraData) {
+    _nodeCount++;
+    VoxelTreeElement* voxel = (VoxelTreeElement*)element;
+    voxel->setPrimitiveIndex(0);
+    return true;
+}
+// only called on main thread, and also always followed by a call to cleanupVoxelMemory()
+// you shouldn't be calling this on any other thread or without also cleaning up voxel memory
+void VoxelSystem::clearAllNodesPrimitiveIndex() {
+    PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
+                            "VoxelSystem::clearAllNodesPrimitiveIndex()");
+    _nodeCount = 0;
+    _tree->lockForRead(); // we won't change the tree so it's ok to treat this as a read
+    _tree->recurseTreeWithOperation(clearAllNodesPrimitiveIndexOperation);
+    _tree->unlock();
+    if (Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings)) {
+        qDebug("clearing primitive index of %d nodes", _nodeCount);
+    }
+}
 bool VoxelSystem::inspectForInteriorOcclusionsOperation(OctreeElement* element, void* extraData) {
     _nodeCount++;
     VoxelTreeElement* voxel = (VoxelTreeElement*)element;
     // Nothing to do at the leaf level
     if (voxel->isLeaf()) {
+        // By definition the the exterior faces of a leaf voxel are
+        // always occluders.
+        voxel->setExteriorOcclusions(OctreeElement::HalfSpace::All);
+        // And the sibling occluders
+        voxel->setInteriorOcclusions(OctreeElement::HalfSpace::None);
         return false;
+    } else {
+        voxel->setExteriorOcclusions(OctreeElement::HalfSpace::None);
+        voxel->setInteriorOcclusions(OctreeElement::HalfSpace::None);
     }
     // Count of exterior occluding faces of this voxel element indexed
     return true;
 }
-bool VoxelSystem::clearAllOcclusionsOperation(OctreeElement* element, void* extraData) {
-    _nodeCount++;
-    VoxelTreeElement* voxel = (VoxelTreeElement*)element;
-    bool rc;
-    if (voxel->isLeaf()) {
-        // By definition the the exterior faces of a leaf voxel are
-        // always occluders.
-        voxel->setExteriorOcclusions(OctreeElement::HalfSpace::All);
-        // And the sibling occluders
-        voxel->setInteriorOcclusions(OctreeElement::HalfSpace::None);
-        rc = false;
-    } else {
-        voxel->setExteriorOcclusions(OctreeElement::HalfSpace::None);
-        voxel->setInteriorOcclusions(OctreeElement::HalfSpace::None);
-        rc = true;
-    }
-    return rc;
-}
 void VoxelSystem::cullSharedFaces() {
     if (Menu::getInstance()->isOptionChecked(MenuOption::CullSharedFaces)) {
         _useVoxelShader = false;
         _usePrimitiveRenderer = true;
-        clearAllNodesBufferIndex();
         inspectForOcclusions();
     } else {
         _usePrimitiveRenderer = false;
         clearAllNodesBufferIndex();
-        clearAllOcclusions();
     }
+    _writeRenderFullVBO = true;
+    _tree->setDirtyBit();
+    setupNewVoxelsForDrawing();
 }
 void VoxelSystem::showCulledSharedFaces() {
     }
     _tree->unlock();
     if (Menu::getInstance()->isOptionChecked(MenuOption::CullSharedFaces)) {
-        if (_renderer) {
-            _renderer->release();
-        }
         _writeRenderFullVBO = true;
         _tree->setDirtyBit();
         setupNewVoxelsForDrawing();
     }
 }
-void VoxelSystem::clearAllOcclusions() {
-    if (_inOcclusions) {
-        return;
-    }
-    _inOcclusions = true;
-    _nodeCount = 0;
-    bool showDebugDetails = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
-    PerformanceWarning warn(showDebugDetails, "clearAllOcclusions()");
-    _tree->lockForRead();
-    if (_renderer) {
-        _renderer->release();
-    }
-    _tree->recurseTreeWithOperation(clearAllOcclusionsOperation);
-    _tree->unlock();
-    if (showDebugDetails) {
-        qDebug("clearing all occlusions of %d nodes", _nodeCount);
-    }
-    _writeRenderFullVBO = true;
-    _tree->setDirtyBit();
-    setupNewVoxelsForDrawing();
-    _inOcclusions = false;
-}
 void VoxelSystem::inspectForOcclusions() {
     if (_inOcclusions) {
     PerformanceWarning warn(showDebugDetails, "inspectForOcclusions()");
     _tree->lockForRead();
-    if (_renderer) {
-        _renderer->release();
-    }
     _tree->recurseTreeWithPostOperation(inspectForExteriorOcclusionsOperation);
     _nodeCount = 0;
     _tree->recurseTreeWithOperation(inspectForInteriorOcclusionsOperation);
     if (showDebugDetails) {
         qDebug("inspecting all occlusions of %d nodes", _nodeCount);
     }
-    _writeRenderFullVBO = true;
-    _tree->setDirtyBit();
-    setupNewVoxelsForDrawing();
     _inOcclusions = false;
 }

Merged clearAllOcclusions into inspectOcclusions

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code