From 0368e8c75e26d4e9d4de583dc5e8c510fb7bbf10 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 24 Oct 2013 14:27:47 -0700 Subject: [PATCH] cleanup bit field positions --- libraries/avatars/src/AvatarData.cpp | 6 +----- libraries/avatars/src/AvatarData.h | 8 +++----- libraries/voxels/src/VoxelQuery.h | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 670cbd7487..dc5a9c96d3 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -118,11 +118,8 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) { setSemiNibbleAt(bitItems,KEY_STATE_START_BIT,_keyState); // hand state setSemiNibbleAt(bitItems,HAND_STATE_START_BIT,_handState); - *destinationBuffer++ = bitItems; - - bitItems = 0; + // faceshift state if (_headData->_isFaceshiftConnected) { setAtBit(bitItems, IS_FACESHIFT_CONNECTED); } - *destinationBuffer++ = bitItems; // If it is connected, pack up the data @@ -249,7 +246,6 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) { // hand state, stored as a semi-nibble in the bitItems _handState = getSemiNibbleAt(bitItems,HAND_STATE_START_BIT); - bitItems = (unsigned char)*sourceBuffer++; _headData->_isFaceshiftConnected = oneAtBit(bitItems, IS_FACESHIFT_CONNECTED); // If it is connected, pack up the data diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 2f9ca6483d..04930c5f6c 100755 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -27,11 +27,9 @@ #include "HandData.h" // First bitset -const int KEY_STATE_START_BIT = 3; // 4th and 5th bits -const int HAND_STATE_START_BIT = 5; // 6th and 7th bits - -// Second bitset -const int IS_FACESHIFT_CONNECTED = 0; +const int KEY_STATE_START_BIT = 0; // 1st and 2nd bits +const int HAND_STATE_START_BIT = 2; // 3rd and 4th bits +const int IS_FACESHIFT_CONNECTED = 4; // 5th bit const float MAX_AUDIO_LOUDNESS = 1000.0; // close enough for mouth animation diff --git a/libraries/voxels/src/VoxelQuery.h b/libraries/voxels/src/VoxelQuery.h index ec65859c70..1573e54061 100644 --- a/libraries/voxels/src/VoxelQuery.h +++ b/libraries/voxels/src/VoxelQuery.h @@ -28,7 +28,7 @@ const int WANT_LOW_RES_MOVING_BIT = 0; const int WANT_COLOR_AT_BIT = 1; const int WANT_DELTA_AT_BIT = 2; -const int WANT_OCCLUSION_CULLING_BIT = 7; // 8th bit +const int WANT_OCCLUSION_CULLING_BIT = 3; // 4th bit class VoxelQuery : public NodeData { Q_OBJECT