From c9d205de3ec51c6d799766cd98f11b3da16dd173 Mon Sep 17 00:00:00 2001 From: Sam Gondelman Date: Tue, 30 Jun 2015 13:52:34 -0700 Subject: [PATCH] quadratic zooming response --- interface/src/avatar/MyAvatar.cpp | 5 +++-- interface/src/ui/UserInputMapper.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 6904a1f975..0c349a0159 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -71,7 +71,7 @@ const int SCRIPTED_MOTOR_AVATAR_FRAME = 1; const int SCRIPTED_MOTOR_WORLD_FRAME = 2; const float MyAvatar::ZOOM_MIN = 0.5f; -const float MyAvatar::ZOOM_MAX = 10.0f; +const float MyAvatar::ZOOM_MAX = 25.0f; const float MyAvatar::ZOOM_DEFAULT = 1.5f; MyAvatar::MyAvatar() : @@ -1333,7 +1333,8 @@ glm::vec3 MyAvatar::applyKeyboardMotor(float deltaTime, const glm::vec3& localVe } } - _boomLength += _driveKeys[BOOM_OUT] - _driveKeys[BOOM_IN]; + float boomChange = _driveKeys[BOOM_OUT] - _driveKeys[BOOM_IN]; + _boomLength += 2.0f * _boomLength * boomChange + boomChange * boomChange; _boomLength = glm::clamp(_boomLength, ZOOM_MIN, ZOOM_MAX); return newLocalVelocity; diff --git a/interface/src/ui/UserInputMapper.cpp b/interface/src/ui/UserInputMapper.cpp index 3afd09da65..d42498c9a9 100755 --- a/interface/src/ui/UserInputMapper.cpp +++ b/interface/src/ui/UserInputMapper.cpp @@ -245,8 +245,8 @@ void UserInputMapper::assignDefaulActionScales() { _actionScales[YAW_RIGHT] = 1.0f; // 1 degree per unit _actionScales[PITCH_DOWN] = 1.0f; // 1 degree per unit _actionScales[PITCH_UP] = 1.0f; // 1 degree per unit - _actionScales[BOOM_IN] = 1.0f; // 1m per unit - _actionScales[BOOM_OUT] = 1.0f; // 1m per unit + _actionScales[BOOM_IN] = 0.5f; // .5m per unit + _actionScales[BOOM_OUT] = 0.5f; // .5m per unit _actionStates[SHIFT] = 1.0f; // on _actionStates[ACTION1] = 1.0f; // default _actionStates[ACTION2] = 1.0f; // default