From f61a005ebcda1b54e7ddd7045facffb5c441f43c Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 13 Oct 2015 17:47:41 -0700 Subject: [PATCH] cleanups --- libraries/avatars/src/AvatarData.cpp | 11 ++--------- libraries/entities/src/EntityItemProperties.h | 3 --- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 8a93cbbac7..a9ff9541ea 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -320,11 +320,7 @@ QByteArray AvatarData::toByteArray(bool cullSmallChanges, bool sendAll) { for (int i = 0; i < _jointData.size(); i ++) { const JointData& data = _jointData[ i ]; if (validity & (1 << validityBit)) { - - // destinationBuffer += packOrientationQuatToBytes(destinationBuffer, data.rotation); - memcpy(destinationBuffer, &data.rotation, sizeof(glm::quat)); - destinationBuffer += sizeof(glm::quat); - + destinationBuffer += packOrientationQuatToBytes(destinationBuffer, data.rotation); } if (++validityBit == BITS_IN_BYTE) { validityBit = 0; @@ -708,10 +704,7 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) { if (validRotations[i]) { _hasNewJointRotations = true; data.rotationSet = true; - - // sourceBuffer += unpackOrientationQuatFromBytes(sourceBuffer, data.rotation); - memcpy(&data.rotation, sourceBuffer, sizeof(glm::quat)); - sourceBuffer += sizeof(glm::quat); + sourceBuffer += unpackOrientationQuatFromBytes(sourceBuffer, data.rotation); } } } // numJoints * 8 bytes diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h index 51fa2eee75..06f90ffd42 100644 --- a/libraries/entities/src/EntityItemProperties.h +++ b/libraries/entities/src/EntityItemProperties.h @@ -370,12 +370,9 @@ inline QDebug operator<<(QDebug debug, const EntityItemProperties& properties) { DEBUG_PROPERTY_IF_CHANGED(debug, properties, VoxelSurfaceStyle, voxelSurfaceStyle, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, Href, href, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, Description, description, ""); - - // DEBUG_PROPERTY_IF_CHANGED(debug, properties, ActionData, actionData, ""); if (properties.actionDataChanged()) { debug << " " << "actionData" << ":" << properties.getActionData().toHex() << "" << "\n"; } - DEBUG_PROPERTY_IF_CHANGED(debug, properties, XTextureURL, xTextureURL, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, YTextureURL, yTextureURL, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, ZTextureURL, zTextureURL, "");