remove debugging spew

libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp

@@ -47,7 +47,7 @@ void RenderablePolyVoxEntityItem::setVoxelVolumeSize(glm::vec3 voxelVolumeSize)
         return;
     }
 
-    qDebug() << "RESETTING VOXEL SIZE";
+    qDebug() << "resetting voxel-space size";
 
     PolyVoxEntityItem::setVoxelVolumeSize(voxelVolumeSize);
 
@@ -65,7 +65,6 @@ void RenderablePolyVoxEntityItem::setVoxelVolumeSize(glm::vec3 voxelVolumeSize)
 
 
 void RenderablePolyVoxEntityItem::setVoxelData(QByteArray voxelData) {
-    qDebug() << "%%%%%%%%%%% RenderablePolyVoxEntityItem::setVoxelData" << voxelData.size() << _voxelData.size();
     if (voxelData == _voxelData) {
         return;
     }
@@ -167,24 +166,8 @@ void RenderablePolyVoxEntityItem::getModel() {
     //     (*normal) = -(*normal);
     // }
 
-
-    // qDebug() << "-------------XXXXXXXXXXXXXXXXXXXX-------------------" << usecTimestampNow();
     qDebug() << "---- vecIndices.size() =" << vecIndices.size();
-    // qDebug() << "---- sizeof(vecIndices[0]) =" << sizeof(vecIndices[0]);
     qDebug() << "---- vecVertices.size() =" << vecVertices.size();
-    // qDebug() << "---- sizeof(vecVertices[0]) =" << sizeof(vecVertices[0]);
-    // qDebug() << "---- sizeof(uint32_t) =" << sizeof(uint32_t);
-    // qDebug() << "---- sizeof(float) =" << sizeof(float);
-    // qDebug() << "---- sizeof(PolyVox::PositionMaterialNormal) =" << sizeof(PolyVox::PositionMaterialNormal);
-
-    //           -------------XXXXXXXXXXXXXXXXXXXX-------------------
-    //           ---- vecIndices.size() = 25524
-    //           ---- sizeof(vecIndices[0]) = 4
-    //           ---- vecVertices.size() = 17016
-    //           ---- sizeof(vecVertices[0]) = 28
-    //           ---- sizeof(uint32_t) = 4
-    //           ---- sizeof(float) = 4
-    //           ---- sizeof(PolyVox::PositionMaterialNormal) = 28
 
     _modelGeometry.setMesh(meshPtr);
     _needsModelReload = false;
@@ -301,7 +284,7 @@ void RenderablePolyVoxEntityItem::compressVolumeData() {
     }
 
     _voxelData = qCompress(uncompressedData, 9);
-    qDebug() << "-------------- compresss ------------------------------------------------------------";
+    qDebug() << "-------------- voxel compresss ------------------------------------------------------------";
     qDebug() << "raw-size =" << rawSize << "   compressed-size =" << _voxelData.size();
 }
 
@@ -323,6 +306,6 @@ void RenderablePolyVoxEntityItem::decompressVolumeData() {
 
     _needsModelReload = true;
 
-    qDebug() << "--------------- decompress -----------------------------------------------------------";
+    qDebug() << "--------------- voxel decompress -----------------------------------------------------------";
     qDebug() << "raw-size =" << rawSize << "   compressed-size =" << _voxelData.size();
 }

libraries/entities/src/EntityEditPacketSender.cpp

@@ -37,11 +37,11 @@ void EntityEditPacketSender::queueEditEntityMessage(PacketType type, EntityItemI
     int sizeOut = 0;
 
     if (EntityItemProperties::encodeEntityEditPacket(type, modelID, properties, &bufferOut[0], _maxPacketSize, sizeOut)) {
-        //#ifdef WANT_DEBUG
+        #ifdef WANT_DEBUG
             qCDebug(entities) << "calling queueOctreeEditMessage()...";
             qCDebug(entities) << "    id:" << modelID;
             qCDebug(entities) << "    properties:" << properties;
-        //#endif
+        #endif
         queueOctreeEditMessage(type, bufferOut, sizeOut);
     }
 }

libraries/entities/src/EntityItem.cpp

@@ -432,7 +432,6 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
             // If this is from the same sever packet, then check against any local changes since we got
             // the most recent packet from this server time
             if (_lastEdited > _lastEditedFromRemote) {
-                qDebug() << "_lastEdited > _lastEditedFromRemote";
                 ignoreServerPacket = true;
             }
         } else {
@@ -440,14 +439,6 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
             // If we've changed our local tree more recently than the new data from this packet
             // then we will not be changing our values, instead we just read and skip the data
             if (_lastEdited > lastEditedFromBufferAdjusted) {
-                qDebug() << "_lastEdited > lastEditedFromBufferAdjusted";
-                qDebug() << "_lastEdited =" << _lastEdited;
-                qDebug() << "lastEditedFromBuffer - clockSkew =" << lastEditedFromBuffer - clockSkew;
-                qDebug() << "lastEditedFromBufferAdjusted =" << lastEditedFromBufferAdjusted;
-                qDebug() << "lastEditedFromBuffer =" << lastEditedFromBuffer;
-                qDebug() << "clockSkew =" << clockSkew;
-                qDebug() << "now = " << now;
-
                 ignoreServerPacket = true;
             }
         }

libraries/entities/src/PolyVoxEntityItem.cpp

@@ -62,11 +62,8 @@ bool PolyVoxEntityItem::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(voxelVolumeSize, setVoxelVolumeSize);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(voxelData, setVoxelData);
 
-    qDebug() << "PolyVoxEntityItem::setProperties somethingChanged =" << somethingChanged
-             << "prop has voxel-data =" << properties.getChangedProperties().getHasProperty(PROP_VOXEL_DATA);
-
     if (somethingChanged) {
-        bool wantDebug = true;
+        bool wantDebug = false;
         if (wantDebug) {
             uint64_t now = usecTimestampNow();
             int elapsed = now - getLastEdited();
@@ -85,17 +82,10 @@ int PolyVoxEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* dat
     int bytesRead = 0;
     const unsigned char* dataAt = data;
 
-    qDebug() << "PolyVoxEntityItem::readEntitySubclassDataFromBuffer"
-             << "propertyFlags.getHasProperty(PROP_VOXEL_DATA) =" << propertyFlags.getHasProperty(PROP_VOXEL_DATA)
-             << "overwriteLocalData =" << overwriteLocalData;
-
-
     READ_ENTITY_PROPERTY(PROP_COLOR, rgbColor, setColor);
     READ_ENTITY_PROPERTY(PROP_VOXEL_VOLUME_SIZE, glm::vec3, setVoxelVolumeSize);
     READ_ENTITY_PROPERTY(PROP_VOXEL_DATA, QByteArray, setVoxelData);
 
-
-
     return bytesRead;
 }
 
@@ -116,14 +106,11 @@ void PolyVoxEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeB
                                            EntityPropertyFlags& propertiesDidntFit,
                                            int& propertyCount, 
                                            OctreeElement::AppendState& appendState) const { 
-
     bool successPropertyFits = true;
 
     APPEND_ENTITY_PROPERTY(PROP_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_VOXEL_VOLUME_SIZE, getVoxelVolumeSize());
     APPEND_ENTITY_PROPERTY(PROP_VOXEL_DATA, getVoxelData());
-
-    qDebug() << "PolyVoxEntityItem::appendSubclassData successPropertyFits =" << successPropertyFits;
 }
 
 void PolyVoxEntityItem::debugDump() const {

libraries/entities/src/PolyVoxEntityItem.h

@@ -64,10 +64,7 @@ class PolyVoxEntityItem : public EntityItem {
     virtual void setVoxelVolumeSize(glm::vec3 voxelVolumeSize) { _voxelVolumeSize = voxelVolumeSize; }
     virtual const glm::vec3& getVoxelVolumeSize() const { return _voxelVolumeSize; }
 
-    virtual void setVoxelData(QByteArray voxelData) {
+    virtual void setVoxelData(QByteArray voxelData) { _voxelData = voxelData; }
-        qDebug() << "%%%%%%%%%%% PolyVoxEntityItem::setVoxelData" << voxelData.size() << _voxelData.size();
-        _voxelData = voxelData;
-    }
     virtual const QByteArray& getVoxelData() const { return _voxelData; }
 
     static const glm::vec3 DEFAULT_VOXEL_VOLUME_SIZE;

libraries/octree/src/OctreePacketData.cpp

@@ -591,6 +591,5 @@ int OctreePacketData::uppackDataFromBytes(const unsigned char* dataBytes, QByteA
     dataBytes += sizeof(length);
     QByteArray value((const char*)dataBytes, length);
     result = value;
-    qDebug() << "OctreePacketData::uppackDataFromBytes uppacked " << length;
     return sizeof(length) + length;
 }