From fe5fabdd610da35c4866dcaa248048026006b906 Mon Sep 17 00:00:00 2001 From: wangyix Date: Fri, 23 May 2014 11:17:59 -0700 Subject: [PATCH] removed old code that was commented out changed tabs to spaces --- assignment-client/src/octree/OctreeQueryNode.cpp | 10 ++-------- assignment-client/src/octree/OctreeQueryNode.h | 4 ++-- assignment-client/src/octree/OctreeSendThread.cpp | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/assignment-client/src/octree/OctreeQueryNode.cpp b/assignment-client/src/octree/OctreeQueryNode.cpp index cb4b6588b0..ede6dee5e3 100644 --- a/assignment-client/src/octree/OctreeQueryNode.cpp +++ b/assignment-client/src/octree/OctreeQueryNode.cpp @@ -197,18 +197,12 @@ void OctreeQueryNode::resetOctreePacket() { *flagsAt = flags; _octreePacketAt += sizeof(OCTREE_PACKET_FLAGS); _octreePacketAvailableBytes -= sizeof(OCTREE_PACKET_FLAGS); - - + // pack in sequence number OCTREE_PACKET_SEQUENCE* sequenceAt = (OCTREE_PACKET_SEQUENCE*)_octreePacketAt; *sequenceAt = _sequenceNumber; _octreePacketAt += sizeof(OCTREE_PACKET_SEQUENCE); _octreePacketAvailableBytes -= sizeof(OCTREE_PACKET_SEQUENCE); - /* - if (!(lastWasSurpressed || _lastOctreePacketLength == (numBytesPacketHeader + OCTREE_PACKET_EXTRA_HEADERS_SIZE))) { - _sequenceNumber++; - }*/ - // pack in timestamp OCTREE_PACKET_SENT_TIME now = usecTimestampNow(); @@ -370,5 +364,5 @@ void OctreeQueryNode::dumpOutOfView() { } void OctreeQueryNode::incrementSequenceNumber() { - _sequenceNumber++; + _sequenceNumber++; } \ No newline at end of file diff --git a/assignment-client/src/octree/OctreeQueryNode.h b/assignment-client/src/octree/OctreeQueryNode.h index 63380f69e5..1bb3a72a0c 100644 --- a/assignment-client/src/octree/OctreeQueryNode.h +++ b/assignment-client/src/octree/OctreeQueryNode.h @@ -39,7 +39,7 @@ public: void writeToPacket(const unsigned char* buffer, unsigned int bytes); // writes to end of packet - const unsigned char* getPacket() const { return _octreePacket; } + const unsigned char* getPacket() const { return _octreePacket; } unsigned int getPacketLength() const { return (MAX_PACKET_SIZE - _octreePacketAvailableBytes); } bool isPacketWaiting() const { return _octreePacketWaiting; } @@ -100,7 +100,7 @@ public: void forceNodeShutdown(); bool isShuttingDown() const { return _isShuttingDown; } - void incrementSequenceNumber(); + void incrementSequenceNumber(); private slots: void sendThreadFinished(); diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp index 5c8bb9440e..8d6803adac 100644 --- a/assignment-client/src/octree/OctreeSendThread.cpp +++ b/assignment-client/src/octree/OctreeSendThread.cpp @@ -127,7 +127,7 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes return 0; } - bool debug = _myServer->wantsDebugSending(); + bool debug = _myServer->wantsDebugSending(); quint64 now = usecTimestampNow(); bool packetSent = false; // did we send a packet? @@ -242,7 +242,7 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes trueBytesSent += nodeData->getPacketLength(); truePacketsSent++; packetsSent++; - nodeData->incrementSequenceNumber(); + nodeData->incrementSequenceNumber(); nodeData->resetOctreePacket(); }