Showing the changes to interface/src/VoxelSystem.cpp (1 of 3 files). Show all
Unified · Split
| @@ -1090,13 +1090,13 @@ void VoxelSystem::collectStatsForTreesAndVBOs() { · 1089 unmodified lines | ||
| 1090 | 1090 | args.expectedMax = _voxelsInWriteArrays; |
| 1091 | 1091 | _tree->recurseTreeWithOperation(collectStatsForTreesAndVBOsOperation,&args); |
| 1092 | 1092 | |
| 1093 | − printLog("_voxelsDirty=%s _voxelsInWriteArrays=%ld minDirty=%ld maxDirty=%ld \n", debug::valueOf(_voxelsDirty), | |
| 1094 | − _voxelsInWriteArrays, minDirty, maxDirty); | |
| 1095 | − | |
| 1096 | − printLog("stats: total %ld, leaves %ld, dirty %ld, colored %ld, shouldRender %ld, inVBO %ld\n", | |
| 1093 | + printLog("Local Voxel Tree Statistics:\n total nodes %ld \n leaves %ld \n dirty %ld \n colored %ld \n shouldRender %ld \n", | |
| 1097 | 1094 | args.totalNodes, args.leafNodes, args.dirtyNodes, args.coloredNodes, args.shouldRenderNodes); |
| 1098 | 1095 | |
| 1099 | − printLog("inVBO %ld, nodesInVBOOverExpectedMax %ld, duplicateVBOIndex %ld, nodesInVBONotShouldRender %ld\n", | |
| 1096 | + printLog(" _voxelsDirty=%s \n _voxelsInWriteArrays=%ld \n minDirty=%ld \n maxDirty=%ld \n", debug::valueOf(_voxelsDirty), | |
| 1097 | + _voxelsInWriteArrays, minDirty, maxDirty); | |
| 1098 | + | |
| 1099 | + printLog(" inVBO %ld \n nodesInVBOOverExpectedMax %ld \n duplicateVBOIndex %ld \n nodesInVBONotShouldRender %ld \n", | |
| 1100 | 1100 | args.nodesInVBO, args.nodesInVBOOverExpectedMax, args.duplicateVBOIndex, args.nodesInVBONotShouldRender); |
| 1101 | 1101 | |
| 1102 | 1102 | glBufferIndex minInVBO = GLBUFFER_INDEX_UNKNOWN; |
| @@ -1109,7 +1109,7 @@ void VoxelSystem::collectStatsForTreesAndVBOs() { · 6 unmodified lines | ||
| 1109 | 1109 | } |
| 1110 | 1110 | } |
| 1111 | 1111 | |
| 1112 | − printLog("minInVBO=%ld maxInVBO=%ld _voxelsInWriteArrays=%ld _voxelsInReadArrays=%ld\n", | |
| 1112 | + printLog(" minInVBO=%ld \n maxInVBO=%ld \n _voxelsInWriteArrays=%ld \n _voxelsInReadArrays=%ld \n", | |
| 1113 | 1113 | minInVBO, maxInVBO, _voxelsInWriteArrays, _voxelsInReadArrays); |
| 1114 | 1114 | |
| 1115 | 1115 | } |
| @@ -1289,19 +1289,21 @@ void VoxelSystem::falseColorizeOccluded() { · 173 unmodified lines | ||
| 1289 | 1289 | |
| 1290 | 1290 | VoxelProjectedPolygon::pointInside_calls = 0; |
| 1291 | 1291 | VoxelProjectedPolygon::occludes_calls = 0; |
| 1292 | + VoxelProjectedPolygon::intersects_calls = 0; | |
| 1292 | 1293 | |
| 1293 | 1294 | glm::vec3 position = args.viewFrustum->getPosition() * (1.0f/TREE_SCALE); |
| 1294 | 1295 | |
| 1295 | 1296 | _tree->recurseTreeWithOperationDistanceSorted(falseColorizeOccludedOperation, position, (void*)&args); |
| 1296 | 1297 | |
| 1297 | − printLog("falseColorizeOccluded()\n position=(%f,%f)\n total=%ld\n colored=%ld\n occluded=%ld\n notOccluded=%ld\n outOfView=%ld\n subtreeVoxelsSkipped=%ld\n stagedForDeletion=%ld\n nonLeaves=%ld\n nonLeavesOutOfView=%ld\n nonLeavesOccluded=%ld\n pointInside_calls=%ld\n occludes_calls=%ld\n", | |
| 1298 | + printLog("falseColorizeOccluded()\n position=(%f,%f)\n total=%ld\n colored=%ld\n occluded=%ld\n notOccluded=%ld\n outOfView=%ld\n subtreeVoxelsSkipped=%ld\n stagedForDeletion=%ld\n nonLeaves=%ld\n nonLeavesOutOfView=%ld\n nonLeavesOccluded=%ld\n pointInside_calls=%ld\n occludes_calls=%ld\n intersects_calls=%ld\n", | |
| 1298 | 1299 | position.x, position.y, |
| 1299 | 1300 | args.totalVoxels, args.coloredVoxels, args.occludedVoxels, |
| 1300 | 1301 | args.notOccludedVoxels, args.outOfView, args.subtreeVoxelsSkipped, |
| 1301 | 1302 | args.stagedForDeletion, |
| 1302 | 1303 | args.nonLeaves, args.nonLeavesOutOfView, args.nonLeavesOccluded, |
| 1303 | 1304 | VoxelProjectedPolygon::pointInside_calls, |
| 1304 | − VoxelProjectedPolygon::occludes_calls | |
| 1305 | + VoxelProjectedPolygon::occludes_calls, | |
| 1306 | + VoxelProjectedPolygon::intersects_calls | |
| 1305 | 1307 | ); |
| 1306 | 1308 | |
| 1307 | 1309 | |
| @@ -1397,7 +1399,7 @@ void VoxelSystem::falseColorizeOccludedV2() { · 89 unmodified lines | ||
| 1397 | 1399 | |
| 1398 | 1400 | VoxelProjectedPolygon::pointInside_calls = 0; |
| 1399 | 1401 | VoxelProjectedPolygon::occludes_calls = 0; |
| 1400 | − | |
| 1402 | + VoxelProjectedPolygon::intersects_calls = 0; | |
| 1401 | 1403 | |
| 1402 | 1404 | FalseColorizeOccludedArgs args; |
| 1403 | 1405 | args.viewFrustum = Application::getInstance()->getViewFrustum(); |
| @@ -1418,14 +1420,15 @@ void VoxelSystem::falseColorizeOccludedV2() { · 14 unmodified lines | ||
| 1418 | 1420 | |
| 1419 | 1421 | _tree->recurseTreeWithOperationDistanceSorted(falseColorizeOccludedV2Operation, position, (void*)&args); |
| 1420 | 1422 | |
| 1421 | − printLog("falseColorizeOccludedV2()\n position=(%f,%f)\n total=%ld\n colored=%ld\n occluded=%ld\n notOccluded=%ld\n outOfView=%ld\n subtreeVoxelsSkipped=%ld\n stagedForDeletion=%ld\n nonLeaves=%ld\n nonLeavesOutOfView=%ld\n nonLeavesOccluded=%ld\n pointInside_calls=%ld\n occludes_calls=%ld\n", | |
| 1423 | + printLog("falseColorizeOccludedV2()\n position=(%f,%f)\n total=%ld\n colored=%ld\n occluded=%ld\n notOccluded=%ld\n outOfView=%ld\n subtreeVoxelsSkipped=%ld\n stagedForDeletion=%ld\n nonLeaves=%ld\n nonLeavesOutOfView=%ld\n nonLeavesOccluded=%ld\n pointInside_calls=%ld\n occludes_calls=%ld\n intersects_calls=%ld\n", | |
| 1422 | 1424 | position.x, position.y, |
| 1423 | 1425 | args.totalVoxels, args.coloredVoxels, args.occludedVoxels, |
| 1424 | 1426 | args.notOccludedVoxels, args.outOfView, args.subtreeVoxelsSkipped, |
| 1425 | 1427 | args.stagedForDeletion, |
| 1426 | 1428 | args.nonLeaves, args.nonLeavesOutOfView, args.nonLeavesOccluded, |
| 1427 | 1429 | VoxelProjectedPolygon::pointInside_calls, |
| 1428 | − VoxelProjectedPolygon::occludes_calls | |
| 1430 | + VoxelProjectedPolygon::occludes_calls, | |
| 1431 | + VoxelProjectedPolygon::intersects_calls | |
| 1429 | 1432 | ); |
| 1430 | 1433 | //myCoverageMapV2.erase(); |
| 1431 | 1434 | |