Showing the changes to interface/src/VoxelSystem.cpp (1 of 1 file). Show all
Unified · Split
| @@ -127,16 +127,9 @@ void VoxelSystem::setDisableFastVoxelPipeline(bool disableFastVoxelPipeline) { · 126 unmodified lines | |||
| 127 | 127 | ||
| 128 | void VoxelSystem::elementUpdated(OctreeElement* element) { | 128 | void VoxelSystem::elementUpdated(OctreeElement* element) { |
| 129 | VoxelTreeElement* voxel = (VoxelTreeElement*)element; | 129 | VoxelTreeElement* voxel = (VoxelTreeElement*)element; |
| 130 | //qDebug() << "VoxelSystem::elementUpdated()..."; | ||
| 131 | 130 | ||
| 132 | // If we're in SetupNewVoxelsForDrawing() or _writeRenderFullVBO then bail.. | 131 | // If we're in SetupNewVoxelsForDrawing() or _writeRenderFullVBO then bail.. |
| 133 | if (!_useFastVoxelPipeline || _inSetupNewVoxelsForDrawing || _writeRenderFullVBO) { | 132 | if (!_useFastVoxelPipeline || _inSetupNewVoxelsForDrawing || _writeRenderFullVBO) { |
| 134 | /* | ||
| 135 | qDebug() << "VoxelSystem::elementUpdated()... BAILING!!! " | ||
| 136 | << "_writeRenderFullVBO="<< _writeRenderFullVBO | ||
| 137 | << "_inSetupNewVoxelsForDrawing="<< _inSetupNewVoxelsForDrawing | ||
| 138 | << "_useFastVoxelPipeline="<< _useFastVoxelPipeline; | ||
| 139 | */ | ||
| 140 | return; | 133 | return; |
| 141 | } | 134 | } |
| 142 | 135 | ||
| @@ -147,8 +140,6 @@ qDebug() << "VoxelSystem::elementUpdated()... BAILING!!! " · 4 unmodified lines | |||
| 147 | int boundaryLevelAdjust = Menu::getInstance()->getBoundaryLevelAdjust(); | 140 | int boundaryLevelAdjust = Menu::getInstance()->getBoundaryLevelAdjust(); |
| 148 | shouldRender = voxel->calculateShouldRender(_viewFrustum, voxelSizeScale, boundaryLevelAdjust); | 141 | shouldRender = voxel->calculateShouldRender(_viewFrustum, voxelSizeScale, boundaryLevelAdjust); |
| 149 | 142 | ||
| 150 | //qDebug() << "VoxelSystem::elementUpdated()... recalcing should render!!"; | ||
| 151 | |||
| 152 | if (voxel->getShouldRender() != shouldRender) { | 143 | if (voxel->getShouldRender() != shouldRender) { |
| 153 | voxel->setShouldRender(shouldRender); | 144 | voxel->setShouldRender(shouldRender); |
| 154 | } | 145 | } |
| @@ -176,13 +167,11 @@ qDebug() << "VoxelSystem::elementUpdated()... BAILING!!! " · 21 unmodified lines | |||
| 176 | 167 | ||
| 177 | const bool REUSE_INDEX = true; | 168 | const bool REUSE_INDEX = true; |
| 178 | const bool DONT_FORCE_REDRAW = false; | 169 | const bool DONT_FORCE_REDRAW = false; |
| 179 | //qDebug() << "VoxelSystem::elementUpdated()... calling updateNodeInArrays()!!!"; | ||
| 180 | updateNodeInArrays(voxel, REUSE_INDEX, DONT_FORCE_REDRAW); | 170 | updateNodeInArrays(voxel, REUSE_INDEX, DONT_FORCE_REDRAW); |
| 181 | _voxelsUpdated++; | 171 | _voxelsUpdated++; |
| 182 | 172 | ||
| 183 | voxel->clearDirtyBit(); // clear the dirty bit, do this before we potentially delete things. | 173 | voxel->clearDirtyBit(); // clear the dirty bit, do this before we potentially delete things. |
| 184 | 174 | ||
| 185 | //qDebug() << "VoxelSystem::elementUpdated()... calling setupNewVoxelsForDrawingSingleNode()!!!"; | ||
| 186 | setupNewVoxelsForDrawingSingleNode(); | 175 | setupNewVoxelsForDrawingSingleNode(); |
| 187 | } | 176 | } |
| 188 | } | 177 | } |