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

removed _sequenceNumber from OctreeSendThread

Browse source 
inlined getSequenceNumber and incrementSequenceNumber
This commit is contained in:
wangyix 2014-05-29 13:39:57 -07:00
parent f82be105e8
commit d8b0b03e59
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/octree/OctreeQueryNode.h
View file

@ -100,9 +100,9 @@ public:
void forceNodeShutdown();
bool isShuttingDown() const { return _isShuttingDown; }
void incrementSequenceNumber();
void incrementSequenceNumber() { _sequenceNumber++; }
OCTREE_PACKET_SEQUENCE getSequenceNumber();
OCTREE_PACKET_SEQUENCE getSequenceNumber() const { return _sequenceNumber; }
private slots:
void sendThreadFinished();

5
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -28,8 +28,7 @@ OctreeSendThread::OctreeSendThread(const SharedAssignmentPointer& myAssignment,
_nodeUUID(node->getUUID()),
_packetData(),
_nodeMissingCount(0),
_isShuttingDown(false),
_sequenceNumber(0)
_isShuttingDown(false)
{
QString safeServerName("Octree");
if (_myServer) {
@ -247,7 +246,7 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes
trueBytesSent += nodeData->getPacketLength();
truePacketsSent++;
packetsSent++;
_sequenceNumber++;
nodeData->incrementSequenceNumber();
nodeData->resetOctreePacket();
}

2
assignment-client/src/octree/OctreeSendThread.h
View file

@ -55,8 +55,6 @@ private:
int _nodeMissingCount;
bool _isShuttingDown;
OCTREE_PACKET_SEQUENCE _sequenceNumber;
};
#endif // hifi_OctreeSendThread_h