Showing the changes to interface/src/VoxelSystem.cpp (1 of 72 files). Show all
Unified · Split
| @@ -204,7 +204,7 @@ glBufferIndex VoxelSystem::getNextBufferIndex() { · 203 unmodified lines | |||
| 204 | // will be "invisible" | 204 | // will be "invisible" |
| 205 | void VoxelSystem::freeBufferIndex(glBufferIndex index) { | 205 | void VoxelSystem::freeBufferIndex(glBufferIndex index) { |
| 206 | if (_voxelsInWriteArrays == 0) { | 206 | if (_voxelsInWriteArrays == 0) { |
| 207 | qDebug() << "freeBufferIndex() called when _voxelsInWriteArrays == 0!!!!\n"; | 207 | qDebug() << "freeBufferIndex() called when _voxelsInWriteArrays == 0!"; |
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | // if the "freed" index was our max index, then just drop the _voxelsInWriteArrays down one... | 210 | // if the "freed" index was our max index, then just drop the _voxelsInWriteArrays down one... |
| @@ -214,7 +214,7 @@ void VoxelSystem::freeBufferIndex(glBufferIndex index) { · 3 unmodified lines | |||
| 214 | if (Menu::getInstance()->isOptionChecked(MenuOption::AutomaticallyAuditTree)) { | 214 | if (Menu::getInstance()->isOptionChecked(MenuOption::AutomaticallyAuditTree)) { |
| 215 | for (long i = 0; i < _freeIndexes.size(); i++) { | 215 | for (long i = 0; i < _freeIndexes.size(); i++) { |
| 216 | if (_freeIndexes[i] == index) { | 216 | if (_freeIndexes[i] == index) { |
| 217 | printf("freeBufferIndex(glBufferIndex index)... index=%ld already in free list!\n", index); | 217 | printf("freeBufferIndex(glBufferIndex index)... index=%ld already in free list!", index); |
| 218 | inList = true; | 218 | inList = true; |
| 219 | break; | 219 | break; |
| 220 | } | 220 | } |
| @@ -615,7 +615,7 @@ int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) { · 394 unmodified lines | |||
| 615 | if (Application::getInstance()->getLogger()->extraDebugging()) { | 615 | if (Application::getInstance()->getLogger()->extraDebugging()) { |
| 616 | qDebug("VoxelSystem::parseData() ... Got Packet Section" | 616 | qDebug("VoxelSystem::parseData() ... Got Packet Section" |
| 617 | " color:%s compressed:%s sequence: %u flight:%d usec size:%d data:%d" | 617 | " color:%s compressed:%s sequence: %u flight:%d usec size:%d data:%d" |
| 618 | " subsection:%d sectionLength:%d uncompressed:%d\n", | 618 | " subsection:%d sectionLength:%d uncompressed:%d", |
| 619 | debug::valueOf(packetIsColored), debug::valueOf(packetIsCompressed), | 619 | debug::valueOf(packetIsColored), debug::valueOf(packetIsCompressed), |
| 620 | sequence, flightTime, numBytes, dataBytes, subsection, sectionLength, packetData.getUncompressedSize()); | 620 | sequence, flightTime, numBytes, dataBytes, subsection, sectionLength, packetData.getUncompressedSize()); |
| 621 | } | 621 | } |
| @@ -704,7 +704,7 @@ void VoxelSystem::setupNewVoxelsForDrawing() { · 82 unmodified lines | |||
| 704 | 704 | ||
| 705 | bool extraDebugging = Application::getInstance()->getLogger()->extraDebugging(); | 705 | bool extraDebugging = Application::getInstance()->getLogger()->extraDebugging(); |
| 706 | if (extraDebugging) { | 706 | if (extraDebugging) { |
| 707 | qDebug("setupNewVoxelsForDrawing()... _voxelsUpdated=%lu...\n",_voxelsUpdated); | 707 | qDebug("setupNewVoxelsForDrawing()... _voxelsUpdated=%lu...",_voxelsUpdated); |
| 708 | _viewFrustum->printDebugDetails(); | 708 | _viewFrustum->printDebugDetails(); |
| 709 | } | 709 | } |
| 710 | } | 710 | } |
| @@ -801,7 +801,7 @@ void VoxelSystem::cleanupRemovedVoxels() { · 90 unmodified lines | |||
| 801 | // This handles cleanup of voxels that were culled as part of our regular out of view culling operation | 801 | // This handles cleanup of voxels that were culled as part of our regular out of view culling operation |
| 802 | if (!_removedVoxels.isEmpty()) { | 802 | if (!_removedVoxels.isEmpty()) { |
| 803 | if (Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings)) { | 803 | if (Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings)) { |
| 804 | qDebug() << "cleanupRemovedVoxels().. _removedVoxels=" << _removedVoxels.count() << "\n"; | 804 | qDebug() << "cleanupRemovedVoxels().. _removedVoxels=" << _removedVoxels.count(); |
| 805 | } | 805 | } |
| 806 | while (!_removedVoxels.isEmpty()) { | 806 | while (!_removedVoxels.isEmpty()) { |
| 807 | delete _removedVoxels.extract(); | 807 | delete _removedVoxels.extract(); |
| @@ -815,7 +815,7 @@ void VoxelSystem::cleanupRemovedVoxels() { · 7 unmodified lines | |||
| 815 | if (!_writeRenderFullVBO && (_abandonedVBOSlots > (_voxelsInWriteArrays * TOO_MANY_ABANDONED_RATIO))) { | 815 | if (!_writeRenderFullVBO && (_abandonedVBOSlots > (_voxelsInWriteArrays * TOO_MANY_ABANDONED_RATIO))) { |
| 816 | if (Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings)) { | 816 | if (Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings)) { |
| 817 | qDebug() << "cleanupRemovedVoxels().. _abandonedVBOSlots [" | 817 | qDebug() << "cleanupRemovedVoxels().. _abandonedVBOSlots [" |
| 818 | << _abandonedVBOSlots << "] > TOO_MANY_ABANDONED_RATIO \n"; | 818 | << _abandonedVBOSlots << "] > TOO_MANY_ABANDONED_RATIO"; |
| 819 | } | 819 | } |
| 820 | _writeRenderFullVBO = true; | 820 | _writeRenderFullVBO = true; |
| 821 | } | 821 | } |
| @@ -982,7 +982,7 @@ int VoxelSystem::updateNodeInArrays(VoxelTreeElement* node, bool reuseIndex, boo · 160 unmodified lines | |||
| 982 | // possibly shifting down to lower LOD or something. This debug message is to help identify, if/when/how this | 982 | // possibly shifting down to lower LOD or something. This debug message is to help identify, if/when/how this |
| 983 | // state actually occurs. | 983 | // state actually occurs. |
| 984 | if (Application::getInstance()->getLogger()->extraDebugging()) { | 984 | if (Application::getInstance()->getLogger()->extraDebugging()) { |
| 985 | qDebug("OHHHH NOOOOOO!!!! updateNodeInArrays() BAILING (_voxelsInWriteArrays >= _maxVoxels)\n"); | 985 | qDebug("OH NO! updateNodeInArrays() BAILING (_voxelsInWriteArrays >= _maxVoxels)"); |
| 986 | } | 986 | } |
| 987 | return 0; | 987 | return 0; |
| 988 | } | 988 | } |
| @@ -1062,7 +1062,7 @@ ProgramObject VoxelSystem::_shadowMapProgram; · 73 unmodified lines | |||
| 1062 | 1062 | ||
| 1063 | void VoxelSystem::init() { | 1063 | void VoxelSystem::init() { |
| 1064 | if (_initialized) { | 1064 | if (_initialized) { |
| 1065 | qDebug("[ERROR] VoxelSystem is already initialized.\n"); | 1065 | qDebug("[ERROR] VoxelSystem is already initialized."); |
| 1066 | return; | 1066 | return; |
| 1067 | } | 1067 | } |
| 1068 | 1068 | ||
| @@ -1436,7 +1436,7 @@ void VoxelSystem::clearAllNodesBufferIndex() { · 367 unmodified lines | |||
| 1436 | _tree->recurseTreeWithOperation(clearAllNodesBufferIndexOperation); | 1436 | _tree->recurseTreeWithOperation(clearAllNodesBufferIndexOperation); |
| 1437 | unlockTree(); | 1437 | unlockTree(); |
| 1438 | if (Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings)) { | 1438 | if (Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings)) { |
| 1439 | qDebug("clearing buffer index of %d nodes\n", _nodeCount); | 1439 | qDebug("clearing buffer index of %d nodes", _nodeCount); |
| 1440 | } | 1440 | } |
| 1441 | } | 1441 | } |
| 1442 | 1442 | ||
| @@ -1449,7 +1449,7 @@ bool VoxelSystem::forceRedrawEntireTreeOperation(OctreeElement* element, void* e · 6 unmodified lines | |||
| 1449 | void VoxelSystem::forceRedrawEntireTree() { | 1449 | void VoxelSystem::forceRedrawEntireTree() { |
| 1450 | _nodeCount = 0; | 1450 | _nodeCount = 0; |
| 1451 | _tree->recurseTreeWithOperation(forceRedrawEntireTreeOperation); | 1451 | _tree->recurseTreeWithOperation(forceRedrawEntireTreeOperation); |
| 1452 | qDebug("forcing redraw of %d nodes\n", _nodeCount); | 1452 | qDebug("forcing redraw of %d nodes", _nodeCount); |
| 1453 | _tree->setDirtyBit(); | 1453 | _tree->setDirtyBit(); |
| 1454 | setupNewVoxelsForDrawing(); | 1454 | setupNewVoxelsForDrawing(); |
| 1455 | } | 1455 | } |
| @@ -1467,7 +1467,7 @@ bool VoxelSystem::randomColorOperation(OctreeElement* element, void* extraData) · 11 unmodified lines | |||
| 1467 | void VoxelSystem::randomizeVoxelColors() { | 1467 | void VoxelSystem::randomizeVoxelColors() { |
| 1468 | _nodeCount = 0; | 1468 | _nodeCount = 0; |
| 1469 | _tree->recurseTreeWithOperation(randomColorOperation); | 1469 | _tree->recurseTreeWithOperation(randomColorOperation); |
| 1470 | qDebug("setting randomized true color for %d nodes\n", _nodeCount); | 1470 | qDebug("setting randomized true color for %d nodes", _nodeCount); |
| 1471 | _tree->setDirtyBit(); | 1471 | _tree->setDirtyBit(); |
| 1472 | setupNewVoxelsForDrawing(); | 1472 | setupNewVoxelsForDrawing(); |
| 1473 | } | 1473 | } |
| @@ -1483,7 +1483,7 @@ bool VoxelSystem::falseColorizeRandomOperation(OctreeElement* element, void* ext · 9 unmodified lines | |||
| 1483 | void VoxelSystem::falseColorizeRandom() { | 1483 | void VoxelSystem::falseColorizeRandom() { |
| 1484 | _nodeCount = 0; | 1484 | _nodeCount = 0; |
| 1485 | _tree->recurseTreeWithOperation(falseColorizeRandomOperation); | 1485 | _tree->recurseTreeWithOperation(falseColorizeRandomOperation); |
| 1486 | qDebug("setting randomized false color for %d nodes\n", _nodeCount); | 1486 | qDebug("setting randomized false color for %d nodes", _nodeCount); |
| 1487 | _tree->setDirtyBit(); | 1487 | _tree->setDirtyBit(); |
| 1488 | setupNewVoxelsForDrawing(); | 1488 | setupNewVoxelsForDrawing(); |
| 1489 | } | 1489 | } |
| @@ -1499,7 +1499,7 @@ void VoxelSystem::trueColorize() { · 9 unmodified lines | |||
| 1499 | PerformanceWarning warn(true, "trueColorize()",true); | 1499 | PerformanceWarning warn(true, "trueColorize()",true); |
| 1500 | _nodeCount = 0; | 1500 | _nodeCount = 0; |
| 1501 | _tree->recurseTreeWithOperation(trueColorizeOperation); | 1501 | _tree->recurseTreeWithOperation(trueColorizeOperation); |
| 1502 | qDebug("setting true color for %d nodes\n", _nodeCount); | 1502 | qDebug("setting true color for %d nodes", _nodeCount); |
| 1503 | _tree->setDirtyBit(); | 1503 | _tree->setDirtyBit(); |
| 1504 | setupNewVoxelsForDrawing(); | 1504 | setupNewVoxelsForDrawing(); |
| 1505 | } | 1505 | } |
| @@ -1521,7 +1521,7 @@ bool VoxelSystem::falseColorizeInViewOperation(OctreeElement* element, void* ext · 15 unmodified lines | |||
| 1521 | void VoxelSystem::falseColorizeInView() { | 1521 | void VoxelSystem::falseColorizeInView() { |
| 1522 | _nodeCount = 0; | 1522 | _nodeCount = 0; |
| 1523 | _tree->recurseTreeWithOperation(falseColorizeInViewOperation,(void*)_viewFrustum); | 1523 | _tree->recurseTreeWithOperation(falseColorizeInViewOperation,(void*)_viewFrustum); |
| 1524 | qDebug("setting in view false color for %d nodes\n", _nodeCount); | 1524 | qDebug("setting in view false color for %d nodes", _nodeCount); |
| 1525 | _tree->setDirtyBit(); | 1525 | _tree->setDirtyBit(); |
| 1526 | setupNewVoxelsForDrawing(); | 1526 | setupNewVoxelsForDrawing(); |
| 1527 | } | 1527 | } |
| @@ -1626,7 +1626,7 @@ void VoxelSystem::falseColorizeBySource() { · 98 unmodified lines | |||
| 1626 | } | 1626 | } |
| 1627 | 1627 | ||
| 1628 | _tree->recurseTreeWithOperation(falseColorizeBySourceOperation, &args); | 1628 | _tree->recurseTreeWithOperation(falseColorizeBySourceOperation, &args); |
| 1629 | qDebug("setting false color by source for %d nodes\n", _nodeCount); | 1629 | qDebug("setting false color by source for %d nodes", _nodeCount); |
| 1630 | _tree->setDirtyBit(); | 1630 | _tree->setDirtyBit(); |
| 1631 | setupNewVoxelsForDrawing(); | 1631 | setupNewVoxelsForDrawing(); |
| 1632 | } | 1632 | } |
| @@ -1679,10 +1679,10 @@ void VoxelSystem::falseColorizeDistanceFromView() { · 46 unmodified lines | |||
| 1679 | _maxDistance = 0.0; | 1679 | _maxDistance = 0.0; |
| 1680 | _minDistance = FLT_MAX; | 1680 | _minDistance = FLT_MAX; |
| 1681 | _tree->recurseTreeWithOperation(getDistanceFromViewRangeOperation, (void*) _viewFrustum); | 1681 | _tree->recurseTreeWithOperation(getDistanceFromViewRangeOperation, (void*) _viewFrustum); |
| 1682 | qDebug("determining distance range for %d nodes\n", _nodeCount); | 1682 | qDebug("determining distance range for %d nodes", _nodeCount); |
| 1683 | _nodeCount = 0; | 1683 | _nodeCount = 0; |
| 1684 | _tree->recurseTreeWithOperation(falseColorizeDistanceFromViewOperation, (void*) _viewFrustum); | 1684 | _tree->recurseTreeWithOperation(falseColorizeDistanceFromViewOperation, (void*) _viewFrustum); |
| 1685 | qDebug("setting in distance false color for %d nodes\n", _nodeCount); | 1685 | qDebug("setting in distance false color for %d nodes", _nodeCount); |
| 1686 | _tree->setDirtyBit(); | 1686 | _tree->setDirtyBit(); |
| 1687 | setupNewVoxelsForDrawing(); | 1687 | setupNewVoxelsForDrawing(); |
| 1688 | } | 1688 | } |
| @@ -1813,7 +1813,7 @@ void VoxelSystem::removeOutOfView() { · 124 unmodified lines | |||
| 1813 | } | 1813 | } |
| 1814 | bool showRemoveDebugDetails = false; | 1814 | bool showRemoveDebugDetails = false; |
| 1815 | if (showRemoveDebugDetails) { | 1815 | if (showRemoveDebugDetails) { |
| 1816 | qDebug("removeOutOfView() scanned=%ld removed=%ld inside=%ld intersect=%ld outside=%ld _removedVoxels.count()=%d \n", | 1816 | qDebug("removeOutOfView() scanned=%ld removed=%ld inside=%ld intersect=%ld outside=%ld _removedVoxels.count()=%d", |
| 1817 | args.nodesScanned, args.nodesRemoved, args.nodesInside, | 1817 | args.nodesScanned, args.nodesRemoved, args.nodesInside, |
| 1818 | args.nodesIntersect, args.nodesOutside, _removedVoxels.count() | 1818 | args.nodesIntersect, args.nodesOutside, _removedVoxels.count() |
| 1819 | ); | 1819 | ); |
| @@ -1842,7 +1842,7 @@ void VoxelSystem::showAllLocalVoxels() { · 22 unmodified lines | |||
| 1842 | 1842 | ||
| 1843 | bool showRemoveDebugDetails = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); | 1843 | bool showRemoveDebugDetails = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); |
| 1844 | if (showRemoveDebugDetails) { | 1844 | if (showRemoveDebugDetails) { |
| 1845 | qDebug("showAllLocalVoxels() scanned=%ld \n",args.nodesScanned ); | 1845 | qDebug("showAllLocalVoxels() scanned=%ld",args.nodesScanned ); |
| 1846 | } | 1846 | } |
| 1847 | } | 1847 | } |
| 1848 | 1848 | ||
| @@ -1979,15 +1979,15 @@ void VoxelSystem::hideOutOfView(bool forceFullFrustum) { · 130 unmodified lines | |||
| 1979 | 1979 | ||
| 1980 | bool extraDebugDetails = false; // Application::getInstance()->getLogger()->extraDebugging(); | 1980 | bool extraDebugDetails = false; // Application::getInstance()->getLogger()->extraDebugging(); |
| 1981 | if (extraDebugDetails) { | 1981 | if (extraDebugDetails) { |
| 1982 | qDebug("hideOutOfView() scanned=%ld removed=%ld show=%ld inside=%ld intersect=%ld outside=%ld\n", | 1982 | qDebug("hideOutOfView() scanned=%ld removed=%ld show=%ld inside=%ld intersect=%ld outside=%ld", |
| 1983 | args.nodesScanned, args.nodesRemoved, args.nodesShown, args.nodesInside, | 1983 | args.nodesScanned, args.nodesRemoved, args.nodesShown, args.nodesInside, |
| 1984 | args.nodesIntersect, args.nodesOutside | 1984 | args.nodesIntersect, args.nodesOutside |
| 1985 | ); | 1985 | ); |
| 1986 | qDebug(" inside/inside=%ld intersect/inside=%ld outside/outside=%ld\n", | 1986 | qDebug("inside/inside=%ld intersect/inside=%ld outside/outside=%ld", |
| 1987 | args.nodesInsideInside, args.nodesIntersectInside, args.nodesOutsideOutside | 1987 | args.nodesInsideInside, args.nodesIntersectInside, args.nodesOutsideOutside |
| 1988 | ); | 1988 | ); |
| 1989 | 1989 | ||
| 1990 | qDebug() << "args.thisViewFrustum....\n"; | 1990 | qDebug() << "args.thisViewFrustum...."; |
| 1991 | args.thisViewFrustum.printDebugDetails(); | 1991 | args.thisViewFrustum.printDebugDetails(); |
| 1992 | } | 1992 | } |
| 1993 | _inhideOutOfView = false; | 1993 | _inhideOutOfView = false; |
| @@ -2224,7 +2224,7 @@ bool VoxelSystem::falseColorizeRandomEveryOtherOperation(OctreeElement* element, · 230 unmodified lines | |||
| 2224 | void VoxelSystem::falseColorizeRandomEveryOther() { | 2224 | void VoxelSystem::falseColorizeRandomEveryOther() { |
| 2225 | falseColorizeRandomEveryOtherArgs args; | 2225 | falseColorizeRandomEveryOtherArgs args; |
| 2226 | _tree->recurseTreeWithOperation(falseColorizeRandomEveryOtherOperation,&args); | 2226 | _tree->recurseTreeWithOperation(falseColorizeRandomEveryOtherOperation,&args); |
| 2227 | qDebug("randomized false color for every other node: total %ld, colorable %ld, colored %ld\n", | 2227 | qDebug("randomized false color for every other node: total %ld, colorable %ld, colored %ld", |
| 2228 | args.totalNodes, args.colorableNodes, args.coloredNodes); | 2228 | args.totalNodes, args.colorableNodes, args.coloredNodes); |
| 2229 | _tree->setDirtyBit(); | 2229 | _tree->setDirtyBit(); |
| 2230 | setupNewVoxelsForDrawing(); | 2230 | setupNewVoxelsForDrawing(); |
| @@ -2294,14 +2294,14 @@ bool VoxelSystem::collectStatsForTreesAndVBOsOperation(OctreeElement* element, v · 63 unmodified lines | |||
| 2294 | 2294 | ||
| 2295 | const bool extraDebugging = false; // enable for extra debugging | 2295 | const bool extraDebugging = false; // enable for extra debugging |
| 2296 | if (extraDebugging) { | 2296 | if (extraDebugging) { |
| 2297 | qDebug("node In VBO... [%f,%f,%f] %f ... index=%ld, isDirty=%s, shouldRender=%s \n", | 2297 | qDebug("node In VBO... [%f,%f,%f] %f ... index=%ld, isDirty=%s, shouldRender=%s", |
| 2298 | voxel->getCorner().x, voxel->getCorner().y, voxel->getCorner().z, voxel->getScale(), | 2298 | voxel->getCorner().x, voxel->getCorner().y, voxel->getCorner().z, voxel->getScale(), |
| 2299 | nodeIndex, debug::valueOf(voxel->isDirty()), debug::valueOf(voxel->getShouldRender())); | 2299 | nodeIndex, debug::valueOf(voxel->isDirty()), debug::valueOf(voxel->getShouldRender())); |
| 2300 | } | 2300 | } |
| 2301 | 2301 | ||
| 2302 | if (args->hasIndexFound[nodeIndex]) { | 2302 | if (args->hasIndexFound[nodeIndex]) { |
| 2303 | args->duplicateVBOIndex++; | 2303 | args->duplicateVBOIndex++; |
| 2304 | qDebug("duplicateVBO found... index=%ld, isDirty=%s, shouldRender=%s \n", nodeIndex, | 2304 | qDebug("duplicateVBO found... index=%ld, isDirty=%s, shouldRender=%s", nodeIndex, |
| 2305 | debug::valueOf(voxel->isDirty()), debug::valueOf(voxel->getShouldRender())); | 2305 | debug::valueOf(voxel->isDirty()), debug::valueOf(voxel->getShouldRender())); |
| 2306 | } else { | 2306 | } else { |
| 2307 | args->hasIndexFound[nodeIndex] = true; | 2307 | args->hasIndexFound[nodeIndex] = true; |
| @@ -2335,17 +2335,17 @@ void VoxelSystem::collectStatsForTreesAndVBOs() { · 27 unmodified lines | |||
| 2335 | collectStatsForTreesAndVBOsArgs args(_maxVoxels); | 2335 | collectStatsForTreesAndVBOsArgs args(_maxVoxels); |
| 2336 | args.expectedMax = _voxelsInWriteArrays; | 2336 | args.expectedMax = _voxelsInWriteArrays; |
| 2337 | 2337 | ||
| 2338 | qDebug("CALCULATING Local Voxel Tree Statistics >>>>>>>>>>>>\n"); | 2338 | qDebug("CALCULATING Local Voxel Tree Statistics >>>>>>>>>>>>"); |
| 2339 | 2339 | ||
| 2340 | _tree->recurseTreeWithOperation(collectStatsForTreesAndVBOsOperation,&args); | 2340 | _tree->recurseTreeWithOperation(collectStatsForTreesAndVBOsOperation,&args); |
| 2341 | 2341 | ||
| 2342 | qDebug("Local Voxel Tree Statistics:\n total nodes %ld \n leaves %ld \n dirty %ld \n colored %ld \n shouldRender %ld \n", | 2342 | qDebug("Local Voxel Tree Statistics:\n total nodes %ld \n leaves %ld \n dirty %ld \n colored %ld \n shouldRender %ld", |
| 2343 | args.totalNodes, args.leafNodes, args.dirtyNodes, args.coloredNodes, args.shouldRenderNodes); | 2343 | args.totalNodes, args.leafNodes, args.dirtyNodes, args.coloredNodes, args.shouldRenderNodes); |
| 2344 | 2344 | ||
| 2345 | qDebug(" _voxelsDirty=%s \n _voxelsInWriteArrays=%ld \n minDirty=%ld \n maxDirty=%ld \n", debug::valueOf(_voxelsDirty), | 2345 | qDebug(" _voxelsDirty=%s \n _voxelsInWriteArrays=%ld \n minDirty=%ld \n maxDirty=%ld", debug::valueOf(_voxelsDirty), |
| 2346 | _voxelsInWriteArrays, minDirty, maxDirty); | 2346 | _voxelsInWriteArrays, minDirty, maxDirty); |
| 2347 | 2347 | ||
| 2348 | qDebug(" inVBO %ld \n nodesInVBOOverExpectedMax %ld \n duplicateVBOIndex %ld \n nodesInVBONotShouldRender %ld \n", | 2348 | qDebug(" inVBO %ld \n nodesInVBOOverExpectedMax %ld \n duplicateVBOIndex %ld \n nodesInVBONotShouldRender %ld", |
| 2349 | args.nodesInVBO, args.nodesInVBOOverExpectedMax, args.duplicateVBOIndex, args.nodesInVBONotShouldRender); | 2349 | args.nodesInVBO, args.nodesInVBOOverExpectedMax, args.duplicateVBOIndex, args.nodesInVBONotShouldRender); |
| 2350 | 2350 | ||
| 2351 | glBufferIndex minInVBO = GLBUFFER_INDEX_UNKNOWN; | 2351 | glBufferIndex minInVBO = GLBUFFER_INDEX_UNKNOWN; |
| @@ -2358,13 +2358,13 @@ void VoxelSystem::collectStatsForTreesAndVBOs() { · 6 unmodified lines | |||
| 2358 | } | 2358 | } |
| 2359 | } | 2359 | } |
| 2360 | 2360 | ||
| 2361 | qDebug(" minInVBO=%ld \n maxInVBO=%ld \n _voxelsInWriteArrays=%ld \n _voxelsInReadArrays=%ld \n", | 2361 | qDebug(" minInVBO=%ld \n maxInVBO=%ld \n _voxelsInWriteArrays=%ld \n _voxelsInReadArrays=%ld", |
| 2362 | minInVBO, maxInVBO, _voxelsInWriteArrays, _voxelsInReadArrays); | 2362 | minInVBO, maxInVBO, _voxelsInWriteArrays, _voxelsInReadArrays); |
| 2363 | 2363 | ||
| 2364 | qDebug(" _freeIndexes.size()=%ld \n", | 2364 | qDebug(" _freeIndexes.size()=%ld", |
| 2365 | _freeIndexes.size()); | 2365 | _freeIndexes.size()); |
| 2366 | 2366 | ||
| 2367 | qDebug("DONE WITH Local Voxel Tree Statistics >>>>>>>>>>>>\n"); | 2367 | qDebug("DONE WITH Local Voxel Tree Statistics >>>>>>>>>>>>"); |
| 2368 | } | 2368 | } |
| 2369 | 2369 | ||
| 2370 | 2370 | ||
| @@ -2550,7 +2550,7 @@ void VoxelSystem::falseColorizeOccluded() { · 179 unmodified lines | |||
| 2550 | 2550 | ||
| 2551 | _tree->recurseTreeWithOperationDistanceSorted(falseColorizeOccludedOperation, position, (void*)&args); | 2551 | _tree->recurseTreeWithOperationDistanceSorted(falseColorizeOccludedOperation, position, (void*)&args); |
| 2552 | 2552 | ||
| 2553 | qDebug("falseColorizeOccluded()\n position=(%f,%f)\n total=%ld\n colored=%ld\n occluded=%ld\n notOccluded=%ld\n outOfView=%ld\n subtreeVoxelsSkipped=%ld\n nonLeaves=%ld\n nonLeavesOutOfView=%ld\n nonLeavesOccluded=%ld\n pointInside_calls=%ld\n occludes_calls=%ld\n intersects_calls=%ld\n", | 2553 | qDebug("falseColorizeOccluded()\n position=(%f,%f)\n total=%ld\n colored=%ld\n occluded=%ld\n notOccluded=%ld\n outOfView=%ld\n subtreeVoxelsSkipped=%ld\n nonLeaves=%ld\n nonLeavesOutOfView=%ld\n nonLeavesOccluded=%ld\n pointInside_calls=%ld\n occludes_calls=%ld\n intersects_calls=%ld", |
| 2554 | position.x, position.y, | 2554 | position.x, position.y, |
| 2555 | args.totalVoxels, args.coloredVoxels, args.occludedVoxels, | 2555 | args.totalVoxels, args.coloredVoxels, args.occludedVoxels, |
| 2556 | args.notOccludedVoxels, args.outOfView, args.subtreeVoxelsSkipped, | 2556 | args.notOccludedVoxels, args.outOfView, args.subtreeVoxelsSkipped, |
| @@ -2685,7 +2685,7 @@ void VoxelSystem::falseColorizeOccludedV2() { · 128 unmodified lines | |||
| 2685 | 2685 | ||
| 2686 | void VoxelSystem::nodeAdded(Node* node) { | 2686 | void VoxelSystem::nodeAdded(Node* node) { |
| 2687 | if (node->getType() == NODE_TYPE_VOXEL_SERVER) { | 2687 | if (node->getType() == NODE_TYPE_VOXEL_SERVER) { |
| 2688 | qDebug("VoxelSystem... voxel server %s added...\n", node->getUUID().toString().toLocal8Bit().constData()); | 2688 | qDebug("VoxelSystem... voxel server %s added...", node->getUUID().toString().toLocal8Bit().constData()); |
| 2689 | _voxelServerCount++; | 2689 | _voxelServerCount++; |
| 2690 | } | 2690 | } |
| 2691 | } | 2691 | } |
| @@ -2708,7 +2708,7 @@ void VoxelSystem::nodeKilled(Node* node) { · 16 unmodified lines | |||
| 2708 | if (node->getType() == NODE_TYPE_VOXEL_SERVER) { | 2708 | if (node->getType() == NODE_TYPE_VOXEL_SERVER) { |
| 2709 | _voxelServerCount--; | 2709 | _voxelServerCount--; |
| 2710 | QUuid nodeUUID = node->getUUID(); | 2710 | QUuid nodeUUID = node->getUUID(); |
| 2711 | qDebug("VoxelSystem... voxel server %s removed...\n", nodeUUID.toString().toLocal8Bit().constData()); | 2711 | qDebug("VoxelSystem... voxel server %s removed...", nodeUUID.toString().toLocal8Bit().constData()); |
| 2712 | } | 2712 | } |
| 2713 | } | 2713 | } |
| 2714 | 2714 | ||
| @@ -2777,7 +2777,7 @@ void VoxelSystem::unlockTree() { · 62 unmodified lines | |||
| 2777 | 2777 | ||
| 2778 | 2778 | ||
| 2779 | void VoxelSystem::localVoxelCacheLoaded() { | 2779 | void VoxelSystem::localVoxelCacheLoaded() { |
| 2780 | qDebug() << "localVoxelCacheLoaded()\n"; | 2780 | qDebug() << "localVoxelCacheLoaded()"; |
| 2781 | 2781 | ||
| 2782 | // 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 |
| 2783 | Application::getInstance()->initAvatarAndViewFrustum(); | 2783 | Application::getInstance()->initAvatarAndViewFrustum(); |
| @@ -2790,11 +2790,11 @@ void VoxelSystem::localVoxelCacheLoaded() { · 6 unmodified lines | |||
| 2790 | } | 2790 | } |
| 2791 | 2791 | ||
| 2792 | void VoxelSystem::beginLoadingLocalVoxelCache() { | 2792 | void VoxelSystem::beginLoadingLocalVoxelCache() { |
| 2793 | qDebug() << "beginLoadingLocalVoxelCache()\n"; | 2793 | qDebug() << "beginLoadingLocalVoxelCache()"; |
| 2794 | _writeRenderFullVBO = true; // this will disable individual node updates | 2794 | _writeRenderFullVBO = true; // this will disable individual node updates |
| 2795 | _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(); | 2796 | killLocalVoxels(); |
| 2797 | qDebug() << "DONE beginLoadingLocalVoxelCache()\n"; | 2797 | qDebug() << "DONE beginLoadingLocalVoxelCache()"; |
| 2798 | } | 2798 | } |
| 2799 | 2799 | ||
| 2800 | 2800 | ||