From fe1a0e45654a59beadcf19a8d5c75882734f9b8d Mon Sep 17 00:00:00 2001
From: wangyix <wangyix@gmail.com>
Date: Thu, 29 May 2014 11:27:14 -0700
Subject: [PATCH] removed debug stuff i missed

---
 assignment-client/src/octree/OctreeQueryNode.cpp  | 6 ------
 assignment-client/src/octree/OctreeQueryNode.h    | 4 ----
 assignment-client/src/octree/OctreeSendThread.cpp | 5 ++---
 assignment-client/src/voxels/VoxelServer.cpp      | 2 --
 libraries/octree/src/OctreeSceneStats.cpp         | 6 +++---
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/assignment-client/src/octree/OctreeQueryNode.cpp b/assignment-client/src/octree/OctreeQueryNode.cpp
index ea15770f9e..f7b293dfa8 100644
--- a/assignment-client/src/octree/OctreeQueryNode.cpp
+++ b/assignment-client/src/octree/OctreeQueryNode.cpp
@@ -38,7 +38,6 @@ OctreeQueryNode::OctreeQueryNode() :
     _lastClientOctreeSizeScale(DEFAULT_OCTREE_SIZE_SCALE),
     _lodChanged(false),
     _lodInitialized(false),
-    //_sequenceNumber(0),
     _lastRootTimestamp(0),
     _myPacketType(PacketTypeUnknown),
     _isShuttingDown(false)
@@ -362,8 +361,3 @@ void OctreeQueryNode::dumpOutOfView() {
         }
     }
 }
-/*
-void OctreeQueryNode::incrementSequenceNumber() {
-    _sequenceNumber++;
-}
-*/
diff --git a/assignment-client/src/octree/OctreeQueryNode.h b/assignment-client/src/octree/OctreeQueryNode.h
index af293189a4..eeea98699c 100644
--- a/assignment-client/src/octree/OctreeQueryNode.h
+++ b/assignment-client/src/octree/OctreeQueryNode.h
@@ -99,8 +99,6 @@ public:
     void nodeKilled();
     void forceNodeShutdown();
     bool isShuttingDown() const { return _isShuttingDown; }
-
-    //void incrementSequenceNumber();
     
 private slots:
     void sendThreadFinished();
@@ -138,8 +136,6 @@ private:
     bool _lodChanged;
     bool _lodInitialized;
 
-    //OCTREE_PACKET_SEQUENCE _sequenceNumber;
-
     quint64 _lastRootTimestamp;
     
     PacketType _myPacketType;
diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp
index b91c4c4761..a396e1170c 100644
--- a/assignment-client/src/octree/OctreeSendThread.cpp
+++ b/assignment-client/src/octree/OctreeSendThread.cpp
@@ -143,8 +143,6 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes
     }
 
     const unsigned char* messageData = nodeData->getPacket();
-//unsigned char messageData[MAX_PACKET_SIZE];
-//memcpy(messageData, nodeData->getPacket(), MAX_PACKET_SIZE);    // DEBUG: make copy of message to send
 
     int numBytesPacketHeader = numBytesForPacketHeader(reinterpret_cast<const char*>(messageData));
     const unsigned char* dataAt = messageData + numBytesPacketHeader;
@@ -164,7 +162,7 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes
         int piggyBackSize = nodeData->getPacketLength() + statsMessageLength;
 
         // If the size of the stats message and the voxel message will fit in a packet, then piggyback them
-if (piggyBackSize < MAX_PACKET_SIZE && false) {
+        if (piggyBackSize < MAX_PACKET_SIZE) {
 
             // copy voxel message to back of stats message
             memcpy(statsMessage + statsMessageLength, nodeData->getPacket(), nodeData->getPacketLength());
@@ -252,6 +250,7 @@ if (piggyBackSize < MAX_PACKET_SIZE && false) {
         _sequenceNumber++;
         nodeData->resetOctreePacket(_sequenceNumber);
     }
+
     return packetsSent;
 }
 
diff --git a/assignment-client/src/voxels/VoxelServer.cpp b/assignment-client/src/voxels/VoxelServer.cpp
index 9a4da4d611..43d01f1c77 100644
--- a/assignment-client/src/voxels/VoxelServer.cpp
+++ b/assignment-client/src/voxels/VoxelServer.cpp
@@ -48,7 +48,6 @@ int VoxelServer::sendSpecialPacket(OCTREE_PACKET_SEQUENCE& sequenceNumber, const
     copyAt += numBytesPacketHeader;
     int envPacketLength = numBytesPacketHeader;
 
-
     // pack in flags
     OCTREE_PACKET_FLAGS flags = 0;
     OCTREE_PACKET_FLAGS* flagsAt = (OCTREE_PACKET_FLAGS*)copyAt;
@@ -69,7 +68,6 @@ int VoxelServer::sendSpecialPacket(OCTREE_PACKET_SEQUENCE& sequenceNumber, const
     copyAt += sizeof(OCTREE_PACKET_SENT_TIME);
     envPacketLength += sizeof(OCTREE_PACKET_SENT_TIME);
 
-
     int environmentsToSend = getSendMinimalEnvironment() ? 1 : getEnvironmentDataCount();
 
     for (int i = 0; i < environmentsToSend; i++) {
diff --git a/libraries/octree/src/OctreeSceneStats.cpp b/libraries/octree/src/OctreeSceneStats.cpp
index 269b64559f..9580ae6d13 100644
--- a/libraries/octree/src/OctreeSceneStats.cpp
+++ b/libraries/octree/src/OctreeSceneStats.cpp
@@ -857,7 +857,7 @@ void OctreeSceneStats::trackIncomingOctreePacket(const QByteArray& packet,
     //bool packetIsColored = oneAtBit(flags, PACKET_IS_COLOR_BIT);
     //bool packetIsCompressed = oneAtBit(flags, PACKET_IS_COMPRESSED_BIT);
     
-    OCTREE_PACKET_SENT_TIME arrivedAt = usecTimestampNow(); // DEBUG!!!
+    OCTREE_PACKET_SENT_TIME arrivedAt = usecTimestampNow();
     qint64 flightTime = arrivedAt - sentAt + nodeClockSkewUsec;
 
     if (wantExtraDebugging) {
@@ -872,7 +872,7 @@ void OctreeSceneStats::trackIncomingOctreePacket(const QByteArray& packet,
     const int MIN_RESONABLE_FLIGHT_TIME = 0;
     if (flightTime > MAX_RESONABLE_FLIGHT_TIME || flightTime < MIN_RESONABLE_FLIGHT_TIME) {
         qDebug() << "ignoring unreasonable packet... flightTime:" << flightTime;
-        return;
+        return; // ignore any packets that are unreasonable
     }
 
     // determine our expected sequence number... handle rollover appropriately
@@ -985,6 +985,6 @@ void OctreeSceneStats::trackIncomingOctreePacket(const QByteArray& packet,
             }
         }
     }
-    return;
+
 }