From 29522d1e50dcb78dac1146e5ef3ebb3e2f1be0cc Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 23 Nov 2013 14:07:01 -0800 Subject: [PATCH] tweaks and cleanup --- libraries/voxel-server-library/src/VoxelNodeData.cpp | 4 +--- libraries/voxel-server-library/src/VoxelNodeData.h | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libraries/voxel-server-library/src/VoxelNodeData.cpp b/libraries/voxel-server-library/src/VoxelNodeData.cpp index d54d388431..152bb6a78f 100644 --- a/libraries/voxel-server-library/src/VoxelNodeData.cpp +++ b/libraries/voxel-server-library/src/VoxelNodeData.cpp @@ -13,8 +13,6 @@ #include #include "VoxelSendThread.h" -const int UNCOMPRESSED_SIZE_MULTIPLE = 20; - VoxelNodeData::VoxelNodeData(Node* owningNode) : VoxelQuery(owningNode), _viewSent(false), @@ -47,7 +45,7 @@ void VoxelNodeData::initializeVoxelSendThread(VoxelServer* voxelServer) { _voxelSendThread->initialize(true); } -bool VoxelNodeData::packetIsDuplicate() { +bool VoxelNodeData::packetIsDuplicate() const { if (_lastVoxelPacketLength == getPacketLength()) { return memcmp(_lastVoxelPacket, getPacket(), getPacketLength()) == 0; } diff --git a/libraries/voxel-server-library/src/VoxelNodeData.h b/libraries/voxel-server-library/src/VoxelNodeData.h index b429ec5a90..f19f80bd40 100644 --- a/libraries/voxel-server-library/src/VoxelNodeData.h +++ b/libraries/voxel-server-library/src/VoxelNodeData.h @@ -36,10 +36,10 @@ public: bool isPacketWaiting() const { return _voxelPacketWaiting; } - bool packetIsDuplicate(); + bool packetIsDuplicate() const; bool shouldSuppressDuplicatePacket(); - int getAvailable() const { return MAX_VOXEL_PACKET_SIZE - getPacketLength(); } + int getAvailable() const { return _voxelPacketAvailableBytes; } int getMaxSearchLevel() const { return _maxSearchLevel; }; void resetMaxSearchLevel() { _maxSearchLevel = 1; }; void incrementMaxSearchLevel() { _maxSearchLevel++; };