History

moved compression into VoxelPacket class. works, but too slow for larger sizes

ZappoMan committed 12 years ago

Commit e65f74e1 parent cd1d3769 files · +184 −30Browse files

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

Unified · Split

interface/src/VoxelSystem.cpp+10−2
@@ -597,7 +597,11 @@ int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) { · 596 unmodified lines
597 // ask the VoxelTree to read the bitstream into the tree597 // ask the VoxelTree to read the bitstream into the tree
598 ReadBitstreamToTreeParams args(WANT_COLOR, WANT_EXISTS_BITS, NULL, getDataSourceUUID());598 ReadBitstreamToTreeParams args(WANT_COLOR, WANT_EXISTS_BITS, NULL, getDataSourceUUID());
599 lockTree();599 lockTree();
600 _tree->readBitstreamToTree(voxelData, numBytes - numBytesPacketHeader, args);600 VoxelPacket packet;
601 int compressedSize = numBytes - numBytesPacketHeader;
602 packet.loadCompressedContent(voxelData, compressedSize);
603printf("got packet numBytes=%d compressed size %d uncompressed size %d\n",numBytes, compressedSize, packet.getUncompressedSize());
604 _tree->readBitstreamToTree(packet.getUncompressedData(), packet.getUncompressedSize(), args);
601 unlockTree();605 unlockTree();
602 }606 }
603 break;607 break;
@@ -607,7 +611,11 @@ int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) { · 3 unmodified lines
607 // ask the VoxelTree to read the MONOCHROME bitstream into the tree611 // ask the VoxelTree to read the MONOCHROME bitstream into the tree
608 ReadBitstreamToTreeParams args(NO_COLOR, WANT_EXISTS_BITS, NULL, getDataSourceUUID());612 ReadBitstreamToTreeParams args(NO_COLOR, WANT_EXISTS_BITS, NULL, getDataSourceUUID());
609 lockTree();613 lockTree();
610 _tree->readBitstreamToTree(voxelData, numBytes - numBytesPacketHeader, args);614 VoxelPacket packet;
615 int compressedSize = numBytes - numBytesPacketHeader;
616 packet.loadCompressedContent(voxelData, compressedSize);
617printf("got packet numBytes=%d compressed size %d uncompressed size %d\n",numBytes, compressedSize, packet.getUncompressedSize());
618 _tree->readBitstreamToTree(packet.getUncompressedData(), packet.getUncompressedSize(), args);
611 unlockTree();619 unlockTree();
612 }620 }
613 break;621 break;