Showing the changes to interface/src/VoxelSystem.cpp (1 of 6 files). Show all
Unified · Split
| @@ -117,7 +117,6 @@ void VoxelSystem::elementDeleted(OctreeElement* element) { · 116 unmodified lines | |||
| 117 | VoxelTreeElement* voxel = (VoxelTreeElement*)element; | 117 | VoxelTreeElement* voxel = (VoxelTreeElement*)element; |
| 118 | if (voxel->getVoxelSystem() == this) { | 118 | if (voxel->getVoxelSystem() == this) { |
| 119 | if (_voxelsInWriteArrays != 0) { | 119 | if (_voxelsInWriteArrays != 0) { |
| 120 | qDebug() << "elementDeleted()... about to call forceRemoveNodeFromArrays()\n"; | ||
| 121 | forceRemoveNodeFromArrays(voxel); | 120 | forceRemoveNodeFromArrays(voxel); |
| 122 | } else { | 121 | } else { |
| 123 | if (Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings)) { | 122 | if (Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings)) { |
| @@ -706,6 +705,7 @@ void VoxelSystem::setupNewVoxelsForDrawing() { · 582 unmodified lines | |||
| 706 | bool extraDebugging = Application::getInstance()->getLogger()->extraDebugging(); | 705 | bool extraDebugging = Application::getInstance()->getLogger()->extraDebugging(); |
| 707 | if (extraDebugging) { | 706 | if (extraDebugging) { |
| 708 | qDebug("setupNewVoxelsForDrawing()... _voxelsUpdated=%lu...\n",_voxelsUpdated); | 707 | qDebug("setupNewVoxelsForDrawing()... _voxelsUpdated=%lu...\n",_voxelsUpdated); |
| 708 | _viewFrustum->printDebugDetails(); | ||
| 709 | } | 709 | } |
| 710 | } | 710 | } |
| 711 | 711 | ||
| @@ -2712,11 +2712,6 @@ void VoxelSystem::nodeKilled(Node* node) { · 2000 unmodified lines | |||
| 2712 | } | 2712 | } |
| 2713 | } | 2713 | } |
| 2714 | 2714 | ||
| 2715 | void VoxelSystem::domainChanged(QString domain) { | ||
| 2716 | killLocalVoxels(); | ||
| 2717 | } | ||
| 2718 | |||
| 2719 | |||
| 2720 | unsigned long VoxelSystem::getFreeMemoryGPU() { | 2715 | unsigned long VoxelSystem::getFreeMemoryGPU() { |
| 2721 | // We can't ask all GPUs how much memory they have in use, but we can ask them about how much is free. | 2716 | // We can't ask all GPUs how much memory they have in use, but we can ask them about how much is free. |
| 2722 | // So, we can record the free memory before we create our VBOs and the free memory after, and get a basic | 2717 | // So, we can record the free memory before we create our VBOs and the free memory after, and get a basic |
| @@ -2787,7 +2782,9 @@ void VoxelSystem::localVoxelCacheLoaded() { · 64 unmodified lines | |||
| 2787 | // Make sure that the application has properly set up the view frustum for our loaded state | 2782 | // Make sure that the application has properly set up the view frustum for our loaded state |
| 2788 | Application::getInstance()->initAvatarAndViewFrustum(); | 2783 | Application::getInstance()->initAvatarAndViewFrustum(); |
| 2789 | 2784 | ||
| 2790 | _tree->setDirtyBit(); | 2785 | _tree->setDirtyBit(); // make sure the tree thinks it's dirty |
| 2786 | _setupNewVoxelsForDrawingLastFinished = 0; // don't allow the setupNewVoxelsForDrawing() shortcuts | ||
| 2787 | _writeRenderFullVBO = true; // this will disable individual node updates, was reset by killLocalVoxels() | ||
| 2791 | setupNewVoxelsForDrawing(); | 2788 | setupNewVoxelsForDrawing(); |
| 2792 | _inhideOutOfView = false; // reenable hideOutOfView behavior | 2789 | _inhideOutOfView = false; // reenable hideOutOfView behavior |
| 2793 | } | 2790 | } |
| @@ -2796,6 +2793,8 @@ void VoxelSystem::beginLoadingLocalVoxelCache() { · 2 unmodified lines | |||
| 2796 | qDebug() << "beginLoadingLocalVoxelCache()\n"; | 2793 | qDebug() << "beginLoadingLocalVoxelCache()\n"; |
| 2797 | _writeRenderFullVBO = true; // this will disable individual node updates | 2794 | _writeRenderFullVBO = true; // this will disable individual node updates |
| 2798 | _inhideOutOfView = true; // this will disable hidOutOfView which we want to do until local cache is loaded | 2795 | _inhideOutOfView = true; // this will disable hidOutOfView which we want to do until local cache is loaded |
| 2796 | killLocalVoxels(); | ||
| 2797 | qDebug() << "DONE beginLoadingLocalVoxelCache()\n"; | ||
| 2799 | } | 2798 | } |
| 2800 | 2799 | ||
| 2801 | 2800 | ||