Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 09:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove current DDE filtering

Browse source
This commit is contained in:
David Rowe 2015-04-16 14:51:55 -07:00
parent d72bb71030
commit 23d56f5bd0
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -156,12 +156,9 @@ DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 serverPort, qui
_browUpRightIndex(18), _browUpRightIndex(18),
_mouthSmileLeftIndex(28), _mouthSmileLeftIndex(28),
_mouthSmileRightIndex(29), _mouthSmileRightIndex(29),
_jawOpenIndex(21), _jawOpenIndex(21)
_previousTranslation(glm::vec3()),
_previousRotation(glm::quat())
{ {
_coefficients.resize(NUM_FACESHIFT_BLENDSHAPES); _coefficients.resize(NUM_FACESHIFT_BLENDSHAPES);
_previousCoefficients.resize(NUM_FACESHIFT_BLENDSHAPES);
_blendshapeCoefficients.resize(NUM_FACESHIFT_BLENDSHAPES); _blendshapeCoefficients.resize(NUM_FACESHIFT_BLENDSHAPES);
@ -290,13 +287,11 @@ void DdeFaceTracker::decodePacket(const QByteArray& buffer) {
translation -= _referenceTranslation; translation -= _referenceTranslation;
translation /= LEAN_DAMPING_FACTOR; translation /= LEAN_DAMPING_FACTOR;
translation.x *= -1; translation.x *= -1;
_headTranslation = (translation + _previousTranslation) / 2.0f; _headTranslation = translation;
_previousTranslation = translation;
// Compute relative rotation // Compute relative rotation
rotation = glm::inverse(_referenceRotation) * rotation; rotation = glm::inverse(_referenceRotation) * rotation;
_headRotation = (rotation + _previousRotation) / 2.0f; _headRotation = rotation;
_previousRotation = rotation;
// Translate DDE coefficients to Faceshift compatible coefficients // Translate DDE coefficients to Faceshift compatible coefficients
for (int i = 0; i < NUM_EXPRESSIONS; i += 1) { for (int i = 0; i < NUM_EXPRESSIONS; i += 1) {
@ -305,8 +300,8 @@ void DdeFaceTracker::decodePacket(const QByteArray& buffer) {
// Use EyeBlink values to control both EyeBlink and EyeOpen // Use EyeBlink values to control both EyeBlink and EyeOpen
static const float RELAXED_EYE_VALUE = 0.1f; static const float RELAXED_EYE_VALUE = 0.1f;
float leftEye = (_coefficients[_leftBlinkIndex] + _previousCoefficients[_leftBlinkIndex]) / 2.0f; float leftEye = _coefficients[_leftBlinkIndex];
float rightEye = (_coefficients[_rightBlinkIndex] + _previousCoefficients[_rightBlinkIndex]) / 2.0f; float rightEye = _coefficients[_rightBlinkIndex];
if (leftEye > RELAXED_EYE_VALUE) { if (leftEye > RELAXED_EYE_VALUE) {
_coefficients[_leftBlinkIndex] = leftEye - RELAXED_EYE_VALUE; _coefficients[_leftBlinkIndex] = leftEye - RELAXED_EYE_VALUE;
_coefficients[_leftEyeOpenIndex] = 0.0f; _coefficients[_leftEyeOpenIndex] = 0.0f;
@ -341,8 +336,7 @@ void DdeFaceTracker::decodePacket(const QByteArray& buffer) {
// Scale all coefficients // Scale all coefficients
for (int i = 0; i < NUM_EXPRESSIONS; i += 1) { for (int i = 0; i < NUM_EXPRESSIONS; i += 1) {
_blendshapeCoefficients[i] _blendshapeCoefficients[i]
= glm::clamp(DDE_COEFFICIENT_SCALES[i] * (_coefficients[i] + _previousCoefficients[i]) / 2.0f, 0.0f, 1.0f); = glm::clamp(DDE_COEFFICIENT_SCALES[i] * _coefficients[i], 0.0f, 1.0f);
_previousCoefficients[i] = _coefficients[i];
} }
} else { } else {

5
interface/src/devices/DdeFaceTracker.h
View file

@ -100,11 +100,6 @@ private:
int _jawOpenIndex; int _jawOpenIndex;
QVector<float> _coefficients; QVector<float> _coefficients;
// Previous values for simple smoothing
glm::vec3 _previousTranslation;
glm::quat _previousRotation;
QVector<float> _previousCoefficients;
}; };
#endif // hifi_DdeFaceTracker_h #endif // hifi_DdeFaceTracker_h