From 4ecb4ab3c6f276018ae7bf84a4eeecb5cbc0307e Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 2 Jul 2013 17:14:54 -0700 Subject: [PATCH] Restore the amplification; blink faster. --- interface/src/Avatar.cpp | 6 +++--- interface/src/Head.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index 80e1fd411f..97e0f71c5a 100755 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -286,9 +286,9 @@ void Avatar::reset() { // Update avatar head rotation with sensor data void Avatar::updateHeadFromGyrosAndOrWebcam() { - const float AMPLIFY_PITCH = 1.f; - const float AMPLIFY_YAW = 1.f; - const float AMPLIFY_ROLL = 1.f; + const float AMPLIFY_PITCH = 2.f; + const float AMPLIFY_YAW = 2.f; + const float AMPLIFY_ROLL = 2.f; SerialInterface* gyros = Application::getInstance()->getSerialHeadSensor(); Webcam* webcam = Application::getInstance()->getWebcam(); diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 48a0caab5e..44eddeeb93 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -179,7 +179,7 @@ void Head::simulate(float deltaTime, bool isMine) { _browAudioLift *= 0.7f; // update eyelid blinking - const float BLINK_SPEED = 5.0f; + const float BLINK_SPEED = 10.0f; const float FULLY_OPEN = 0.0f; const float FULLY_CLOSED = 1.0f; if (_leftEyeBlinkVelocity == 0.0f && _rightEyeBlinkVelocity == 0.0f) {