Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove attempt at individual eyebrow control

Browse source
This commit is contained in:
David Rowe 2015-02-25 10:44:57 -08:00
parent c5fba3e0ce
commit 23e172a0a1
1 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
interface/src/devices/DdeFaceTracker.cpp
View file

@ -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;