Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 08:03:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR feedback

Browse source
This commit is contained in:
ZappoMan 2013-07-22 14:17:18 -07:00
parent 86aeaf175c
commit f4749aa916
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/voxels/src/VoxelSceneStats.cpp
View file

@ -20,7 +20,7 @@ VoxelSceneStats::VoxelSceneStats() :
_bitsPerVoxelAverage(samples) _bitsPerVoxelAverage(samples)
{ {
reset(); reset();
_readyToSend = false; _isReadyToSend = false;
_isStarted = false; _isStarted = false;
} }
@ -43,7 +43,7 @@ void VoxelSceneStats::sceneCompleted() {
_elapsedAverage.updateAverage((float)_elapsed); _elapsedAverage.updateAverage((float)_elapsed);
_statsMessageLength = packIntoMessage(_statsMessage, sizeof(_statsMessage)); _statsMessageLength = packIntoMessage(_statsMessage, sizeof(_statsMessage));
_readyToSend = true; _isReadyToSend = true;
_isStarted = false; _isStarted = false;
} }
} }

6
libraries/voxels/src/VoxelSceneStats.h
View file

@ -44,8 +44,8 @@ public:
int packIntoMessage(unsigned char* destinationBuffer, int availableBytes); int packIntoMessage(unsigned char* destinationBuffer, int availableBytes);
int unpackFromMessage(unsigned char* sourceBuffer, int availableBytes); int unpackFromMessage(unsigned char* sourceBuffer, int availableBytes);
bool readyToSend() const { return _readyToSend; } bool isReadyToSend() const { return _isReadyToSend; }
void markAsSent() { _readyToSend = false; } void markAsSent() { _isReadyToSend = false; }
unsigned char* getStatsMessage() { return &_statsMessage[0]; } unsigned char* getStatsMessage() { return &_statsMessage[0]; }
int getStatsMessageLength() const { return _statsMessageLength; } int getStatsMessageLength() const { return _statsMessageLength; }
@ -79,7 +79,7 @@ public:
char* getItemValue(int item); char* getItemValue(int item);
private: private:
bool _readyToSend; bool _isReadyToSend;
unsigned char _statsMessage[MAX_PACKET_SIZE]; unsigned char _statsMessage[MAX_PACKET_SIZE];
int _statsMessageLength; int _statsMessageLength;

2
voxel-server/src/main.cpp
View file

@ -117,7 +117,7 @@ void handlePacketSend(NodeList* nodeList,
VoxelNodeData* nodeData, VoxelNodeData* nodeData,
int& trueBytesSent, int& truePacketsSent) { int& trueBytesSent, int& truePacketsSent) {
// If we've got a stats message ready to send, then see if we can piggyback them together // 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 // Send the stats message to the client
unsigned char* statsMessage = nodeData->stats.getStatsMessage(); unsigned char* statsMessage = nodeData->stats.getStatsMessage();
int statsMessageLength = nodeData->stats.getStatsMessageLength(); int statsMessageLength = nodeData->stats.getStatsMessageLength();