Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 13:33:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR feedback

Browse source
This commit is contained in:
ZappoMan 2017-01-24 12:01:57 -08:00
parent 0655b47dd7
commit 8b662647bd
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,6 @@ const QString AvatarData::FRAME_NAME = "com.highfidelity.recording.AvatarData";
static const int TRANSLATION_COMPRESSION_RADIX = 12; static const int TRANSLATION_COMPRESSION_RADIX = 12;
static const int SENSOR_TO_WORLD_SCALE_RADIX = 10; static const int SENSOR_TO_WORLD_SCALE_RADIX = 10;
static const float AUDIO_LOUDNESS_SCALE = 1024.0f; static const float AUDIO_LOUDNESS_SCALE = 1024.0f;
//static const int MODEL_OFFSET_RADIX = 6;
#define ASSERT(COND) do { if (!(COND)) { abort(); } } while(0) #define ASSERT(COND) do { if (!(COND)) { abort(); } } while(0)

6
libraries/avatars/src/AvatarData.h
View file

@ -114,7 +114,7 @@ const char IS_FINGER_POINTING_FLAG = 4;
// before the "header" structure // before the "header" structure
const char AVATARDATA_FLAGS_MINIMUM = 0; 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 { namespace AvatarDataPacket {
@ -164,7 +164,7 @@ namespace AvatarDataPacket {
const size_t AVATAR_ORIENTATION_SIZE = 6; const size_t AVATAR_ORIENTATION_SIZE = 6;
PACKED_BEGIN struct AvatarScale { PACKED_BEGIN struct AvatarScale {
smallFloat scale; // avatar's scale, compressed by packFloatRatioToTwoByte() SmallFloat scale; // avatar's scale, compressed by packFloatRatioToTwoByte()
} PACKED_END; } PACKED_END;
const size_t AVATAR_SCALE_SIZE = 2; const size_t AVATAR_SCALE_SIZE = 2;
@ -190,7 +190,7 @@ namespace AvatarDataPacket {
// //
// POTENTIAL SAVINGS - 20 bytes // 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 uint16_t sensorToWorldScale; // uniform scale of sensor to world matrix
float sensorToWorldTrans[3]; // fourth column 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 // FIXME - sensorToWorldTrans might be able to be better compressed if it was