From 0d26bb4266a49453c7469b6d64ab877bb7808e07 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Wed, 7 Aug 2013 14:08:30 -0700 Subject: [PATCH] Camera always stops moving when using gyro's --- interface/src/Audio.h | 1 + interface/src/avatar/Head.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/interface/src/Audio.h b/interface/src/Audio.h index 249453c877..e60e33d613 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -51,6 +51,7 @@ public: void lowPassFilter(int16_t* inputBuffer); void startCollisionSound(float magnitude, float frequency, float noise, float duration); + float getCollisionSoundMagnitude() { return _collisionSoundMagnitude; }; int getSongFileBytes() { return _songFileBytes; } diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp index f4b1603e8f..f35b09895e 100644 --- a/interface/src/avatar/Head.cpp +++ b/interface/src/avatar/Head.cpp @@ -238,8 +238,12 @@ void Head::simulate(float deltaTime, bool isMine, float gyroCameraSensitivity) { const float CAMERA_STOP_TOLERANCE_DEGREES = 0.5f; const float PITCH_START_RANGE = 20.f; const float YAW_START_RANGE = 10.f; - float pitchStartTolerance = PITCH_START_RANGE * (1.f - gyroCameraSensitivity); - float yawStartTolerance = YAW_START_RANGE * (1.f - gyroCameraSensitivity); + float pitchStartTolerance = PITCH_START_RANGE + * (1.f - gyroCameraSensitivity) + + (2.f * CAMERA_STOP_TOLERANCE_DEGREES); + float yawStartTolerance = YAW_START_RANGE + * (1.f - gyroCameraSensitivity) + + (2.f * CAMERA_STOP_TOLERANCE_DEGREES); float cameraHeadAngleDifference = glm::length(glm::vec2(_pitch - _cameraPitch, _yaw - _cameraYaw)); if (_isCameraMoving) {