From 8b662647bd52d56a0a6a4a50172e9521f029fe8e Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jan 2017 12:01:57 -0800 Subject: [PATCH] CR feedback --- libraries/avatars/src/AvatarData.cpp | 1 - libraries/avatars/src/AvatarData.h | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 71eb3d3829..92b7f378a3 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -53,7 +53,6 @@ const QString AvatarData::FRAME_NAME = "com.highfidelity.recording.AvatarData"; static const int TRANSLATION_COMPRESSION_RADIX = 12; static const int SENSOR_TO_WORLD_SCALE_RADIX = 10; static const float AUDIO_LOUDNESS_SCALE = 1024.0f; -//static const int MODEL_OFFSET_RADIX = 6; #define ASSERT(COND) do { if (!(COND)) { abort(); } } while(0) diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 75a9a6ee40..84c82c5acd 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -114,7 +114,7 @@ const char IS_FINGER_POINTING_FLAG = 4; // before the "header" structure const char AVATARDATA_FLAGS_MINIMUM = 0; -using smallFloat = uint16_t; // a compressed float with less precision, user defined radix +using SmallFloat = uint16_t; // a compressed float with less precision, user defined radix namespace AvatarDataPacket { @@ -164,7 +164,7 @@ namespace AvatarDataPacket { const size_t AVATAR_ORIENTATION_SIZE = 6; PACKED_BEGIN struct AvatarScale { - smallFloat scale; // avatar's scale, compressed by packFloatRatioToTwoByte() + SmallFloat scale; // avatar's scale, compressed by packFloatRatioToTwoByte() } PACKED_END; const size_t AVATAR_SCALE_SIZE = 2; @@ -190,7 +190,7 @@ namespace AvatarDataPacket { // // POTENTIAL SAVINGS - 20 bytes - uint8_t sensorToWorldQuat[6]; // 6 byte compressed quaternion part of sensor to world matrix + SixByteQuat sensorToWorldQuat; // 6 byte compressed quaternion part of sensor to world matrix uint16_t sensorToWorldScale; // uniform scale of sensor to world matrix float sensorToWorldTrans[3]; // fourth column of sensor to world matrix // FIXME - sensorToWorldTrans might be able to be better compressed if it was