History

remove now extraneous newlines after switch to QDebug

Stephen Birarda committed 13 years ago

Commit 89d3cfd1 parent afe49bc22 files · +199 −199Browse files

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

Unified · Split

interface/src/VoxelSystem.cpp+23−23
@@ -144,16 +144,16 @@ int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) { · 143 unmodified lines
144144 int commandLength = strlen(command); // commands are null terminated strings
145145 int totalLength = 1+commandLength+1;
146146
147− qDebug("got Z message len(%d)= %s\n", numBytes, command);
147+ qDebug("got Z message len(%d)= %s", numBytes, command);
148148
149149 while (totalLength <= numBytes) {
150150 if (0==strcmp(command,(char*)"erase all")) {
151− qDebug("got Z message == erase all\n");
151+ qDebug("got Z message == erase all");
152152 _tree->eraseAllVoxels();
153153 _voxelsInReadArrays = _voxelsInWriteArrays = 0; // better way to do this??
154154 }
155155 if (0==strcmp(command,(char*)"add scene")) {
156− qDebug("got Z message == add scene - NOT SUPPORTED ON INTERFACE\n");
156+ qDebug("got Z message == add scene - NOT SUPPORTED ON INTERFACE");
157157 }
158158 totalLength += commandLength+1;
159159 }
@@ -708,7 +708,7 @@ bool VoxelSystem::randomColorOperation(VoxelNode* node, void* extraData) { · 548 unmodified lines
708708 void VoxelSystem::randomizeVoxelColors() {
709709 _nodeCount = 0;
710710 _tree->recurseTreeWithOperation(randomColorOperation);
711− qDebug("setting randomized true color for %d nodes\n", _nodeCount);
711+ qDebug("setting randomized true color for %d nodes", _nodeCount);
712712 setupNewVoxelsForDrawing();
713713 }
714714
@@ -722,7 +722,7 @@ bool VoxelSystem::falseColorizeRandomOperation(VoxelNode* node, void* extraData) · 7 unmodified lines
722722 void VoxelSystem::falseColorizeRandom() {
723723 _nodeCount = 0;
724724 _tree->recurseTreeWithOperation(falseColorizeRandomOperation);
725− qDebug("setting randomized false color for %d nodes\n", _nodeCount);
725+ qDebug("setting randomized false color for %d nodes", _nodeCount);
726726 setupNewVoxelsForDrawing();
727727 }
728728
@@ -736,7 +736,7 @@ void VoxelSystem::trueColorize() { · 7 unmodified lines
736736 PerformanceWarning warn(true, "trueColorize()",true);
737737 _nodeCount = 0;
738738 _tree->recurseTreeWithOperation(trueColorizeOperation);
739− qDebug("setting true color for %d nodes\n", _nodeCount);
739+ qDebug("setting true color for %d nodes", _nodeCount);
740740 setupNewVoxelsForDrawing();
741741 }
742742
@@ -756,7 +756,7 @@ bool VoxelSystem::falseColorizeInViewOperation(VoxelNode* node, void* extraData) · 13 unmodified lines
756756 void VoxelSystem::falseColorizeInView(ViewFrustum* viewFrustum) {
757757 _nodeCount = 0;
758758 _tree->recurseTreeWithOperation(falseColorizeInViewOperation,(void*)viewFrustum);
759− qDebug("setting in view false color for %d nodes\n", _nodeCount);
759+ qDebug("setting in view false color for %d nodes", _nodeCount);
760760 setupNewVoxelsForDrawing();
761761 }
762762
@@ -806,10 +806,10 @@ void VoxelSystem::falseColorizeDistanceFromView(ViewFrustum* viewFrustum) { · 43 unmodified lines
806806 _maxDistance = 0.0;
807807 _minDistance = FLT_MAX;
808808 _tree->recurseTreeWithOperation(getDistanceFromViewRangeOperation,(void*)viewFrustum);
809− qDebug("determining distance range for %d nodes\n", _nodeCount);
809+ qDebug("determining distance range for %d nodes", _nodeCount);
810810 _nodeCount = 0;
811811 _tree->recurseTreeWithOperation(falseColorizeDistanceFromViewOperation,(void*)viewFrustum);
812− qDebug("setting in distance false color for %d nodes\n", _nodeCount);
812+ qDebug("setting in distance false color for %d nodes", _nodeCount);
813813 setupNewVoxelsForDrawing();
814814 }
815815
@@ -921,7 +921,7 @@ void VoxelSystem::removeOutOfView() { · 105 unmodified lines
921921 }
922922 bool showRemoveDebugDetails = false;
923923 if (showRemoveDebugDetails) {
924− qDebug("removeOutOfView() scanned=%ld removed=%ld inside=%ld intersect=%ld outside=%ld _removedVoxels.count()=%d \n",
924+ qDebug("removeOutOfView() scanned=%ld removed=%ld inside=%ld intersect=%ld outside=%ld _removedVoxels.count()=%d ",
925925 args.nodesScanned, args.nodesRemoved, args.nodesInside,
926926 args.nodesIntersect, args.nodesOutside, _removedVoxels.count()
927927 );
@@ -987,7 +987,7 @@ bool VoxelSystem::falseColorizeRandomEveryOtherOperation(VoxelNode* node, void* · 59 unmodified lines
987987 void VoxelSystem::falseColorizeRandomEveryOther() {
988988 falseColorizeRandomEveryOtherArgs args;
989989 _tree->recurseTreeWithOperation(falseColorizeRandomEveryOtherOperation,&args);
990− qDebug("randomized false color for every other node: total %ld, colorable %ld, colored %ld\n",
990+ qDebug("randomized false color for every other node: total %ld, colorable %ld, colored %ld",
991991 args.totalNodes, args.colorableNodes, args.coloredNodes);
992992 setupNewVoxelsForDrawing();
993993 }
@@ -1048,7 +1048,7 @@ bool VoxelSystem::collectStatsForTreesAndVBOsOperation(VoxelNode* node, void* ex · 54 unmodified lines
10481048 unsigned long nodeIndex = node->getBufferIndex();
10491049 if (args->hasIndexFound[nodeIndex]) {
10501050 args->duplicateVBOIndex++;
1051− qDebug("duplicateVBO found... index=%ld, isDirty=%s, shouldRender=%s \n", nodeIndex,
1051+ qDebug("duplicateVBO found... index=%ld, isDirty=%s, shouldRender=%s ", nodeIndex,
10521052 debug::valueOf(node->isDirty()), debug::valueOf(node->getShouldRender()));
10531053 } else {
10541054 args->hasIndexFound[nodeIndex] = true;
@@ -1083,13 +1083,13 @@ void VoxelSystem::collectStatsForTreesAndVBOs() { · 28 unmodified lines
10831083 args.expectedMax = _voxelsInWriteArrays;
10841084 _tree->recurseTreeWithOperation(collectStatsForTreesAndVBOsOperation,&args);
10851085
1086− qDebug("Local Voxel Tree Statistics:\n total nodes %ld \n leaves %ld \n dirty %ld \n colored %ld \n shouldRender %ld \n",
1086+ qDebug("Local Voxel Tree Statistics:\n total nodes %ld \n leaves %ld \n dirty %ld \n colored %ld \n shouldRender %ld ",
10871087 args.totalNodes, args.leafNodes, args.dirtyNodes, args.coloredNodes, args.shouldRenderNodes);
10881088
1089− qDebug(" _voxelsDirty=%s \n _voxelsInWriteArrays=%ld \n minDirty=%ld \n maxDirty=%ld \n", debug::valueOf(_voxelsDirty),
1089+ qDebug(" _voxelsDirty=%s \n _voxelsInWriteArrays=%ld \n minDirty=%ld \n maxDirty=%ld ", debug::valueOf(_voxelsDirty),
10901090 _voxelsInWriteArrays, minDirty, maxDirty);
10911091
1092− qDebug(" inVBO %ld \n nodesInVBOOverExpectedMax %ld \n duplicateVBOIndex %ld \n nodesInVBONotShouldRender %ld \n",
1092+ qDebug(" inVBO %ld \n nodesInVBOOverExpectedMax %ld \n duplicateVBOIndex %ld \n nodesInVBONotShouldRender %ld ",
10931093 args.nodesInVBO, args.nodesInVBOOverExpectedMax, args.duplicateVBOIndex, args.nodesInVBONotShouldRender);
10941094
10951095 glBufferIndex minInVBO = GLBUFFER_INDEX_UNKNOWN;
@@ -1102,7 +1102,7 @@ void VoxelSystem::collectStatsForTreesAndVBOs() { · 6 unmodified lines
11021102 }
11031103 }
11041104
1105− qDebug(" minInVBO=%ld \n maxInVBO=%ld \n _voxelsInWriteArrays=%ld \n _voxelsInReadArrays=%ld \n",
1105+ qDebug(" minInVBO=%ld \n maxInVBO=%ld \n _voxelsInWriteArrays=%ld \n _voxelsInReadArrays=%ld ",
11061106 minInVBO, maxInVBO, _voxelsInWriteArrays, _voxelsInReadArrays);
11071107
11081108 }
@@ -1127,7 +1127,7 @@ void VoxelSystem::createVoxel(float x, float y, float z, float s, · 18 unmodified lines
11271127 unsigned char red, unsigned char green, unsigned char blue, bool destructive) {
11281128 pthread_mutex_lock(&_treeLock);
11291129
1130− //qDebug("VoxelSystem::createVoxel(%f,%f,%f,%f)\n",x,y,z,s);
1130+ //qDebug("VoxelSystem::createVoxel(%f,%f,%f,%f)",x,y,z,s);
11311131 _tree->createVoxel(x, y, z, s, red, green, blue, destructive);
11321132 setupNewVoxelsForDrawing();
11331133
@@ -1253,9 +1253,9 @@ bool VoxelSystem::falseColorizeOccludedOperation(VoxelNode* node, void* extraDat · 119 unmodified lines
12531253 args->occludedVoxels++;
12541254 } else if (result == STORED) {
12551255 args->notOccludedVoxels++;
1256− //qDebug("***** falseColorizeOccludedOperation() NODE is STORED *****\n");
1256+ //qDebug("***** falseColorizeOccludedOperation() NODE is STORED *****");
12571257 } else if (result == DOESNT_FIT) {
1258− //qDebug("***** falseColorizeOccludedOperation() NODE DOESNT_FIT???? *****\n");
1258+ //qDebug("***** falseColorizeOccludedOperation() NODE DOESNT_FIT???? *****");
12591259 }
12601260 }
12611261 return true; // keep going!
@@ -1288,7 +1288,7 @@ void VoxelSystem::falseColorizeOccluded() { · 26 unmodified lines
12881288
12891289 _tree->recurseTreeWithOperationDistanceSorted(falseColorizeOccludedOperation, position, (void*)&args);
12901290
1291− 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 stagedForDeletion=%ld\n nonLeaves=%ld\n nonLeavesOutOfView=%ld\n nonLeavesOccluded=%ld\n pointInside_calls=%ld\n occludes_calls=%ld\n intersects_calls=%ld\n",
1291+ 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 stagedForDeletion=%ld\n nonLeaves=%ld\n nonLeavesOutOfView=%ld\n nonLeavesOccluded=%ld\n pointInside_calls=%ld\n occludes_calls=%ld\n intersects_calls=%ld",
12921292 position.x, position.y,
12931293 args.totalVoxels, args.coloredVoxels, args.occludedVoxels,
12941294 args.notOccludedVoxels, args.outOfView, args.subtreeVoxelsSkipped,
@@ -1374,9 +1374,9 @@ bool VoxelSystem::falseColorizeOccludedV2Operation(VoxelNode* node, void* extraD · 79 unmodified lines
13741374 args->occludedVoxels++;
13751375 } else if (result == V2_STORED) {
13761376 args->notOccludedVoxels++;
1377− //qDebug("***** falseColorizeOccludedOperation() NODE is STORED *****\n");
1377+ //qDebug("***** falseColorizeOccludedOperation() NODE is STORED *****");
13781378 } else if (result == V2_DOESNT_FIT) {
1379− //qDebug("***** falseColorizeOccludedOperation() NODE DOESNT_FIT???? *****\n");
1379+ //qDebug("***** falseColorizeOccludedOperation() NODE DOESNT_FIT???? *****");
13801380 }
13811381 delete voxelPolygon; // V2 maps don't store polygons, so we're always in charge of freeing
13821382 }
@@ -1413,7 +1413,7 @@ void VoxelSystem::falseColorizeOccludedV2() { · 30 unmodified lines
14131413
14141414 _tree->recurseTreeWithOperationDistanceSorted(falseColorizeOccludedV2Operation, position, (void*)&args);
14151415
1416− qDebug("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",
1416+ qDebug("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",
14171417 position.x, position.y,
14181418 args.totalVoxels, args.coloredVoxels, args.occludedVoxels,
14191419 args.notOccludedVoxels, args.outOfView, args.subtreeVoxelsSkipped,