From 23e172a0a1c73f0ad71231184bb4c77d62594fc7 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 25 Feb 2015 10:44:57 -0800 Subject: [PATCH] Remove attempt at individual eyebrow control --- interface/src/devices/DdeFaceTracker.cpp | 30 ++++++++---------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/interface/src/devices/DdeFaceTracker.cpp b/interface/src/devices/DdeFaceTracker.cpp index cd70c1a516..b973946acb 100644 --- a/interface/src/devices/DdeFaceTracker.cpp +++ b/interface/src/devices/DdeFaceTracker.cpp @@ -214,32 +214,22 @@ void DdeFaceTracker::decodePacket(const QByteArray& buffer) { static const float BROW_UP_SCALE = 3.0f; static const float BROW_DOWN_SCALE = 3.0f; float browCenter = (packet.expressions[17] + _previousExpressions[17]) / 2.0f; - float browDelta = (packet.expressions[24] + _previousExpressions[24] - - packet.expressions[23] - _previousExpressions[23]) / 2.0f; - float browLeft = browCenter - browDelta; - float browRight = browCenter + browDelta; - if (browLeft > 0) { - _blendshapeCoefficients[_browUpLeftIndex] = glm::clamp(BROW_UP_SCALE * browLeft, 0.0f, 1.0f); + if (browCenter > 0) { + float browUp = glm::clamp(BROW_UP_SCALE * browCenter, 0.0f, 1.0f); + _blendshapeCoefficients[_browUpCenterIndex] = browUp; + _blendshapeCoefficients[_browUpLeftIndex] = browUp; _blendshapeCoefficients[_browDownLeftIndex] = 0.0f; - } else { - _blendshapeCoefficients[_browUpLeftIndex] = 0.0f; - _blendshapeCoefficients[_browDownLeftIndex] = glm::clamp(BROW_DOWN_SCALE * -browLeft, 0.0f, 1.0f); - } - if (browRight > 0) { - _blendshapeCoefficients[_browUpRightIndex] = glm::clamp(BROW_UP_SCALE * browRight, 0.0f, 1.0f); + _blendshapeCoefficients[_browUpRightIndex] = browUp; _blendshapeCoefficients[_browDownRightIndex] = 0.0f; } else { - _blendshapeCoefficients[_browUpRightIndex] = 0.0f; - _blendshapeCoefficients[_browDownRightIndex] = glm::clamp(BROW_DOWN_SCALE * -browRight, 0.0f, 1.0f); - } - if (browCenter > 0) { - _blendshapeCoefficients[_browUpCenterIndex] = glm::clamp(BROW_UP_SCALE * browCenter, 0.0f, 1.0f); - } else { + float browDown = glm::clamp(BROW_DOWN_SCALE * -browCenter, 0.0f, 1.0f); _blendshapeCoefficients[_browUpCenterIndex] = 0.0f; + _blendshapeCoefficients[_browUpLeftIndex] = 0.0f; + _blendshapeCoefficients[_browDownLeftIndex] = browDown; + _blendshapeCoefficients[_browUpRightIndex] = 0.0f; + _blendshapeCoefficients[_browDownRightIndex] = browDown; } _previousExpressions[17] = packet.expressions[17]; - _previousExpressions[24] = packet.expressions[24]; - _previousExpressions[23] = packet.expressions[23]; // Mouth blendshapes static const float JAW_OPEN_THRESHOLD = 0.16f;