From f4749aa916aad4b7921174e61bc347b81eebb08c Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 22 Jul 2013 14:17:18 -0700 Subject: [PATCH] CR feedback --- libraries/voxels/src/VoxelSceneStats.cpp | 4 ++-- libraries/voxels/src/VoxelSceneStats.h | 6 +++--- voxel-server/src/main.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/voxels/src/VoxelSceneStats.cpp b/libraries/voxels/src/VoxelSceneStats.cpp index 0f22352eb9..b226886a25 100644 --- a/libraries/voxels/src/VoxelSceneStats.cpp +++ b/libraries/voxels/src/VoxelSceneStats.cpp @@ -20,7 +20,7 @@ VoxelSceneStats::VoxelSceneStats() : _bitsPerVoxelAverage(samples) { reset(); - _readyToSend = false; + _isReadyToSend = false; _isStarted = false; } @@ -43,7 +43,7 @@ void VoxelSceneStats::sceneCompleted() { _elapsedAverage.updateAverage((float)_elapsed); _statsMessageLength = packIntoMessage(_statsMessage, sizeof(_statsMessage)); - _readyToSend = true; + _isReadyToSend = true; _isStarted = false; } } diff --git a/libraries/voxels/src/VoxelSceneStats.h b/libraries/voxels/src/VoxelSceneStats.h index 2bf71d7440..ded2061a6e 100644 --- a/libraries/voxels/src/VoxelSceneStats.h +++ b/libraries/voxels/src/VoxelSceneStats.h @@ -44,8 +44,8 @@ public: int packIntoMessage(unsigned char* destinationBuffer, int availableBytes); int unpackFromMessage(unsigned char* sourceBuffer, int availableBytes); - bool readyToSend() const { return _readyToSend; } - void markAsSent() { _readyToSend = false; } + bool isReadyToSend() const { return _isReadyToSend; } + void markAsSent() { _isReadyToSend = false; } unsigned char* getStatsMessage() { return &_statsMessage[0]; } int getStatsMessageLength() const { return _statsMessageLength; } @@ -79,7 +79,7 @@ public: char* getItemValue(int item); private: - bool _readyToSend; + bool _isReadyToSend; unsigned char _statsMessage[MAX_PACKET_SIZE]; int _statsMessageLength; diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp index c02211f182..c009eec2a5 100644 --- a/voxel-server/src/main.cpp +++ b/voxel-server/src/main.cpp @@ -117,7 +117,7 @@ void handlePacketSend(NodeList* nodeList, VoxelNodeData* nodeData, int& trueBytesSent, int& truePacketsSent) { // If we've got a stats message ready to send, then see if we can piggyback them together - if (nodeData->stats.readyToSend()) { + if (nodeData->stats.isReadyToSend()) { // Send the stats message to the client unsigned char* statsMessage = nodeData->stats.getStatsMessage(); int statsMessageLength = nodeData->stats.getStatsMessageLength();