From d38a5a177192de66fa8536340d9713878bc6904f Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 25 Jun 2015 07:38:06 -0700 Subject: [PATCH] Back out saccade speed limit --- interface/src/avatar/Head.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp index a79a3cd8da..02d16a1ca4 100644 --- a/interface/src/avatar/Head.cpp +++ b/interface/src/avatar/Head.cpp @@ -128,20 +128,13 @@ void Head::simulate(float deltaTime, bool isMine, bool billboard) { const float AVERAGE_SACCADE_INTERVAL = 6.0f; const float MICROSACCADE_MAGNITUDE = 0.002f; const float SACCADE_MAGNITUDE = 0.04f; - const float MAXIMUM_SACCADE_SPEED = 0.8f; if (randFloat() < deltaTime / AVERAGE_MICROSACCADE_INTERVAL) { _saccadeTarget = MICROSACCADE_MAGNITUDE * randVector(); } else if (randFloat() < deltaTime / AVERAGE_SACCADE_INTERVAL) { _saccadeTarget = SACCADE_MAGNITUDE * randVector(); } - - glm::vec3 saccadeDelta = (_saccadeTarget - _saccade) * 0.5f; - float speed = glm::length(saccadeDelta) / deltaTime; - if (speed > MAXIMUM_SACCADE_SPEED) { - saccadeDelta = saccadeDelta * MAXIMUM_SACCADE_SPEED / speed; - } - _saccade += saccadeDelta; + _saccade += (_saccadeTarget - _saccade) * 0.5f; // Detect transition from talking to not; force blink after that and a delay bool forceBlink = false;