Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-26 15:10:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanups

Browse source
This commit is contained in:
Seth Alves 2015-10-13 17:47:41 -07:00
parent 74ced250c1
commit f61a005ebc
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/avatars/src/AvatarData.cpp
View file

@ -320,11 +320,7 @@ QByteArray AvatarData::toByteArray(bool cullSmallChanges, bool sendAll) {
for (int i = 0; i < _jointData.size(); i ++) { for (int i = 0; i < _jointData.size(); i ++) {
const JointData& data = _jointData[ i ]; const JointData& data = _jointData[ i ];
if (validity & (1 << validityBit)) { if (validity & (1 << validityBit)) {
destinationBuffer += packOrientationQuatToBytes(destinationBuffer, data.rotation);
// destinationBuffer += packOrientationQuatToBytes(destinationBuffer, data.rotation);
memcpy(destinationBuffer, &data.rotation, sizeof(glm::quat));
destinationBuffer += sizeof(glm::quat);
} }
if (++validityBit == BITS_IN_BYTE) { if (++validityBit == BITS_IN_BYTE) {
validityBit = 0; validityBit = 0;
@ -708,10 +704,7 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
if (validRotations[i]) { if (validRotations[i]) {
_hasNewJointRotations = true; _hasNewJointRotations = true;
data.rotationSet = true; data.rotationSet = true;
sourceBuffer += unpackOrientationQuatFromBytes(sourceBuffer, data.rotation);
// sourceBuffer += unpackOrientationQuatFromBytes(sourceBuffer, data.rotation);
memcpy(&data.rotation, sourceBuffer, sizeof(glm::quat));
sourceBuffer += sizeof(glm::quat);
} }
} }
} // numJoints * 8 bytes } // numJoints * 8 bytes

3
libraries/entities/src/EntityItemProperties.h
View file

@ -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, VoxelSurfaceStyle, voxelSurfaceStyle, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, Href, href, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, Href, href, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, Description, description, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, Description, description, "");
// DEBUG_PROPERTY_IF_CHANGED(debug, properties, ActionData, actionData, "");
if (properties.actionDataChanged()) { if (properties.actionDataChanged()) {
debug << " " << "actionData" << ":" << properties.getActionData().toHex() << "" << "\n"; debug << " " << "actionData" << ":" << properties.getActionData().toHex() << "" << "\n";
} }
DEBUG_PROPERTY_IF_CHANGED(debug, properties, XTextureURL, xTextureURL, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, XTextureURL, xTextureURL, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, YTextureURL, yTextureURL, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, YTextureURL, yTextureURL, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, ZTextureURL, zTextureURL, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, ZTextureURL, zTextureURL, "");