From c9e16994f4b6089be8c7653b8a109902030b26f3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 22 Mar 2013 18:26:05 -0700 Subject: [PATCH] fix printTreeForDebugging instead of addition of repairChildMasks --- shared/src/VoxelTree.cpp | 27 +-------------------------- shared/src/VoxelTree.h | 1 - 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/shared/src/VoxelTree.cpp b/shared/src/VoxelTree.cpp index 005ee33640..1c5f18b666 100644 --- a/shared/src/VoxelTree.cpp +++ b/shared/src/VoxelTree.cpp @@ -159,31 +159,6 @@ void VoxelTree::readCodeColorBufferToTree(unsigned char *codeColorBuffer) { // give this node its color memcpy(lastCreatedNode->color, codeColorBuffer + octalCodeBytes, 3); lastCreatedNode->color[3] = 1; - - repairChildMasks(rootNode); -} - -int VoxelTree::repairChildMasks(VoxelNode *currentNode) { - - currentNode->childMask = 0; - int grandChildren = 0; - int thisNodeGrandChildren = 0; - - for (int i = 0; i < 8; i++) { - - if (currentNode->children[i] != NULL) { - thisNodeGrandChildren = repairChildMasks(currentNode->children[i]); - - if (thisNodeGrandChildren > 0) { - currentNode->childMask += (1 << (7 - i)); - } - - thisNodeGrandChildren += grandChildren; - } - } - - return grandChildren; - } unsigned char * VoxelTree::loadBitstreamBuffer(unsigned char *& bitstreamBuffer, @@ -311,7 +286,7 @@ void VoxelTree::printTreeForDebugging(VoxelNode *startNode) { // ask children to recursively output their trees // if they aren't a leaf for (int k = 0; k < 8; k++) { - if (startNode->children[k] != NULL && oneAtBit(startNode->childMask, k)) { + if (startNode->children[k] != NULL) { printTreeForDebugging(startNode->children[k]); } } diff --git a/shared/src/VoxelTree.h b/shared/src/VoxelTree.h index 9c5b75df35..f5b8aeeced 100644 --- a/shared/src/VoxelTree.h +++ b/shared/src/VoxelTree.h @@ -29,7 +29,6 @@ public: int levelForViewerPosition(float * position); void readBitstreamToTree(unsigned char * bitstream, int bufferSizeBytes); void readCodeColorBufferToTree(unsigned char *codeColorBuffer); - int repairChildMasks(VoxelNode *currentNode); unsigned char * loadBitstreamBuffer(unsigned char *& bitstreamBuffer, unsigned char * octalCode, VoxelNode *currentVoxelNode,