From 15f8b3006b30146f0802f0fa3843957a46134649 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Mon, 27 Oct 2014 14:45:34 -0700
Subject: [PATCH] Remove debugging, fix streaming bug.

---
 assignment-client/src/metavoxels/MetavoxelServer.cpp | 5 -----
 libraries/metavoxels/src/MetavoxelClientManager.cpp  | 8 +-------
 libraries/metavoxels/src/MetavoxelData.cpp           | 3 +++
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/assignment-client/src/metavoxels/MetavoxelServer.cpp b/assignment-client/src/metavoxels/MetavoxelServer.cpp
index 43fd5f5c16..81e86dbf11 100644
--- a/assignment-client/src/metavoxels/MetavoxelServer.cpp
+++ b/assignment-client/src/metavoxels/MetavoxelServer.cpp
@@ -223,11 +223,7 @@ void MetavoxelSession::update() {
     _sender->getData().writeDelta(sendRecord->getData(), sendRecord->getLOD(), out, _lod);
     out.flush();
     int end = _sequencer.getOutputStream().getUnderlying().device()->pos();
-    QDebug debug = qDebug() << "from" << sendRecord->getLOD().position.x << sendRecord->getLOD().position.y << sendRecord->getLOD().position.z << "to" <<
-         _lod.position.x << _lod.position.y << _lod.position.z << _lodPacketNumber << (_sequencer.getOutgoingPacketNumber() + 1); 
     if (end > _sequencer.getMaxPacketSize()) {
-        debug << "reliable" << (_reliableDeltaID + 1); 
-        
         // we need to send the delta on the reliable channel
         _reliableDeltaChannel = _sequencer.getReliableOutputChannel(RELIABLE_DELTA_CHANNEL_INDEX);
         _reliableDeltaChannel->startMessage();
@@ -246,7 +242,6 @@ void MetavoxelSession::update() {
         _sequencer.endPacket();
         
     } else {
-        debug << "unreliable";
         _sequencer.endPacket();
     }
     
diff --git a/libraries/metavoxels/src/MetavoxelClientManager.cpp b/libraries/metavoxels/src/MetavoxelClientManager.cpp
index af83fdc869..cc5d7ef29d 100644
--- a/libraries/metavoxels/src/MetavoxelClientManager.cpp
+++ b/libraries/metavoxels/src/MetavoxelClientManager.cpp
@@ -297,10 +297,7 @@ void MetavoxelClient::writeUpdateMessage(Bitstream& out) {
 void MetavoxelClient::handleMessage(const QVariant& message, Bitstream& in) {
     int userType = message.userType(); 
     if (userType == MetavoxelDeltaMessage::Type) {
-        if (_reliableDeltaChannel) {
-            qDebug() << "from" << _remoteDataLOD.position.x << _remoteDataLOD.position.y << _remoteDataLOD.position.z <<
-                "to" << _reliableDeltaLOD.position.x << _reliableDeltaLOD.position.y << _reliableDeltaLOD.position.z <<
-                _sequencer.getIncomingPacketNumber() << "reliable" << _reliableDeltaID; 
+        if (_reliableDeltaChannel) {    
             MetavoxelData reference = _remoteData;
             MetavoxelLOD referenceLOD = _remoteDataLOD;
             _remoteData.readDelta(reference, referenceLOD, in, _remoteDataLOD = _reliableDeltaLOD);
@@ -310,9 +307,6 @@ void MetavoxelClient::handleMessage(const QVariant& message, Bitstream& in) {
         
         } else {
             PacketRecord* receiveRecord = getLastAcknowledgedReceiveRecord();
-            qDebug() << "from" << receiveRecord->getLOD().position.x << receiveRecord->getLOD().position.y << receiveRecord->getLOD().position.z <<
-                "to" << getLastAcknowledgedSendRecord()->getLOD().position.x << getLastAcknowledgedSendRecord()->getLOD().position.y << getLastAcknowledgedSendRecord()->getLOD().position.z <<
-                _sequencer.getIncomingPacketNumber() << "unreliable"; 
             _remoteData.readDelta(receiveRecord->getData(), receiveRecord->getLOD(), in,
                 _remoteDataLOD = getLastAcknowledgedSendRecord()->getLOD());
             in.reset();
diff --git a/libraries/metavoxels/src/MetavoxelData.cpp b/libraries/metavoxels/src/MetavoxelData.cpp
index 2bd28de784..2f43f8f4ae 100644
--- a/libraries/metavoxels/src/MetavoxelData.cpp
+++ b/libraries/metavoxels/src/MetavoxelData.cpp
@@ -1040,6 +1040,9 @@ MetavoxelNode* MetavoxelNode::readSubdivision(MetavoxelStreamState& state) {
 }
 
 void MetavoxelNode::writeSubdivision(MetavoxelStreamState& state) const {
+    if (!state.shouldSubdivide()) {
+        return;
+    }
     bool leaf = isLeaf();
     if (!state.shouldSubdivideReference()) {
         state.base.stream << leaf;