Merge pull request #931 from Atlante45/add_fs_data_in_head_data

Add fs data in head data

interface/src/avatar/Head.cpp

@@ -67,10 +67,8 @@ Head::Head(Avatar* owningAvatar) :
     _rightEarPosition(0.0f, 0.0f, 0.0f),
     _mouthPosition(0.0f, 0.0f, 0.0f),
     _scale(1.0f),
-    _browAudioLift(0.0f),
     _gravity(0.0f, -1.0f, 0.0f),
     _lastLoudness(0.0f),
-    _averageLoudness(0.0f),
     _audioAttack(0.0f),
     _returnSpringScale(1.0f),
     _bodyRotation(0.0f, 0.0f, 0.0f),
@@ -78,8 +76,6 @@ Head::Head(Avatar* owningAvatar) :
     _mohawkInitialized(false),
     _saccade(0.0f, 0.0f, 0.0f),
     _saccadeTarget(0.0f, 0.0f, 0.0f),
-    _leftEyeBlink(0.0f),
-    _rightEyeBlink(0.0f),
     _leftEyeBlinkVelocity(0.0f),
     _rightEyeBlinkVelocity(0.0f),
     _timeWithoutTalking(0.0f),
@@ -148,6 +144,8 @@ void Head::simulate(float deltaTime, bool isMine, float gyroCameraSensitivity) {
     
     //  Update audio trailing average for rendering facial animations
     Faceshift* faceshift = Application::getInstance()->getFaceshift();
+    _isFaceshiftConnected = faceshift != NULL;
+
     if (isMine && faceshift->isActive()) {
         _leftEyeBlink = faceshift->getLeftBlink();
         _rightEyeBlink = faceshift->getRightBlink();
@@ -159,7 +157,7 @@ void Head::simulate(float deltaTime, bool isMine, float gyroCameraSensitivity) {
         const float BROW_HEIGHT_SCALE = 0.005f;
         _browAudioLift = faceshift->getBrowHeight() * BROW_HEIGHT_SCALE;
         
-    } else {
+    } else  if (!_isFaceshiftConnected) {
         // Update eye saccades
         const float AVERAGE_MICROSACCADE_INTERVAL = 0.50f;
         const float AVERAGE_SACCADE_INTERVAL = 4.0f;

interface/src/avatar/Head.h

@@ -104,10 +104,8 @@ private:
     glm::vec3 _mouthPosition;
     Nose _nose;
     float _scale;
-    float _browAudioLift;
     glm::vec3 _gravity;
     float _lastLoudness;
-    float _averageLoudness;
     float _audioAttack;
     float _returnSpringScale; //strength of return springs
     glm::vec3 _bodyRotation;
@@ -118,8 +116,6 @@ private:
     glm::vec3 _mohawkColors[MOHAWK_TRIANGLES];
     glm::vec3 _saccade;
     glm::vec3 _saccadeTarget;
-    float _leftEyeBlink;
-    float _rightEyeBlink;
     float _leftEyeBlinkVelocity;
     float _rightEyeBlinkVelocity;
     float _timeWithoutTalking;

libraries/avatars/src/AvatarData.cpp

@@ -155,7 +155,7 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
     // Instantaneous audio loudness (used to drive facial animation)
     //destinationBuffer += packFloatToByte(destinationBuffer, std::min(MAX_AUDIO_LOUDNESS, _audioLoudness), MAX_AUDIO_LOUDNESS);
     memcpy(destinationBuffer, &_headData->_audioLoudness, sizeof(float));
-    destinationBuffer += sizeof(float); 
+    destinationBuffer += sizeof(float);
 
     // camera details
     memcpy(destinationBuffer, &_cameraPosition, sizeof(_cameraPosition));
@@ -185,6 +185,26 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
     // hand state
     setSemiNibbleAt(bitItems,HAND_STATE_START_BIT,_handState);
     *destinationBuffer++ = bitItems;
+
+    bitItems = 0;
+    if (_headData->_isFaceshiftConnected) { setAtBit(bitItems, IS_FACESHIFT_CONNECTED); }
+
+    *destinationBuffer++ = bitItems;
+
+    // If it is connected, pack up the data
+    if (_headData->_isFaceshiftConnected) {
+        memcpy(destinationBuffer, &_headData->_leftEyeBlink, sizeof(float));
+        destinationBuffer += sizeof(float);
+
+        memcpy(destinationBuffer, &_headData->_rightEyeBlink, sizeof(float));
+        destinationBuffer += sizeof(float);
+
+        memcpy(destinationBuffer, &_headData->_averageLoudness, sizeof(float));
+        destinationBuffer += sizeof(float);
+
+        memcpy(destinationBuffer, &_headData->_browAudioLift, sizeof(float));
+        destinationBuffer += sizeof(float);
+    }
     
     // leap hand data
     destinationBuffer += _handData->encodeRemoteData(destinationBuffer);
@@ -267,7 +287,7 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
     //sourceBuffer += unpackFloatFromByte(sourceBuffer, _audioLoudness, MAX_AUDIO_LOUDNESS);
     memcpy(&_headData->_audioLoudness, sourceBuffer, sizeof(float));
     sourceBuffer += sizeof(float);
-    
+
     // camera details
     memcpy(&_cameraPosition, sourceBuffer, sizeof(_cameraPosition));
     sourceBuffer += sizeof(_cameraPosition);
@@ -298,6 +318,24 @@ 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
+    if (_headData->_isFaceshiftConnected) {
+        memcpy(&_headData->_leftEyeBlink, sourceBuffer, sizeof(float));
+        sourceBuffer += sizeof(float);
+
+        memcpy(&_headData->_rightEyeBlink, sourceBuffer, sizeof(float));
+        sourceBuffer += sizeof(float);
+
+        memcpy(&_headData->_averageLoudness, sourceBuffer, sizeof(float));
+        sourceBuffer += sizeof(float);
+
+        memcpy(&_headData->_browAudioLift, sourceBuffer, sizeof(float));
+        sourceBuffer += sizeof(float);
+    }
+
     // leap hand data
     if (sourceBuffer - startPosition < numBytes) {
         // check passed, bytes match

libraries/avatars/src/AvatarData.h

@@ -23,6 +23,7 @@
 #include "HeadData.h"
 #include "HandData.h"
 
+// First bitset
 const int WANT_LOW_RES_MOVING_BIT = 0;
 const int WANT_COLOR_AT_BIT = 1;
 const int WANT_DELTA_AT_BIT = 2;
@@ -30,6 +31,9 @@ const int KEY_STATE_START_BIT = 3;  // 4th and 5th bits
 const int HAND_STATE_START_BIT = 5; // 6th and 7th bits
 const int WANT_OCCLUSION_CULLING_BIT = 7; // 8th bit
 
+// Second bitset
+const int IS_FACESHIFT_CONNECTED = 0;
+
 const float MAX_AUDIO_LOUDNESS = 1000.0; // close enough for mouth animation
 
 enum KeyState

libraries/avatars/src/HeadData.cpp

@@ -16,6 +16,11 @@ HeadData::HeadData(AvatarData* owningAvatar) :
     _leanSideways(0.0f),
     _leanForward(0.0f),
     _audioLoudness(0.0f),
+    _isFaceshiftConnected(false),
+    _leftEyeBlink(0.0f),
+    _rightEyeBlink(0.0f),
+    _averageLoudness(0.0f),
+    _browAudioLift(0.0f),
     _owningAvatar(owningAvatar)
 {
     
@@ -38,4 +43,4 @@ void HeadData::addLean(float sideways, float forwards) {
     // Add lean as impulse
     _leanSideways += sideways;
     _leanForward  += forwards;
-}
+}

libraries/avatars/src/HeadData.h

@@ -60,6 +60,11 @@ protected:
     float _leanSideways;
     float _leanForward;
     float _audioLoudness;
+    bool _isFaceshiftConnected;
+    float _leftEyeBlink;
+    float _rightEyeBlink;
+    float _averageLoudness;
+    float _browAudioLift;
     AvatarData* _owningAvatar;
 private:
     // privatize copy ctor and assignment operator so copies of this object cannot be made

libraries/shared/src/PacketHeaders.cpp

@@ -20,7 +20,7 @@ PACKET_VERSION versionForPacketType(PACKET_TYPE type) {
             return 1;
 
         case PACKET_TYPE_HEAD_DATA:
-            return 5;
+            return 6;
         
         case PACKET_TYPE_AVATAR_FACE_VIDEO:
             return 1;