From a279d581aee16685712b24f63c29c790f948e689 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 20 May 2017 12:56:23 +1200 Subject: [PATCH] Fix code order --- .../avatars-renderer/src/avatars-renderer/Head.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/avatars-renderer/src/avatars-renderer/Head.cpp b/libraries/avatars-renderer/src/avatars-renderer/Head.cpp index 3fe22c6cac..e5168bb90d 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/Head.cpp +++ b/libraries/avatars-renderer/src/avatars-renderer/Head.cpp @@ -98,6 +98,12 @@ void Head::computeEyeMovement(float deltaTime) { forceBlink = true; } + const float BROW_LIFT_THRESHOLD = 100.0f; + if (_audioAttack > BROW_LIFT_THRESHOLD) { + _browAudioLift += sqrtf(_audioAttack) * 0.01f; + } + _browAudioLift = glm::clamp(_browAudioLift *= 0.7f, 0.0f, 1.0f); + const float BLINK_SPEED = 10.0f; const float BLINK_SPEED_VARIABILITY = 1.0f; const float BLINK_START_VARIABILITY = 0.25f; @@ -143,12 +149,6 @@ void Head::computeEyeMovement(float deltaTime) { void Head::computeFaceMovement(float deltaTime) { if (!_isFaceTrackerConnected) { - const float BROW_LIFT_THRESHOLD = 100.0f; - if (_audioAttack > BROW_LIFT_THRESHOLD) { - _browAudioLift += sqrtf(_audioAttack) * 0.01f; - } - _browAudioLift = glm::clamp(_browAudioLift *= 0.7f, 0.0f, 1.0f); - // use data to update fake Faceshift blendshape coefficients calculateMouthShapes(deltaTime); FaceTracker::updateFakeCoefficients(_leftEyeBlink,